You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2019/07/30 11:08:34 UTC
[maven] branch MNG-6726 created (now ad58ca4)
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a change to branch MNG-6726
in repository https://gitbox.apache.org/repos/asf/maven.git.
at ad58ca4 [MNG-6726] Integration tests should use non empty MAVEN_OPTS. Jenkinsfile and 'core-it-suite' should accept custom MAVEN_OPTS from developers and their CLI.
This branch includes the following new commits:
new d52deba Revert "[MNG-6725] Skip '.mavenrc' via MAVEN_SKIP_RC=1 and '-Dmaven.skip.rc=true' on child ITs (by default on Jenkins CI)."
new c8865e8 Revert "[MNG-6720] MultiThreadedBuilder: wait for parallel running projects when using --fail-fast"
new e0a6795 [MNG-6725] Skip '.mavenrc' via MAVEN_SKIP_RC=1 and '-Dmaven.skip.rc=true' on child ITs (by default on Jenkins CI).
new ad58ca4 [MNG-6726] Integration tests should use non empty MAVEN_OPTS. Jenkinsfile and 'core-it-suite' should accept custom MAVEN_OPTS from developers and their CLI.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven] 03/04: [MNG-6725] Skip '.mavenrc' via MAVEN_SKIP_RC=1 and
'-Dmaven.skip.rc=true' on child ITs (by default on Jenkins CI).
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch MNG-6726
in repository https://gitbox.apache.org/repos/asf/maven.git
commit e0a67951a8c5258546c48cd45a74a31a71b74424
Author: tibordigana <ti...@apache.org>
AuthorDate: Tue Jul 30 11:52:43 2019 +0200
[MNG-6725] Skip '.mavenrc' via MAVEN_SKIP_RC=1 and '-Dmaven.skip.rc=true' on child ITs (by default on Jenkins CI).
(cherry picked from commit 93c88a2bd05bd1f318ad1174c2b3accdbe0cb36d)
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b9e510d..af9a395 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -100,7 +100,7 @@ for (String os in runITsOses) {
withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
junitPublisher(ignoreAttachments: false)
]) {
- String cmd = "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true"
+ String cmd = "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true -Dmaven.skip.rc=true"
if (stageId.endsWith('-jdk7')) {
// Java 7u80 has TLS 1.2 disabled by default: need to explicitly enable
cmd = "${cmd} -Dhttps.protocols=TLSv1.2"
[maven] 02/04: Revert "[MNG-6720] MultiThreadedBuilder: wait for
parallel running projects when using --fail-fast"
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch MNG-6726
in repository https://gitbox.apache.org/repos/asf/maven.git
commit c8865e8a325b8563e03d08cdd5c6be158e309639
Author: tibordigana <ti...@apache.org>
AuthorDate: Tue Jul 30 13:04:49 2019 +0200
Revert "[MNG-6720] MultiThreadedBuilder: wait for parallel running projects when using --fail-fast"
This reverts commit 0515cb1f
---
.../builder/multithreaded/MultiThreadedBuilder.java | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
index 94d10af..bfbfb02 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/internal/builder/multithreaded/MultiThreadedBuilder.java
@@ -27,7 +27,7 @@ import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorCompletionService;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.Future;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.lifecycle.internal.BuildThreadFactory;
@@ -114,9 +114,6 @@ public class MultiThreadedBuilder
}
}
-
- executor.shutdown();
- executor.awaitTermination( Long.MAX_VALUE, TimeUnit.MILLISECONDS );
}
private void multiThreadedProjectTaskSegmentBuild( ConcurrencyDependencyGraph analyzer,
@@ -175,6 +172,21 @@ public class MultiThreadedBuilder
break;
}
}
+
+ // cancel outstanding builds (if any) - this can happen if an exception is thrown in above block
+
+ Future<ProjectSegment> unprocessed;
+ while ( ( unprocessed = service.poll() ) != null )
+ {
+ try
+ {
+ unprocessed.get();
+ }
+ catch ( InterruptedException | ExecutionException e )
+ {
+ throw new RuntimeException( e );
+ }
+ }
}
private Callable<ProjectSegment> createBuildCallable( final MavenSession rootSession,
[maven] 04/04: [MNG-6726] Integration tests should use non empty
MAVEN_OPTS. Jenkinsfile and 'core-it-suite' should accept custom MAVEN_OPTS
from developers and their CLI.
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch MNG-6726
in repository https://gitbox.apache.org/repos/asf/maven.git
commit ad58ca489038829d5c9d54d7201ddf3eac49ad20
Author: tibordigana <ti...@apache.org>
AuthorDate: Tue Jul 30 13:07:21 2019 +0200
[MNG-6726] Integration tests should use non empty MAVEN_OPTS. Jenkinsfile and 'core-it-suite' should accept custom MAVEN_OPTS from developers and their CLI.
---
Jenkinsfile | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index af9a395..f2f54d8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -97,7 +97,15 @@ for (String os in runITsOses) {
bat "if exist apache-maven-dist.zip del /q apache-maven-dist.zip"
}
unstash 'dist'
- withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
+
+ // Java 7u80 has TLS 1.2 disabled by default: need to explicitly enable
+ // using non-empty MAVEN_OPTS (dummy prop) to prevent from merging env vars in child IT with env vars from parent process
+ // child env var takes the precedence
+ // merging env vars between parent/child processes are performed in maven-shared-utils:
+ // see Commandline#addSystemEnvironment(): "Properties systemEnvVars = CommandLineUtils.getSystemEnvVars()"
+ def platformOptions = jdk == '7' ? '-Dhttps.protocols=TLSv1.2' : '-DdummyProp=dummy'
+
+ withMaven(jdk: jdkName, maven: mvnName, mavenOpts: platformOptions, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
junitPublisher(ignoreAttachments: false)
]) {
String cmd = "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true -Dmaven.skip.rc=true"
[maven] 01/04: Revert "[MNG-6725] Skip '.mavenrc' via
MAVEN_SKIP_RC=1 and '-Dmaven.skip.rc=true' on child ITs (by default on
Jenkins CI)."
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tibordigana pushed a commit to branch MNG-6726
in repository https://gitbox.apache.org/repos/asf/maven.git
commit d52debad98ca6634ff9c58183785de762bf39950
Author: tibordigana <ti...@apache.org>
AuthorDate: Tue Jul 30 13:04:41 2019 +0200
Revert "[MNG-6725] Skip '.mavenrc' via MAVEN_SKIP_RC=1 and '-Dmaven.skip.rc=true' on child ITs (by default on Jenkins CI)."
This reverts commit 93c88a2b
---
Jenkinsfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index af9a395..b9e510d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -100,7 +100,7 @@ for (String os in runITsOses) {
withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[
junitPublisher(ignoreAttachments: false)
]) {
- String cmd = "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true -Dmaven.skip.rc=true"
+ String cmd = "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true"
if (stageId.endsWith('-jdk7')) {
// Java 7u80 has TLS 1.2 disabled by default: need to explicitly enable
cmd = "${cmd} -Dhttps.protocols=TLSv1.2"