You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2026/08/28 16:00:46 UTC
(maven) 02/02: Align fixes
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch rebased/pr-1406-hack-for-skip
in repository https://gitbox.apache.org/repos/asf/maven.git
commit 1a836cf05bc3022c49ff2a2022f559977259b49a
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Thu Feb 8 12:58:40 2024 +0100
Align fixes
---
.../org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java | 3 ++-
.../main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java | 3 ---
.../src/main/java/org/apache/maven/project/MavenProject.java | 6 +++++-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
index 5877a66df1..0ce5762f65 100644
--- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
+++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/LifecycleModuleBuilder.java
@@ -88,7 +88,8 @@ public void buildProject(
try {
- if (reactorContext.getReactorBuildStatus().isHaltedOrBlacklisted(currentProject)) {
+ if (reactorContext.getReactorBuildStatus().isHaltedOrBlacklisted(currentProject)
+ || !currentProject.isProjectNeedsBuild()) {
eventCatapult.fire(ExecutionEvent.Type.ProjectSkipped, session, null);
return;
}
diff --git a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
index 57e4f584b3..92b3f75bee 100644
--- a/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
+++ b/impl/maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoExecutor.java
@@ -333,9 +333,6 @@ protected boolean useProjectLock(MavenSession session) {
}
private void doExecute2(MavenSession session, MojoExecution mojoExecution) throws LifecycleExecutionException {
- if (!session.getCurrentProject().isProjectNeedsBuild()) {
- return;
- }
eventCatapult.fire(ExecutionEvent.Type.MojoStarted, session, mojoExecution);
try {
try {
diff --git a/impl/maven-core/src/main/java/org/apache/maven/project/MavenProject.java b/impl/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
index 8326c32495..c1025c9e62 100644
--- a/impl/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/impl/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
@@ -209,7 +209,7 @@ public boolean isProjectNeedsBuild() {
}
public void skipProjectBuild() {
- if (projectNeedsBuild.compareAndSet(false, true)) {
+ if (projectNeedsBuild.compareAndSet(true, false)) {
LOGGER.info("Project {} is skipped from build", getId());
}
}
@@ -1438,6 +1438,10 @@ private void deepCopy(MavenProject project) {
}
lifecyclePhases.addAll(project.lifecyclePhases);
+
+ if (!project.isProjectNeedsBuild()) {
+ skipProjectBuild();
+ }
}
private static String getProjectReferenceId(String groupId, String artifactId, String version) {