[maven] 02/02: build with Java 8
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6401-2 in repository https://gitbox.apache.org/repos/asf/maven.git commit 6dd92a8950781cabca6ddc9c4edbee906e9e7779 Author: Hervé BoutemyAuthorDate: Mon May 21 23:29:50 2018 +0200 build with Java 8 --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cda629e..464fecc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,10 +20,10 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'10':'5'))]) def buildOs = 'linux' -def buildJdk = '7' +def buildJdk = '8' def buildMvn = '3.5.0' def runITsOses = ['linux', 'windows'] -def runITsJdks = ['7', '8'] +def runITsJdks = ['7', '8', '9'] def runITsMvn = '3.5.0' def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true def tests -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] branch MNG-6401-2 created (now 6dd92a8)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6401-2 in repository https://gitbox.apache.org/repos/asf/maven.git. at 6dd92a8 build with Java 8 This branch includes the following new commits: new f709d5d [MNG-6401] Proxy.active & port to String to support interpolation new 6dd92a8 build with Java 8 The 2 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. -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] 01/02: [MNG-6401] Proxy.active & port to String to support interpolation
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6401-2 in repository https://gitbox.apache.org/repos/asf/maven.git commit f709d5d20f306d6e0753c409da99b1b971c573ff Author: Hervé BoutemyAuthorDate: Mon May 21 23:29:15 2018 +0200 [MNG-6401] Proxy.active & port to String to support interpolation --- maven-settings/src/main/mdo/settings.mdo | 43 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/maven-settings/src/main/mdo/settings.mdo b/maven-settings/src/main/mdo/settings.mdo index 7547a9c..6be89a0 100644 --- a/maven-settings/src/main/mdo/settings.mdo +++ b/maven-settings/src/main/mdo/settings.mdo @@ -423,6 +423,9 @@ @@ -435,7 +438,7 @@ Whether this proxy configuration is the active one. ]]> - boolean + String protocol @@ -468,15 +471,17 @@ String - - port + + portString 1.0.0+ - int + String 8080 @@ -501,6 +506,34 @@ String + + + 1.0.0+ + + + + + Server -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven-integration-testing] branch MNG-6401-2 created (now 3bef390)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6401-2 in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git. at 3bef390 [MNG-6401] Cannot interpolate property in proxy port of settings.xml No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] 01/01: [MNG-6364] run Core ITs also with Java 9
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit 34af3f9f96b8062a0146d99a2f200717896f9eaa Author: Hervé BoutemyAuthorDate: Mon May 21 19:24:29 2018 +0200 [MNG-6364] run Core ITs also with Java 9 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8245fee..464fecc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,7 @@ def buildOs = 'linux' def buildJdk = '8' def buildMvn = '3.5.0' def runITsOses = ['linux', 'windows'] -def runITsJdks = ['7', '8'] +def runITsJdks = ['7', '8', '9'] def runITsMvn = '3.5.0' def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true def tests -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] branch MNG-6364 updated (2e62a0f -> 34af3f9)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard 2e62a0f created a function to run CoreITs and avoid copy/paste discard 4312052 [MNG-6364] Enhanced Jenkinsfile to test Core with JDK 9 discard 03b3c11 build with Java 8 to avoid TLS 1.2 failure on license download add 7fde626 simplified Jenkinsfile: avoid copy/paste add 7b80db7 build with Java 8 to avoid TLS 1.2 failure on license download new 34af3f9 [MNG-6364] run Core ITs also with Java 9 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2e62a0f) \ N -- N -- N refs/heads/MNG-6364 (34af3f9) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: Jenkinsfile | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] branch build-java8 updated (03b3c11 -> 7b80db7)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch build-java8 in repository https://gitbox.apache.org/repos/asf/maven.git. omit 03b3c11 build with Java 8 to avoid TLS 1.2 failure on license download add 7fde626 simplified Jenkinsfile: avoid copy/paste new 7b80db7 build with Java 8 to avoid TLS 1.2 failure on license download This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (03b3c11) \ N -- N -- N refs/heads/build-java8 (7b80db7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: Jenkinsfile | 126 +--- 1 file changed, 43 insertions(+), 83 deletions(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] 01/01: build with Java 8 to avoid TLS 1.2 failure on license download
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch build-java8 in repository https://gitbox.apache.org/repos/asf/maven.git commit 7b80db7cd20c3374c627a568166eb8afec2a48d7 Author: Hervé BoutemyAuthorDate: Sun May 20 16:54:59 2018 +0200 build with Java 8 to avoid TLS 1.2 failure on license download --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index cda629e..8245fee 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'10':'5'))]) def buildOs = 'linux' -def buildJdk = '7' +def buildJdk = '8' def buildMvn = '3.5.0' def runITsOses = ['linux', 'windows'] def runITsJdks = ['7', '8'] -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] branch master updated: simplified Jenkinsfile: avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven.git The following commit(s) were added to refs/heads/master by this push: new 7fde626 simplified Jenkinsfile: avoid copy/paste 7fde626 is described below commit 7fde626c236e02109b1adb72facd873637eb9de9 Author: Hervé BoutemyAuthorDate: Mon May 21 19:20:33 2018 +0200 simplified Jenkinsfile: avoid copy/paste --- Jenkinsfile | 126 +--- 1 file changed, 43 insertions(+), 83 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c3e5a43..cda629e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,8 +22,11 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e def buildOs = 'linux' def buildJdk = '7' def buildMvn = '3.5.0' +def runITsOses = ['linux', 'windows'] +def runITsJdks = ['7', '8'] +def runITsMvn = '3.5.0' +def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V" // -DmavenDistro=... -Dmaven.test.failure.ignore=true def tests -def CORE_IT_PROFILES='run-its,embedded' try { @@ -59,94 +62,51 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } +Map runITsTasks = [:] +for (String os in runITsOses) { +for (def jdk in runITsJdks) { +String osLabel = jenkinsEnv.labelForOS(os); +String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}") +String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}") +echo "OS: ${os} JDK: ${jdk} => Label: ${osLabel} JDK: ${jdkName}" -parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +String stageId = "${os}-jdk${jdk}" +String stageLabel = "Run ITs ${os.capitalize()} Java ${jdk}" +runITsTasks[stageId] = { +node(osLabel) { +stage("${stageLabel}") { +// on Windows, need a short path or we hit 256 character limit for paths +// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent +// will not trample each other +dir(isUnix() ? 'test' : "/mvn-it-${EXECUTOR_NUMBER}.tmp") { +def WORK_DIR=pwd() +checkout tests +if (isUnix()) { +sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" +} else { +bat "if exist it-local-repo rmdir /s /q it-local-repo" +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:[ +junitPublisher(ignoreAttachments: false) +]) { +if (isUnix()) { +sh "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true" +} else { +bat "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip -Dmaven.test.failure.ignore=true" +} +} +deleteDir() // clean up after ourselves to reduce disk space } -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName,
[maven] branch MNG-6364 updated (2cf0642 -> 2e62a0f)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard 2cf0642 created a function to run CoreITs and avoid copy/paste new 2e62a0f created a function to run CoreITs and avoid copy/paste This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2cf0642) \ N -- N -- N refs/heads/MNG-6364 (2e62a0f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] 01/01: created a function to run CoreITs and avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit 2e62a0fac1326f6b28d5e957543018ff3944d95d Author: Hervé BoutemyAuthorDate: Mon May 21 14:06:14 2018 +0200 created a function to run CoreITs and avoid copy/paste --- Jenkinsfile | 169 1 file changed, 43 insertions(+), 126 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e99928..883777b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,8 +22,11 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e def buildOs = 'linux' def buildJdk = '8' def buildMvn = '3.5.0' +def runITsOses = ['linux', 'windows'] +def runITsJdks = ['7', '8', '9', '10'] +def runITsMvn = '3.5.0' +def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V -Dmaven.test.failure.ignore=true" // -DmavenDistro=... def tests -def CORE_IT_PROFILES='run-its,embedded' try { @@ -59,137 +62,51 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } +Map runITsTasks = [:] +for (String os in runITsOses) { +for (def jdk in runITsJdks) { +String osLabel = jenkinsEnv.labelForOS(os); +String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}") +String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}") +echo "OS: ${os} JDK: ${jdk} => Label: ${osLabel} JDK: ${jdkName}" -parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +String stageId = "${os}-jdk${jdk}" +String stageLabel = "Run ITs ${os.capitalize()} Java ${jdk}" +runITsTasks[stageId] = { +node(osLabel) { +stage("${stageLabel}") { +// on Windows, need a short path or we hit 256 character limit for paths +// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent +// will not trample each other +dir(isUnix() ? 'test' : "/mvn-it-${EXECUTOR_NUMBER}.tmp") { +def WORK_DIR=pwd() +checkout tests +if (isUnix()) { +sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" +} else { +bat "if exist it-local-repo rmdir /s /q it-local-repo" +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:[ +junitPublisher(ignoreAttachments: false) +]) { +if (isUnix()) { +sh "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} else { +bat "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +} +deleteDir() // clean up after ourselves to reduce disk space } -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES
[maven-integration-testing] 01/02: [MNG-6364] - Make an activation also for JDK 9 o This will make this test pass for JDK 9.
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git commit 27833a023985ac3e5b1887d46e8045d7c30b2b9a Author: Karl Heinz MarbaiseAuthorDate: Sun Feb 18 16:13:47 2018 +0100 [MNG-6364] - Make an activation also for JDK 9 o This will make this test pass for JDK 9. --- core-it-suite/src/test/resources/mng-1957/pom.xml | 10 ++ 1 file changed, 10 insertions(+) diff --git a/core-it-suite/src/test/resources/mng-1957/pom.xml b/core-it-suite/src/test/resources/mng-1957/pom.xml index bf24ede..9651c47 100644 --- a/core-it-suite/src/test/resources/mng-1957/pom.xml +++ b/core-it-suite/src/test/resources/mng-1957/pom.xml @@ -166,5 +166,15 @@ under the License. PASSED + + + test-6g + +[9,10) + + +PASSED + + -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven-integration-testing] 02/02: Fixed IT's related to JDK 9 o Need to separate between JDK..8 and JDK 9 cause the error output looks different for JDK 9.
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git commit b06408906d47dfb7723270036ee46347a02b54dd Author: Karl Heinz MarbaiseAuthorDate: Sun Feb 18 20:10:46 2018 +0100 Fixed IT's related to JDK 9 o Need to separate between JDK..8 and JDK 9 cause the error output looks different for JDK 9. --- .../MavenITmng5958LifecyclePhaseBinaryCompat.java | 28 ++ 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java index 3ee3fe1..4891fe2 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5958LifecyclePhaseBinaryCompat.java @@ -17,19 +17,20 @@ public class MavenITmng5958LifecyclePhaseBinaryCompat throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5958-lifecycle-phases/good" ); - + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.verifyTextInLog( "CLASS_NAME=java.lang.String" ); verifier.resetStreams(); } - -public void testBad() + +public void testBadTillJDK8() throws Exception { +requiresJavaVersion( "[,1.8]" ); File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5958-lifecycle-phases/bad" ); - + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); try { @@ -42,4 +43,23 @@ public class MavenITmng5958LifecyclePhaseBinaryCompat } verifier.resetStreams(); } + +public void testBadJDK9() +throws Exception +{ +requiresJavaVersion( "[9.0,)" ); +File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5958-lifecycle-phases/bad" ); + +Verifier verifier = newVerifier( testDir.getAbsolutePath() ); +try +{ +verifier.executeGoal( "validate" ); +} +catch ( VerificationException e ) +{ +verifier.verifyTextInLog( "[ERROR] Internal error: java.lang.ClassCastException: " ++ "org.apache.maven.lifecycle.mapping.LifecyclePhase cannot be cast to java.base/java.lang.String -> [Help 1]" ); +} +verifier.resetStreams(); +} } -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven-integration-testing] branch MNG-6364 updated (1327a7e -> b064089)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git. discard 1327a7e Fixed IT's related to JDK 9 o Need to separate between JDK..8 and JDK 9 causethe error output looks different for JDK 9. discard 5307189 [MNG-6364] - Make an activation also for JDK 9 o This will make this test pass for JDK 9. add eb2f30e upgraded parent POM and updated site.xml add e13f75c [MNG-6377] switch from Git-WIP to GitBox add 364c345 [MNG-6377] switch from Git-WIP to Gitbox add 63b8c54 [MNG-6386] ${project.baseUri} is not a valid URI (according to RFC 3986) new 27833a0 [MNG-6364] - Make an activation also for JDK 9 o This will make this test pass for JDK 9. new b064089 Fixed IT's related to JDK 9 o Need to separate between JDK..8 and JDK 9 causethe error output looks different for JDK 9. This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1327a7e) \ N -- N -- N refs/heads/MNG-6364 (b064089) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 2 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. Summary of changes: README.md | 2 +- core-it-suite/src/site/site.xml| 7 +- .../org/apache/maven/it/IntegrationTestSuite.java | 1 + .../it/MavenITmng3760BaseUriPropertyTest.java | 2 +- .../it/MavenITmng6386BaseUriPropertyTest.java | 100 + .../pom.xml" | 7 +- .../test/resources/{mng-3760 => mng-6386}/pom.xml | 7 +- .../maven/it/AbstractMavenIntegrationTestCase.java | 6 +- environments/README.md | 27 -- pom.xml| 8 +- src/site/site.xml | 17 ++-- 11 files changed, 148 insertions(+), 36 deletions(-) create mode 100644 core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6386BaseUriPropertyTest.java copy core-it-suite/src/test/resources/mng-3760/pom.xml => "core-it-suite/src/test/resources/mng-6386-\321\215\321\202\320\276 \320\277\320\276-\321\200\321\203\321\201\321\201\320\272\320\270\320\271/pom.xml" (90%) copy core-it-suite/src/test/resources/{mng-3760 => mng-6386}/pom.xml (90%) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] 01/01: created a function to run CoreITs and avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit 2cf06423b562cd43256b4419169da79bf8680a06 Author: Hervé BoutemyAuthorDate: Mon May 21 14:06:14 2018 +0200 created a function to run CoreITs and avoid copy/paste --- Jenkinsfile | 169 1 file changed, 43 insertions(+), 126 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e99928..0645844 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,8 +22,11 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e def buildOs = 'linux' def buildJdk = '8' def buildMvn = '3.5.0' +def runITsOses = ['linux', 'windows'] +def runITsJdks = ['7', '8', '9'] +def runITsMvn = '3.5.0' +def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V -Dmaven.test.failure.ignore=true" // -DmavenDistro=... def tests -def CORE_IT_PROFILES='run-its,embedded' try { @@ -59,137 +62,51 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } +Map runITsTasks = [:] +for (String os in runITsOses) { +for (def jdk in runITsJdks) { +String osLabel = jenkinsEnv.labelForOS(os); +String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}") +String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}") +echo "OS: ${os} JDK: ${jdk} => Label: ${osLabel} JDK: ${jdkName}" -parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +String stageId = "${os}-jdk${jdk}" +String stageLabel = "Run ITs ${os.capitalize()} Java ${jdk}" +runITsTasks[stageId] = { +node(osLabel) { +stage("${stageLabel}") { +// on Windows, need a short path or we hit 256 character limit for paths +// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent +// will not trample each other +dir(isUnix() ? 'test' : "/mvn-it-${EXECUTOR_NUMBER}.tmp") { +def WORK_DIR=pwd() +checkout tests +if (isUnix()) { +sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" +} else { +bat "if exist it-local-repo rmdir /s /q it-local-repo" +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:[ +junitPublisher(ignoreAttachments: false) +]) { +if (isUnix()) { +sh "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} else { +bat "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +} +deleteDir() // clean up after ourselves to reduce disk space } -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U
[maven] branch MNG-6364 updated (e069290 -> 2cf0642)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard e069290 created a function to run CoreITs and avoid copy/paste new 2cf0642 created a function to run CoreITs and avoid copy/paste This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e069290) \ N -- N -- N refs/heads/MNG-6364 (2cf0642) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: Jenkinsfile | 42 +- 1 file changed, 17 insertions(+), 25 deletions(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] branch MNG-6364 updated (8039372 -> e069290)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard 8039372 created a function to run CoreITs and avoid copy/paste new e069290 created a function to run CoreITs and avoid copy/paste This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8039372) \ N -- N -- N refs/heads/MNG-6364 (e069290) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] 01/01: created a function to run CoreITs and avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit e0692906b1e1d965e47e23d4803161153fa1980c Author: Hervé BoutemyAuthorDate: Mon May 21 14:06:14 2018 +0200 created a function to run CoreITs and avoid copy/paste --- Jenkinsfile | 177 ++-- 1 file changed, 51 insertions(+), 126 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e99928..4e3dd4f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,8 +22,11 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e def buildOs = 'linux' def buildJdk = '8' def buildMvn = '3.5.0' +def runITsOses = ['linux', 'windows'] +def runITsJdks = ['7', '8', '9'] +def runITsMvn = '3.5.0' +def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V -Dmaven.test.failure.ignore=true" // -DmavenDistro=... def tests -def CORE_IT_PROFILES='run-its,embedded' try { @@ -59,137 +62,59 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } +Map runITsTasks = [:] +for (String os in runITsOses) { +for (def jdk in runITsJdks) { +String osLabel = jenkinsEnv.labelForOS(os); +String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}") +String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}") +echo "OS: ${os} JDK: ${jdk} => Label: ${osLabel} JDK: ${jdkName}" -parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +String stageId = "${os}-jdk${jdk}" +String stageLabel = "Run ITs ${os.capitalize()} Java ${jdk}" +runITsTasks[stageId] = { +node(osLabel) { +echo "OS: ${os} JDK: ${jdk} => Label: ${osLabel} JDK: ${jdkName}" +stage("${stageLabel}") { +if (isUnix()) { +dir('test') { +def WORK_DIR=pwd() +checkout tests +sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" +unstash 'dist' +withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ +junitPublisher(ignoreAttachments: false) +]) { +sh "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} +} else { +// need a short path or we hit 256 character limit for paths +// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent +// will not trample each other +dir("/mvn-it-${EXECUTOR_NUMBER}.tmp") { +def WORK_DIR=pwd() +checkout tests +bat "if exist it-local-repo rmdir /s /q it-local-repo" +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:[ +junitPublisher(ignoreAttachments: false) +]) { +bat "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} } -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName =
[maven] branch MNG-6364 updated (c904f5f -> 8039372)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard c904f5f created a function to run CoreITs and avoid copy/paste new 8039372 created a function to run CoreITs and avoid copy/paste This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (c904f5f) \ N -- N -- N refs/heads/MNG-6364 (8039372) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: Jenkinsfile | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] 01/01: created a function to run CoreITs and avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit 8039372d27312e7e49c6c46d23818941bc1ac7c8 Author: Hervé BoutemyAuthorDate: Mon May 21 14:06:14 2018 +0200 created a function to run CoreITs and avoid copy/paste --- Jenkinsfile | 177 ++-- 1 file changed, 51 insertions(+), 126 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e99928..00c1d67 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,8 +22,11 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e def buildOs = 'linux' def buildJdk = '8' def buildMvn = '3.5.0' +def runITsOses = ['linux', 'windows'] +def runITsJdks = ['7', '8', '9'] +def runITsMvn = '3.5.0' +def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V -Dmaven.test.failure.ignore=true" // -DmavenDistro=... def tests -def CORE_IT_PROFILES='run-its,embedded' try { @@ -59,137 +62,59 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } +Map runITsTasks = [:] +for (String os in runITsOses) { +for (def jdk in runITsJdks) { +String osLabel = jenkinsEnv.labelForOS(os); +String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}") +String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}") +echo "OS: ${os} JDK: ${jdk} => Label: ${osLabel} JDK: ${jdkName}" -parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +String stageId = "${os}-jdk${jdk}" +String stageLabel = "Run ITs ${os.capitalize()} Java ${jdk}" +runITsTasks[stageId] = { +node(osLabel) { +echo "OS: ${os} JDK: ${jdk} => Label: ${osLabel} JDK: ${jdkName}" +stage("${stageLabel}") { +if (!("${os}" == 'windows')) { +dir('test') { +def WORK_DIR=pwd() +checkout tests +sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" +unstash 'dist' +withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ +junitPublisher(ignoreAttachments: false) +]) { +sh "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} +} else { +// need a short path or we hit 256 character limit for paths +// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent +// will not trample each other +dir("/mvn-it-${EXECUTOR_NUMBER}.tmp") { +def WORK_DIR=pwd() +checkout tests +bat "if exist it-local-repo rmdir /s /q it-local-repo" +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:[ +junitPublisher(ignoreAttachments: false) +]) { +bat "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} } -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName =
[maven] 01/01: created a function to run CoreITs and avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit c904f5f695f264e9a573885b8ac63c179d0d53b4 Author: Hervé BoutemyAuthorDate: Mon May 21 14:06:14 2018 +0200 created a function to run CoreITs and avoid copy/paste --- Jenkinsfile | 175 +--- 1 file changed, 49 insertions(+), 126 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e99928..2d89bc6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,8 +22,11 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e def buildOs = 'linux' def buildJdk = '8' def buildMvn = '3.5.0' +def runITsOses = ['linux', 'windows'] +def runITsJdks = ['7', '8', '9'] +def runITsMvn = '3.5.0' +def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V -Dmaven.test.failure.ignore=true" // -DmavenDistro=... def tests -def CORE_IT_PROFILES='run-its,embedded' try { @@ -59,137 +62,57 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } +Map runITsTasks = [:] +for (String os in runITsOses) { +for (def jdk in runITsJdks) { +String osLabel = jenkinsEnv.labelForOS(os); +String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}") +String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}") +echo "OS: ${os} JDK: ${jdk} => Label: ${osLabel} JDK: ${jdkName}" -parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +String stageId = "${os}-jdk${jdk}" +runITsTasks[stageId] = { +node(osLabel) { +stage("Run ITs ${os.capitalize()} Java ${jdk}") { +if (!(os == 'windows')) { +dir('test') { +def WORK_DIR=pwd() +checkout tests +sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" +unstash 'dist' +withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ +junitPublisher(ignoreAttachments: false) +]) { +sh "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} +} else { +// need a short path or we hit 256 character limit for paths +// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent +// will not trample each other +dir("/mvn-it-${EXECUTOR_NUMBER}.tmp") { +def WORK_DIR=pwd() +checkout tests +bat "if exist it-local-repo rmdir /s /q it-local-repo" +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:[ +junitPublisher(ignoreAttachments: false) +]) { +bat "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} } -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -
[maven] branch MNG-6364 updated (cdcb5f9 -> c904f5f)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard cdcb5f9 created a function to run CoreITs and avoid copy/paste new c904f5f created a function to run CoreITs and avoid copy/paste This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (cdcb5f9) \ N -- N -- N refs/heads/MNG-6364 (c904f5f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: Jenkinsfile | 70 +++-- 1 file changed, 36 insertions(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] 01/01: created a function to run CoreITs and avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit cdcb5f934f80ed49ad93bcbf8eb0938f640f409c Author: Hervé BoutemyAuthorDate: Mon May 21 14:06:14 2018 +0200 created a function to run CoreITs and avoid copy/paste --- Jenkinsfile | 185 +--- 1 file changed, 53 insertions(+), 132 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e99928..e247e4a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,8 +22,58 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e def buildOs = 'linux' def buildJdk = '8' def buildMvn = '3.5.0' +def runITsOses = ['linux', 'windows'] +def runITsJdks = ['7', '8', '9'] +def runITsMvn = '3.5.0' +def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V -Dmaven.test.failure.ignore=true" // -DmavenDistro=... def tests -def CORE_IT_PROFILES='run-its,embedded' +Map runITsTasks = [:] +for (String os in runITsOses) { +for (def jdk in runITsJdks) { +String osLabel = jenkinsEnv.labelForOS(os); +String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}") +String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}") + +String stageId = "${os}-jdk${jdk}" +runITsTasks[stageId] = { +node(osLabel) { +stage("Run ITs ${os.capitalize()} Java ${jdk}") { +if (!(os == 'windows')) { +dir('test') { +def WORK_DIR=pwd() +checkout tests +sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" +unstash 'dist' +withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ +junitPublisher(ignoreAttachments: false) +]) { +sh "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} +} else { +// need a short path or we hit 256 character limit for paths +// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent +// will not trample each other +dir("/mvn-it-${EXECUTOR_NUMBER}.tmp") { +def WORK_DIR=pwd() +checkout tests +bat "if exist it-local-repo rmdir /s /q it-local-repo" +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:[ +junitPublisher(ignoreAttachments: false) +]) { +bat "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} +} +} +} +} +} +} try { @@ -59,137 +109,8 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } - -parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -
[maven] branch MNG-6364 updated (2ca6b88 -> cdcb5f9)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard 2ca6b88 created a function to run CoreITs and avoid copy/paste new cdcb5f9 created a function to run CoreITs and avoid copy/paste This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2ca6b88) \ N -- N -- N refs/heads/MNG-6364 (cdcb5f9) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] branch MNG-6364 updated (2742100 -> 2ca6b88)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard 2742100 created a function to run CoreITs and avoid copy/paste new 2ca6b88 created a function to run CoreITs and avoid copy/paste This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (2742100) \ N -- N -- N refs/heads/MNG-6364 (2ca6b88) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] 01/01: created a function to run CoreITs and avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit 2ca6b88439e60723e0d427694db682c239f39063 Author: Hervé BoutemyAuthorDate: Mon May 21 14:06:14 2018 +0200 created a function to run CoreITs and avoid copy/paste --- Jenkinsfile | 185 +--- 1 file changed, 53 insertions(+), 132 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e99928..d7a5124 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,8 +22,58 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e def buildOs = 'linux' def buildJdk = '8' def buildMvn = '3.5.0' +def runITsOses = ['linux', 'windows'] +def runITsJdks = ['7', '8', '9'] +def runITsMvn = '3.5.0' +def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V -Dmaven.test.failure.ignore=true" // -DmavenDistro=... def tests -def CORE_IT_PROFILES='run-its,embedded' +Map runITsTasks = [:] +for (String os in runITsOses) { +for (def jdk in runITsJdks) { +String osLabel = jenkinsEnv.labelForOS(os); +String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}") +String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}") + +String stageId = "${os}-jdk${jdk}" +runITsTasks[stageId] = { +node(osLabel) { +stage("Run ITs ${osLabel} Java ${jdk}") { +if (os != 'windows') { +dir('test') { +def WORK_DIR=pwd() +checkout tests +sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" +unstash 'dist' +withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ +junitPublisher(ignoreAttachments: false) +]) { +sh "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} +} else { +// need a short path or we hit 256 character limit for paths +// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent +// will not trample each other +dir("/mvn-it-${EXECUTOR_NUMBER}.tmp") { +def WORK_DIR=pwd() +checkout tests +bat "if exist it-local-repo rmdir /s /q it-local-repo" +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:[ +junitPublisher(ignoreAttachments: false) +]) { +bat "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} +} +} +} +} +} +} try { @@ -59,137 +109,8 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } - -parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout
[maven] branch MNG-6364 updated (e8d7f6f -> 2742100)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard e8d7f6f created a function to run CoreITs and avoid copy/paste new 2742100 created a function to run CoreITs and avoid copy/paste This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (e8d7f6f) \ N -- N -- N refs/heads/MNG-6364 (2742100) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: Jenkinsfile | 69 ++--- 1 file changed, 34 insertions(+), 35 deletions(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] 01/01: created a function to run CoreITs and avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit 274210068d1f6c5263252c6cacd6409f8b092cfc Author: Hervé BoutemyAuthorDate: Mon May 21 14:06:14 2018 +0200 created a function to run CoreITs and avoid copy/paste --- Jenkinsfile | 185 +--- 1 file changed, 53 insertions(+), 132 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e99928..8364e9e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,8 +22,58 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e def buildOs = 'linux' def buildJdk = '8' def buildMvn = '3.5.0' +def runITsOses = ['linux', 'windows'] +def runITsJdks = ['7', '8', '9'] +def runITsMvn = '3.5.0' +def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V -Dmaven.test.failure.ignore=true" // -DmavenDistro=... def tests -def CORE_IT_PROFILES='run-its,embedded' +Map runITsTasks = [:] +for (String os in runITsOses) { +for (def jdk in runITsJdks) { +String osLabel = jenkinsEnv.labelForOS(os); +String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}") +String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}") + +String stageId = "${os}-jdk${jdk}" +runITsTasks[stageId] = { +node(label) { +stage("Run ITs ${osLabel} Java ${jdk}") { +if (os != 'windows') { +dir('test') { +def WORK_DIR=pwd() +checkout tests +sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" +unstash 'dist' +withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ +junitPublisher(ignoreAttachments: false) +]) { +sh "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} +} else { +// need a short path or we hit 256 character limit for paths +// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent +// will not trample each other +dir("/mvn-it-${EXECUTOR_NUMBER}.tmp") { +def WORK_DIR=pwd() +checkout tests +bat "if exist it-local-repo rmdir /s /q it-local-repo" +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:[ +junitPublisher(ignoreAttachments: false) +]) { +bat "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} +} +} +} +} +} +} try { @@ -59,137 +109,8 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } - -parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests
[maven] 01/01: created a function to run CoreITs and avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit e8d7f6fa0cc888940ab804601f2f6cfc4fad5e68 Author: Hervé BoutemyAuthorDate: Mon May 21 14:06:14 2018 +0200 created a function to run CoreITs and avoid copy/paste --- Jenkinsfile | 174 +--- 1 file changed, 48 insertions(+), 126 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e99928..f182b30 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,8 +22,11 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e def buildOs = 'linux' def buildJdk = '8' def buildMvn = '3.5.0' +def runITsOses = ['linux', 'windows'] +def runITsJdks = ['7', '8', '9'] +def runITsMvn = '3.5.0' +def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V -Dmaven.test.failure.ignore=true" // -DmavenDistro=... def tests -def CORE_IT_PROFILES='run-its,embedded' try { @@ -59,137 +62,56 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } +Map runITsTasks = [:] +for (String os in runITsOses) { +for (def jdk in runITsJdks) { +String osLabel = jenkinsEnv.labelForOS(os); +String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}") +String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}") -parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +String stageId = "${os}-jdk${jdk}" +runITsTasks[stageId] = { +node(label) { +stage("Run ITs ${osLabel} Java ${jdk}") { +if (os != 'windows') { +dir('test') { +def WORK_DIR=pwd() +checkout tests +sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" +unstash 'dist' +withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ +junitPublisher(ignoreAttachments: false) +]) { +sh "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} +} else { +// need a short path or we hit 256 character limit for paths +// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent +// will not trample each other +dir("/mvn-it-${EXECUTOR_NUMBER}.tmp") { +def WORK_DIR=pwd() +checkout tests +bat "if exist it-local-repo rmdir /s /q it-local-repo" +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:[ +junitPublisher(ignoreAttachments: false) +]) { +bat "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} } -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip
[maven] branch MNG-6364 updated (b5c1923 -> e8d7f6f)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard b5c1923 created a function to run CoreITs and avoid copy/paste new e8d7f6f created a function to run CoreITs and avoid copy/paste This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b5c1923) \ N -- N -- N refs/heads/MNG-6364 (e8d7f6f) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] branch MNG-6364 updated (4c3a599 -> b5c1923)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard 4c3a599 created a function to run CoreITs and avoid copy/paste new b5c1923 created a function to run CoreITs and avoid copy/paste This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4c3a599) \ N -- N -- N refs/heads/MNG-6364 (b5c1923) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: Jenkinsfile | 125 +--- 1 file changed, 52 insertions(+), 73 deletions(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] 01/01: created a function to run CoreITs and avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit b5c19234d8c0cd76878e1210db1cc1e701cdeffa Author: Hervé BoutemyAuthorDate: Mon May 21 14:06:14 2018 +0200 created a function to run CoreITs and avoid copy/paste --- Jenkinsfile | 174 +--- 1 file changed, 48 insertions(+), 126 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e99928..5c84e7a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,8 +22,11 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: e def buildOs = 'linux' def buildJdk = '8' def buildMvn = '3.5.0' +def runITsOses = ['linux', 'windows'] +def runITsJdks = ['7', '8', '9'] +def runITsMvn = '3.5.0' +def runITscommand = "mvn clean install -Prun-its,embedded -B -U -V -Dmaven.test.failure.ignore=true" // -DmavenDistro=... def tests -def CORE_IT_PROFILES='run-its,embedded' try { @@ -59,137 +62,56 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } +Map runITsTasks = [] +for (String os in runITsOses) { +for (def jdk in runITsJdks) { +String osLabel = jenkinsEnv.labelForOS(os); +String jdkName = jenkinsEnv.jdkFromVersion(os, "${jdk}") +String mvnName = jenkinsEnv.mvnFromVersion(os, "${runITsMvn}") -parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +String stageId = "${os}-jdk${jdk}" +runITsTasks[stageId] = { +node(label) { +stage("Run ITs ${osLabel} Java ${jdk}") { +if (os != 'windows') { +dir('test') { +def WORK_DIR=pwd() +checkout tests +sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" +unstash 'dist' +withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ +junitPublisher(ignoreAttachments: false) +]) { +sh "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} +} else { +// need a short path or we hit 256 character limit for paths +// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent +// will not trample each other +dir("/mvn-it-${EXECUTOR_NUMBER}.tmp") { +def WORK_DIR=pwd() +checkout tests +bat "if exist it-local-repo rmdir /s /q it-local-repo" +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:[ +junitPublisher(ignoreAttachments: false) +]) { +bat "${runITscommand} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} } -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip
[maven-javadoc-plugin] branch MJAVADOC-504 deleted (was 6c53ec5)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MJAVADOC-504 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git. was 6c53ec5 [MJAVADOC-504] NullPointerException in JavadocUtil.getJavaHome() when JAVA_HOME isn't set This change permanently discards the following revisions: discard 6c53ec5 [MJAVADOC-504] NullPointerException in JavadocUtil.getJavaHome() when JAVA_HOME isn't set discard 7505bb5 [MJAVADOC-504] NullPointerException in JavadocUtil.getJavaHome() when JAVA_HOME isn't set -- To stop receiving notification emails like this one, please contact rfscho...@apache.org.
[maven-javadoc-plugin] branch MJAVADOC-519 deleted (was e4a55bb)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MJAVADOC-519 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git. was e4a55bb Upgrade maven-surefire-plugin The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact rfscho...@apache.org.
[maven-javadoc-plugin] branch MJAVADOC-520 deleted (was e097445)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MJAVADOC-520 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git. was e097445 [MJAVADOC-520] Update dependencies revert plexus-utils upgrade because it generates an invalid javadoc.bat, exposed by the failing testProxy() This change permanently discards the following revisions: discard e097445 [MJAVADOC-520] Update dependencies revert plexus-utils upgrade because it generates an invalid javadoc.bat, exposed by the failing testProxy() discard 987b496 Skip Java 10 due to com.sun.tools.doclets removal in Java 10 which causes failing tests, must be fixed later discard 045e325 [MNGSITE-332] - Changed download templates of plugins not to reference .md5 anymore discard ffb0e50 [MJAVADOC-512] - Even when 1.8.0 matches there still is a warning. discard 7ca3238 [MJAVADOC-512] - Even when 1.8.0 matches there still is a warning. discard dab0d9f [MJAVADOC-519] - IT detectLinks fails on Windows discard 5d3bdb9 [MJAVADOC-520] Upgrade dependencies plexus-java discard d407097 [MJAVADOC-520] upgraded plexus-archiver to 3.6.0 discard 48a2c93 Testing to downgrade surefire-plugin. discard f93b899 Upgrade o maven-invoker to 3.0.0 o plexus-interactivity-api to 1.0-alpha-6with exclusion of plexus-component-api discard 17395a0 [MJAVADOC-520] - Upgrade plexus-utils/qdox/plexus-archiver/ Upgrade: o maven-archiver 3.2.0 o plexus-archiver 3.5 o plexus-utils 3.1.0 -- To stop receiving notification emails like this one, please contact rfscho...@apache.org.
[maven-javadoc-plugin] branch master updated: [MJAVADOC-520] Upgrade dependencies
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git The following commit(s) were added to refs/heads/master by this push: new 8e47dca [MJAVADOC-520] Upgrade dependencies 8e47dca is described below commit 8e47dca880c40c69a59af03e36c59f76e4c14ef7 Author: rfscholteAuthorDate: Mon May 21 14:54:10 2018 +0200 [MJAVADOC-520] Upgrade dependencies --- pom.xml| 14 +- .../apache/maven/plugins/javadoc/JavadocUtil.java | 291 ++--- 2 files changed, 141 insertions(+), 164 deletions(-) diff --git a/pom.xml b/pom.xml index eecab1b..8d6bd75 100644 --- a/pom.xml +++ b/pom.xml @@ -168,12 +168,12 @@ under the License. org.apache.maven maven-archiver - 3.1.1 + 3.2.0 org.apache.maven.shared maven-invoker - 2.2 + 3.0.0 org.apache.maven.shared @@ -234,12 +234,12 @@ under the License. org.codehaus.plexus plexus-java - 0.9.7 + 0.9.8 org.codehaus.plexus plexus-archiver - 3.4 + 3.6.0 org.codehaus.plexus @@ -249,12 +249,16 @@ under the License. org.codehaus.plexus plexus-interactivity-api - 1.0-alpha-4 + 1.0-alpha-6 plexus plexus-utils + + org.codehaus.plexus + plexus-component-api + diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java index 8d16277..82cc0ed 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java @@ -108,12 +108,11 @@ public class JavadocUtil /** Error message when VM could not be started using invoker. */ protected static final String ERROR_INIT_VM = "Error occurred during initialization of VM, try to reduce the Java heap size for the MAVEN_OPTS " -+ "environnement variable using -Xms: and -Xmx:."; ++ "environnement variable using -Xms: and -Xmx:."; /** - * Method that removes the invalid directories in the specified directories. - * Note: All elements in dirs could be an absolute or relative against the project's base - * directory String path. + * Method that removes the invalid directories in the specified directories. Note: All elements in + * dirs could be an absolute or relative against the project's base directory String path. * * @param project the current Maven project not null * @param dirs the collection of String directories path that will be validated. @@ -145,8 +144,8 @@ public class JavadocUtil } /** - * Method that removes the invalid files in the specified files. - * Note: All elements in files should be an absolute String path. + * Method that removes the invalid files in the specified files. Note: All elements in files + * should be an absolute String path. * * @param files the list of String files paths that will be validated. * @return a List of valid File objects. @@ -161,13 +160,14 @@ public class JavadocUtil pruned.add( f ); } } - + return pruned; } /** - * Determine whether a file should be excluded from the provided list of paths, based on whether - * it exists and is already present in the list. + * Determine whether a file should be excluded from the provided list of paths, based on whether it exists and is + * already present in the list. + * * @param f The files. * @param pruned The list of pruned files.. * @return true if the file could be pruned false otherwise. @@ -182,16 +182,15 @@ public class JavadocUtil return false; } } - + return true; } /** - * Method that gets all the source files to be excluded from the javadoc on the given - * source paths. + * Method that gets all the source files to be excluded from the javadoc on the given source paths. * - * @param sourcePaths the path to the source files - * @param subpackagesList list of subpackages to be included in the javadoc + * @param sourcePaths the path to the source files + * @param subpackagesList list of subpackages to be included in the javadoc * @param excludedPackages the package names to be excluded in the javadoc * @return a List of the source files to be excluded in the generated javadoc */ @@ -212,9 +211,8 @@ public class JavadocUtil } /** - * Convenience method to wrap an argument value in single quotes (i.e. '). Intended for
[maven] branch MNG-6364 updated (8c65413 -> 4c3a599)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard 8c65413 created a function to run CoreITs and avoid copy/paste new 4c3a599 created a function to run CoreITs and avoid copy/paste This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (8c65413) \ N -- N -- N refs/heads/MNG-6364 (4c3a599) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: Jenkinsfile | 104 1 file changed, 62 insertions(+), 42 deletions(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] 01/01: created a function to run CoreITs and avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit 4c3a599b54c91f549d259fac2562ae876f461b02 Author: Hervé BoutemyAuthorDate: Mon May 21 14:06:14 2018 +0200 created a function to run CoreITs and avoid copy/paste --- Jenkinsfile | 181 +--- 1 file changed, 62 insertions(+), 119 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e99928..9a3a647 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,44 @@ def buildOs = 'linux' def buildJdk = '8' def buildMvn = '3.5.0' def tests -def CORE_IT_PROFILES='run-its,embedded' + +def runCoreITs(String os, String version) { +String jdkName = jenkinsEnv.jdkFromVersion(os, version) +String mvnName = jenkinsEnv.mvnFromVersion(os, '3.5.0') +String command = "mvn clean install -Prun-its,embedded -B -U -V -Dmaven.test.failure.ignore=true" + +if ( os != 'windows' ) { +dir('test') { +def WORK_DIR=pwd() +checkout tests +sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" +unstash 'dist' +withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ +junitPublisher(ignoreAttachments: false) +]) { +sh "${command} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} +} else { +// need a short path or we hit 256 character limit for paths +// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent +// will not trample each other +dir("/mvn-it-${EXECUTOR_NUMBER}.tmp") { +def WORK_DIR=pwd() +checkout tests +bat "if exist it-local-repo rmdir /s /q it-local-repo" +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:[ +junitPublisher(ignoreAttachments: false) +]) { +bat "${command} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} +} +} try { @@ -59,135 +96,41 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } - parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to reduce disk space -} -} + node(jenkinsEnv.labelForOS('linux')) { + stage ("Run ITs Linux Java 7") { + runCoreITs('linux', '7') + } } },linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to reduce disk space -} -} + node(jenkinsEnv.labelForOS('linux')) { + stage ("Run ITs Linux Java 8") { + runCoreITs('linux', '8') + } } },linuxJava9: { -node(jenkinsEnv.labelForOS('linux'))
[maven] branch MNG-6364 updated (b8a97ad -> 8c65413)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard b8a97ad created a function to run CoreITs and avoid copy/paste new 8c65413 created a function to run CoreITs and avoid copy/paste This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (b8a97ad) \ N -- N -- N refs/heads/MNG-6364 (8c65413) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: Jenkinsfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] 01/01: created a function to run CoreITs and avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit 8c65413276d881c3b68de104be07283fbf848a65 Author: Hervé BoutemyAuthorDate: Mon May 21 14:06:14 2018 +0200 created a function to run CoreITs and avoid copy/paste --- Jenkinsfile | 173 +--- 1 file changed, 48 insertions(+), 125 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e99928..a40bd15 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,48 @@ def buildOs = 'linux' def buildJdk = '8' def buildMvn = '3.5.0' def tests -def CORE_IT_PROFILES='run-its,embedded' + +def runCoreITs(String os, String version) { +node(jenkinsEnv.labelForOS(os)) { +stage ("Run ITs ${os} Java ${version}") { +String jdkName = jenkinsEnv.jdkFromVersion(os, version) +String mvnName = jenkinsEnv.mvnFromVersion(os, '3.5.0') +String command = "mvn clean install -Prun-its,embedded -B -U -V -Dmaven.test.failure.ignore=true" + +if ( os != 'windows' ) { + dir('test') { + def WORK_DIR=pwd() + checkout tests + sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" + unstash 'dist' + withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ + junitPublisher(ignoreAttachments: false) + ]) { + sh "${command} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" + } + deleteDir() // clean up after ourselves to reduce disk space + } + } else { +// need a short path or we hit 256 character limit for paths +// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent +// will not trample each other +dir("/mvn-it-${EXECUTOR_NUMBER}.tmp") { +def WORK_DIR=pwd() +checkout tests +bat "if exist it-local-repo rmdir /s /q it-local-repo" +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:[ +junitPublisher(ignoreAttachments: false) +]) { +bat "${command} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} + } +} +} +} try { @@ -59,136 +100,18 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } - parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to reduce disk space -} -} -} +runCoreITs('linux', '7') },linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to
[maven-javadoc-plugin] 03/06: [MJAVADOC-512] - Even when 1.8.0 matches there still is a warning.
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MJAVADOC-520 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git commit ffb0e5012397aa70e3237d64b0669906c283426a Author: Karl Heinz MarbaiseAuthorDate: Sat Mar 24 20:38:12 2018 +0100 [MJAVADOC-512] - Even when 1.8.0 matches there still is a warning. o Followup seemed to be that I have missed something during the merge. Signed-off-by: Karl Heinz Marbaise --- src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java index 24ea1b9..487bb0f 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/AbstractJavadocMojo.java @@ -3782,7 +3782,7 @@ public abstract class AbstractJavadocMojo throw new MavenReportException( "Unable to parse javadoc version: " + e.getMessage(), e ); } -if ( javadocRuntimeVersion != jVersion && getLog().isWarnEnabled() ) +if ( javadocRuntimeVersion.compareTo( jVersion ) != 0 && getLog().isWarnEnabled() ) { getLog().warn( "Are you sure about the parameter? It seems to be " + jVersion ); } -- To stop receiving notification emails like this one, please contact rfscho...@apache.org.
[maven-javadoc-plugin] 02/06: [MJAVADOC-512] - Even when 1.8.0 matches there still is a warning.
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MJAVADOC-520 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git commit 7ca32388988352dc6c656de8af8787ececbe2ec1 Author: Jene JasperAuthorDate: Sat Mar 24 18:41:30 2018 +0100 [MJAVADOC-512] - Even when 1.8.0 matches there still is a warning. Signed-off-by: Karl Heinz Marbaise -- To stop receiving notification emails like this one, please contact rfscho...@apache.org.
[maven-javadoc-plugin] 05/06: Skip Java 10 due to com.sun.tools.doclets removal in Java 10 which causes failing tests, must be fixed later
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MJAVADOC-520 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git commit 987b4969df707853798e98f224ddc79dc7ff1178 Author: rfscholteAuthorDate: Mon May 21 13:46:45 2018 +0200 Skip Java 10 due to com.sun.tools.doclets removal in Java 10 which causes failing tests, must be fixed later --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 09ac70f..a8bd6ff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,4 +17,4 @@ * under the License. */ -asfMavenTlpStdBuild() +asfMavenTlpStdBuild(jdk:[7,8,9]) -- To stop receiving notification emails like this one, please contact rfscho...@apache.org.
[maven-javadoc-plugin] 01/06: [MJAVADOC-519] - IT detectLinks fails on Windows
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MJAVADOC-520 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git commit dab0d9f2f90b196272a962ed02cafd7fe9c47629 Author: Karl Heinz MarbaiseAuthorDate: Sat Mar 24 13:56:26 2018 +0100 [MJAVADOC-519] - IT detectLinks fails on Windows --- src/it/projects/detectLinks/pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/it/projects/detectLinks/pom.xml b/src/it/projects/detectLinks/pom.xml index 2211198..ed387e8 100644 --- a/src/it/projects/detectLinks/pom.xml +++ b/src/it/projects/detectLinks/pom.xml @@ -53,8 +53,9 @@ org.apache.maven - maven-script-marmalade - 2.0-beta-2 + maven-script + 2.2.1 + pom -- To stop receiving notification emails like this one, please contact rfscho...@apache.org.
[maven-javadoc-plugin] 06/06: [MJAVADOC-520] Update dependencies revert plexus-utils upgrade because it generates an invalid javadoc.bat, exposed by the failing testProxy()
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MJAVADOC-520 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git commit e097445a2bb92007dd8cf3b1e72fb2831909cd5b Author: rfscholteAuthorDate: Mon May 21 14:34:22 2018 +0200 [MJAVADOC-520] Update dependencies revert plexus-utils upgrade because it generates an invalid javadoc.bat, exposed by the failing testProxy() --- pom.xml| 2 +- .../apache/maven/plugins/javadoc/JavadocUtil.java | 26 +++--- 2 files changed, 9 insertions(+), 19 deletions(-) diff --git a/pom.xml b/pom.xml index 8fa3696..9188aee 100644 --- a/pom.xml +++ b/pom.xml @@ -244,7 +244,7 @@ under the License. org.codehaus.plexus plexus-utils - 3.1.0 + 3.0.24 org.codehaus.plexus diff --git a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java index e49a792..82cc0ed 100644 --- a/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java +++ b/src/main/java/org/apache/maven/plugins/javadoc/JavadocUtil.java @@ -1178,24 +1178,14 @@ public class JavadocUtil InvocationOutputHandler outputHandler = new PrintStreamHandler( ps, false ); request.setOutputHandler( outputHandler ); -try -{ -outputHandler.consumeLine( "Invoking Maven for the goals: " + goals + " with " -+ ( properties == null ? "no properties" : "properties=" + properties ) ); -outputHandler.consumeLine( "" ); -outputHandler.consumeLine( "M2_HOME=" + getMavenHome( log ) ); -outputHandler.consumeLine( "MAVEN_OPTS=" + getMavenOpts( log ) ); -outputHandler.consumeLine( "JAVA_HOME=" + getJavaHome( log ) ); -outputHandler.consumeLine( "JAVA_OPTS=" + getJavaOpts( log ) ); -outputHandler.consumeLine( "" ); -} -catch ( IOException e ) -{ -if ( log != null && log.isDebugEnabled() ) -{ -log.debug( "Failure during outputHandler consumeLine." ); -} -} +outputHandler.consumeLine( "Invoking Maven for the goals: " + goals + " with " ++ ( properties == null ? "no properties" : "properties=" + properties ) ); +outputHandler.consumeLine( "" ); +outputHandler.consumeLine( "M2_HOME=" + getMavenHome( log ) ); +outputHandler.consumeLine( "MAVEN_OPTS=" + getMavenOpts( log ) ); +outputHandler.consumeLine( "JAVA_HOME=" + getJavaHome( log ) ); +outputHandler.consumeLine( "JAVA_OPTS=" + getJavaOpts( log ) ); +outputHandler.consumeLine( "" ); try { -- To stop receiving notification emails like this one, please contact rfscho...@apache.org.
[maven-javadoc-plugin] 04/06: [MNGSITE-332] - Changed download templates of plugins not to reference .md5 anymore
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MJAVADOC-520 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git commit 045e325b0cc462bc05228f3536fa2b488cd86fe0 Author: Karl Heinz MarbaiseAuthorDate: Tue Apr 10 18:06:02 2018 +0200 [MNGSITE-332] - Changed download templates of plugins not to reference .md5 anymore --- src/site/xdoc/download.xml.vm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/site/xdoc/download.xml.vm b/src/site/xdoc/download.xml.vm index 09d4f42..cf13dc9 100644 --- a/src/site/xdoc/download.xml.vm +++ b/src/site/xdoc/download.xml.vm @@ -108,7 +108,7 @@ under the License. ${project.name} ${project.version} (Source zip) maven/plugins/${project.artifactId}-${project.version}-source-release.zip -http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5;>maven/plugins/${project.artifactId}-${project.version}-source-release.zip.md5 +http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.sha1;>maven/plugins/${project.artifactId}-${project.version}-source-release.zip.sha1 http://www.apache.org/dist/maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc;>maven/plugins/${project.artifactId}-${project.version}-source-release.zip.asc -- To stop receiving notification emails like this one, please contact rfscho...@apache.org.
[maven-javadoc-plugin] branch MJAVADOC-520 updated (5d3bdb9 -> e097445)
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a change to branch MJAVADOC-520 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git. from 5d3bdb9 [MJAVADOC-520] Upgrade dependencies plexus-java new dab0d9f [MJAVADOC-519] - IT detectLinks fails on Windows new 7ca3238 [MJAVADOC-512] - Even when 1.8.0 matches there still is a warning. new ffb0e50 [MJAVADOC-512] - Even when 1.8.0 matches there still is a warning. new 045e325 [MNGSITE-332] - Changed download templates of plugins not to reference .md5 anymore new 987b496 Skip Java 10 due to com.sun.tools.doclets removal in Java 10 which causes failing tests, must be fixed later new e097445 [MJAVADOC-520] Update dependencies revert plexus-utils upgrade because it generates an invalid javadoc.bat, exposed by the failing testProxy() The 6 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. Summary of changes: Jenkinsfile| 2 +- pom.xml| 2 +- src/it/projects/detectLinks/pom.xml| 5 +++-- .../maven/plugins/javadoc/AbstractJavadocMojo.java | 2 +- .../apache/maven/plugins/javadoc/JavadocUtil.java | 26 +++--- src/site/xdoc/download.xml.vm | 2 +- 6 files changed, 15 insertions(+), 24 deletions(-) -- To stop receiving notification emails like this one, please contact rfscho...@apache.org.
[maven] 01/01: created a function to run CoreITs and avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit b8a97adfddca7dc8b47f2c8eb731b8695230e07f Author: Hervé BoutemyAuthorDate: Mon May 21 14:06:14 2018 +0200 created a function to run CoreITs and avoid copy/paste --- Jenkinsfile | 172 +--- 1 file changed, 48 insertions(+), 124 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e99928..e37f236 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -25,6 +25,48 @@ def buildMvn = '3.5.0' def tests def CORE_IT_PROFILES='run-its,embedded' +def runCoreITs(String os, String version) { +node(jenkinsEnv.labelForOS(os)) { +stage ("Run ITs ${os} Java ${version}") { +String jdkName = jenkinsEnv.jdkFromVersion(os, version) +String mvnName = jenkinsEnv.mvnFromVersion(os, buildMvn) +String command = "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true" + +if ( os != 'windows' ) { + dir('test') { + def WORK_DIR=pwd() + checkout tests + sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" + unstash 'dist' + withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ + junitPublisher(ignoreAttachments: false) + ]) { + sh "${command} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" + } + deleteDir() // clean up after ourselves to reduce disk space + } + } else { +// need a short path or we hit 256 character limit for paths +// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent +// will not trample each other +dir("/mvn-it-${EXECUTOR_NUMBER}.tmp") { +def WORK_DIR=pwd() +checkout tests +bat "if exist it-local-repo rmdir /s /q it-local-repo" +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:[ +junitPublisher(ignoreAttachments: false) +]) { +bat "${command} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} + } +} +} +} + try { node(jenkinsEnv.labelForOS(buildOs)) { @@ -59,136 +101,18 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } - parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to reduce disk space -} -} -} +runCoreITs('linux', '7') },linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to
[maven] branch MNG-6364 updated (1686fa6 -> b8a97ad)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard 1686fa6 created a function to run CoreITs and avoid copy/paste new b8a97ad created a function to run CoreITs and avoid copy/paste This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (1686fa6) \ N -- N -- N refs/heads/MNG-6364 (b8a97ad) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: Jenkinsfile | 68 ++--- 1 file changed, 34 insertions(+), 34 deletions(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] 01/01: created a function to run CoreITs and avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit 1686fa62002b0a00b70e252fc43aa7677dcb6cf5 Author: Hervé BoutemyAuthorDate: Mon May 21 14:06:14 2018 +0200 created a function to run CoreITs and avoid copy/paste --- Jenkinsfile | 146 +++- 1 file changed, 35 insertions(+), 111 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e99928..918c323 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,70 +59,27 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } +def runCoreITs(String os, String version) { +node(jenkinsEnv.labelForOS(os)) { +stage ("Run ITs ${os} Java ${version}") { +String jdkName = jenkinsEnv.jdkFromVersion(os, version) +String mvnName = jenkinsEnv.mvnFromVersion(os, buildMvn) +String command = "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true" -parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava9: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Linux Java 9') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '9') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -}, winJava7: { -node(jenkinsEnv.labelForOS('windows')) { -stage ('Run ITs Windows Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('windows', '7') -String mvnName = jenkinsEnv.mvnFromVersion('windows', buildMvn) - +if ( os != 'windows' ) { + dir('test') { + def WORK_DIR=pwd() + checkout tests + sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" + unstash 'dist' + withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ + junitPublisher(ignoreAttachments: false) + ]) { + sh "${command} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +
[maven] branch MNG-6364 updated (81f7705 -> 1686fa6)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard 81f7705 created a function to run CoreITs and avoid copy/paste new 1686fa6 created a function to run CoreITs and avoid copy/paste This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (81f7705) \ N -- N -- N refs/heads/MNG-6364 (1686fa6) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] 01/01: created a function to run CoreITs and avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit 81f77051d9344ebc59de270eab3055a9a27807db Author: Hervé BoutemyAuthorDate: Mon May 21 14:06:14 2018 +0200 created a function to run CoreITs and avoid copy/paste --- Jenkinsfile | 146 +++- 1 file changed, 35 insertions(+), 111 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e99928..bc7bd01 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,70 +59,27 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } +def runCoreITs(String os, String version) { +node(jenkinsEnv.labelForOS(os)) { +stage ("Run ITs ${os} Java ${version}') { +String jdkName = jenkinsEnv.jdkFromVersion(os, version) +String mvnName = jenkinsEnv.mvnFromVersion(os, buildMvn) +String command = "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true" -parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava9: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Linux Java 9') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '9') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -}, winJava7: { -node(jenkinsEnv.labelForOS('windows')) { -stage ('Run ITs Windows Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('windows', '7') -String mvnName = jenkinsEnv.mvnFromVersion('windows', buildMvn) - +if ( os != 'windows' ) { + dir('test') { + def WORK_DIR=pwd() + checkout tests + sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" + unstash 'dist' + withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ + junitPublisher(ignoreAttachments: false) + ]) { + sh "${command} -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +
[maven] branch MNG-6364 updated (0480d5b -> 81f7705)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard 0480d5b created a function to run CoreITs and avoid copy/paste new 81f7705 created a function to run CoreITs and avoid copy/paste This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (0480d5b) \ N -- N -- N refs/heads/MNG-6364 (81f7705) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] branch MNG-6364 updated: created a function to run CoreITs and avoid copy/paste
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git The following commit(s) were added to refs/heads/MNG-6364 by this push: new 0480d5b created a function to run CoreITs and avoid copy/paste 0480d5b is described below commit 0480d5b85cbf080fff5a3f0a595c463ac12a5faf Author: Hervé BoutemyAuthorDate: Mon May 21 14:06:14 2018 +0200 created a function to run CoreITs and avoid copy/paste --- Jenkinsfile | 146 +++- 1 file changed, 35 insertions(+), 111 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 6e99928..bc7bd01 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -59,70 +59,27 @@ node(jenkinsEnv.labelForOS(buildOs)) { } } +def runCoreITs(String os, String version) { +node(jenkinsEnv.labelForOS(os)) { +stage ("Run ITs ${os} Java ${version}') { +String jdkName = jenkinsEnv.jdkFromVersion(os, version) +String mvnName = jenkinsEnv.mvnFromVersion(os, buildMvn) +String command = "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true" -parallel linuxJava7:{ -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '7') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava8: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Run ITs Linux Java 8') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '8') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -},linuxJava9: { -node(jenkinsEnv.labelForOS('linux')) { -stage ('Linux Java 9') { -String jdkName = jenkinsEnv.jdkFromVersion('linux', '9') -String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) -dir('test') { -def WORK_DIR=pwd() -checkout tests -sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" -unstash 'dist' -withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ -junitPublisher(ignoreAttachments: false) -]) { -sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" -} -deleteDir() // clean up after ourselves to reduce disk space -} -} -} -}, winJava7: { -node(jenkinsEnv.labelForOS('windows')) { -stage ('Run ITs Windows Java 7') { -String jdkName = jenkinsEnv.jdkFromVersion('windows', '7') -String mvnName = jenkinsEnv.mvnFromVersion('windows', buildMvn) - +if ( os != 'windows' ) { + dir('test') { + def WORK_DIR=pwd() + checkout tests + sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" + unstash 'dist' + withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ +
[maven-javadoc-plugin] branch master updated: Skip Java 10 due to com.sun.tools.doclets removal in Java 10 which causes failing tests, must be fixed later
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git The following commit(s) were added to refs/heads/master by this push: new 86aa561 Skip Java 10 due to com.sun.tools.doclets removal in Java 10 which causes failing tests, must be fixed later 86aa561 is described below commit 86aa5613808e5fb15fd801b69f024403f83fbeb9 Author: rfscholteAuthorDate: Mon May 21 13:46:45 2018 +0200 Skip Java 10 due to com.sun.tools.doclets removal in Java 10 which causes failing tests, must be fixed later --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 09ac70f..a8bd6ff 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,4 +17,4 @@ * under the License. */ -asfMavenTlpStdBuild() +asfMavenTlpStdBuild(jdk:[7,8,9]) -- To stop receiving notification emails like this one, please contact rfscho...@apache.org.
[maven] 01/01: [MNG-6364] Enhanced Jenkinsfile to test Core with JDK 9
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git commit 4312052974cf4f28864ffbc6a56db86e181b610f Author: Karl Heinz MarbaiseAuthorDate: Sun Feb 18 15:15:47 2018 +0100 [MNG-6364] Enhanced Jenkinsfile to test Core with JDK 9 --- Jenkinsfile | 43 +++ 1 file changed, 43 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 2564cc8..6e99928 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -98,6 +98,25 @@ parallel linuxJava7:{ } } } +},linuxJava9: { +node(jenkinsEnv.labelForOS('linux')) { +stage ('Linux Java 9') { +String jdkName = jenkinsEnv.jdkFromVersion('linux', '9') +String mvnName = jenkinsEnv.mvnFromVersion('linux', buildMvn) +dir('test') { +def WORK_DIR=pwd() +checkout tests +sh "rm -rvf $WORK_DIR/apache-maven-dist.zip $WORK_DIR/it-local-repo" +unstash 'dist' +withMaven(jdk: jdkName, maven: mvnName, mavenLocalRepo:"${WORK_DIR}/it-local-repo", options:[ +junitPublisher(ignoreAttachments: false) +]) { +sh "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} +} +} }, winJava7: { node(jenkinsEnv.labelForOS('windows')) { stage ('Run ITs Windows Java 7') { @@ -146,6 +165,30 @@ parallel linuxJava7:{ } } } +}, winJava9: { +node(jenkinsEnv.labelForOS('windows')) { +stage ('Windows Java 9') { +String jdkName = jenkinsEnv.jdkFromVersion('windows', '9') +String mvnName = jenkinsEnv.mvnFromVersion('windows', buildMvn) + +// need a short path or we hit 256 character limit for paths +// using EXECUTOR_NUMBER guarantees that concurrent builds on same agent +// will not trample each other +dir("/mvn-it-${EXECUTOR_NUMBER}.tmp") { +def WORK_DIR=pwd() +checkout tests +bat "if exist it-local-repo rmdir /s /q it-local-repo" +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:[ +junitPublisher(ignoreAttachments: false) +]) { +bat "mvn clean install -P$CORE_IT_PROFILES -B -U -V -Dmaven.test.failure.ignore=true -DmavenDistro=$WORK_DIR/apache-maven-dist.zip" +} +deleteDir() // clean up after ourselves to reduce disk space +} +} +} } // JENKINS-34376 seems to make it hard to detect the aborted builds -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] branch MNG-6364 updated (90415fd -> 4312052)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6364 in repository https://gitbox.apache.org/repos/asf/maven.git. discard 90415fd [MNG-6364] - Enhanced Jenkinsfile to Build Core with JDK 9 add fef1462 [MNG-6362] - Adding CONTRIBUTING, README.md pull_request_template for GitHub. add 0dbdda8 Add .factorypath from m2e to .gitignore add ef41c0e updated model version to latest 1.1.0 add 9c118d3 [MNG-6363] - Remove secret thread configuration property from code add 97e8a2b because it is so more convenient to have this quick guide here when you are using a console to build maven and do not want to open some web link add 5beb347 Fix missing/improper use of @link add 8e0efaa [MNG-6386] ${project.baseUri} is not a valid URI (according to RFC 3986) add 9abfc88 [MNG-5756] Java home output in mvn -v is misleading add 14365ba [MNG-6403] Artifact#VERSION_FILE_PATTERN does not escape period between date and time add 9021d66 Move ArtifactUtilsTest and friends from maven-compat to maven-artifact add 3c3a590 [MNG-6382][MNG-6372] upgraded Jansi to 1.17.1 add 454a4e7 [MNG-6411] Improve readability of project list returned when --resume-from option value is invalid add 39fdaad added "Run ITs" prefix to IT stage names add 864d180 [MNG-6410] Add groupId to --resume-from suggestion if artifactId is not unique in reactor add 03b3c11 build with Java 8 to avoid TLS 1.2 failure on license download new 4312052 [MNG-6364] Enhanced Jenkinsfile to test Core with JDK 9 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (90415fd) \ N -- N -- N refs/heads/MNG-6364 (4312052) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: .github/pull_request_template.md | 30 +++ CONTRIBUTING.md| 92 + Jenkinsfile| 10 +-- README.md | 93 +++--- .../java/org/apache/maven/artifact/Artifact.java | 2 +- .../apache/maven/artifact/ArtifactUtilsTest.java | 2 + .../apache/maven/artifact/DefaultArtifactTest.java | 0 .../artifact/handler/ArtifactHandlerMock.java | 0 .../AbstractStringBasedModelInterpolator.java | 2 +- .../apache/maven/graph/DefaultGraphBuilder.java| 19 - .../org/apache/maven/project/MavenProject.java | 6 +- .../apache/maven/project/PomConstructionTest.java | 81 +++ .../pom.xml| 0 .../org/apache/maven/cli/CLIReportingUtils.java| 7 +- .../main/java/org/apache/maven/cli/MavenCli.java | 38 +++-- .../AbstractStringBasedModelInterpolator.java | 4 +- maven-settings/src/main/mdo/settings.mdo | 4 - maven-settings/src/site/apt/index.apt | 2 +- pom.xml| 2 +- 19 files changed, 318 insertions(+), 76 deletions(-) create mode 100644 .github/pull_request_template.md create mode 100644 CONTRIBUTING.md rename {maven-compat => maven-artifact}/src/test/java/org/apache/maven/artifact/ArtifactUtilsTest.java (93%) rename {maven-compat => maven-artifact}/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java (100%) rename {maven-compat => maven-artifact}/src/test/java/org/apache/maven/artifact/handler/ArtifactHandlerMock.java (100%) rename maven-core/src/test/resources-project-builder/{baseurl-interpolation => baseuri-interpolation}/pom.xml (100%) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven-javadoc-plugin] branch MJAVADOC-520 updated: [MJAVADOC-520] Upgrade dependencies plexus-java
This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch MJAVADOC-520 in repository https://gitbox.apache.org/repos/asf/maven-javadoc-plugin.git The following commit(s) were added to refs/heads/MJAVADOC-520 by this push: new 5d3bdb9 [MJAVADOC-520] Upgrade dependencies plexus-java 5d3bdb9 is described below commit 5d3bdb9e464c0ccfa85057f16343ec0a5055bc93 Author: rfscholteAuthorDate: Mon May 21 12:14:22 2018 +0200 [MJAVADOC-520] Upgrade dependencies plexus-java --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 80cb9cb..8fa3696 100644 --- a/pom.xml +++ b/pom.xml @@ -234,7 +234,7 @@ under the License. org.codehaus.plexus plexus-java - 0.9.7 + 0.9.8 org.codehaus.plexus -- To stop receiving notification emails like this one, please contact rfscho...@apache.org.
[maven] branch build-java8 updated (df886ef -> 03b3c11)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch build-java8 in repository https://gitbox.apache.org/repos/asf/maven.git. discard df886ef build with Java 8 to avoid TLS 1.2 failure on license download add 864d180 [MNG-6410] Add groupId to --resume-from suggestion if artifactId is not unique in reactor new 03b3c11 build with Java 8 to avoid TLS 1.2 failure on license download This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (df886ef) \ N -- N -- N refs/heads/build-java8 (03b3c11) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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. Summary of changes: .../main/java/org/apache/maven/cli/MavenCli.java | 33 -- 1 file changed, 31 insertions(+), 2 deletions(-) -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] 01/01: build with Java 8 to avoid TLS 1.2 failure on license download
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch build-java8 in repository https://gitbox.apache.org/repos/asf/maven.git commit 03b3c110e2a730aa82181cf6567610ed72883982 Author: Hervé BoutemyAuthorDate: Sun May 20 16:54:59 2018 +0200 build with Java 8 to avoid TLS 1.2 failure on license download --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c3e5a43..2564cc8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,7 +20,7 @@ properties([buildDiscarder(logRotator(artifactNumToKeepStr: '5', numToKeepStr: env.BRANCH_NAME=='master'?'10':'5'))]) def buildOs = 'linux' -def buildJdk = '7' +def buildJdk = '8' def buildMvn = '3.5.0' def tests def CORE_IT_PROFILES='run-its,embedded' -- To stop receiving notification emails like this one, please contact hbout...@apache.org.
[maven] branch MNG-6410 deleted (was 172c1af)
This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a change to branch MNG-6410 in repository https://gitbox.apache.org/repos/asf/maven.git. was 172c1af Rename method name to the option name This change permanently discards the following revisions: discard 172c1af Rename method name to the option name discard f208497 improved javadoc and method name discard f405517 [MNG-6410] Add groupId to --resume-from suggestion if artifactId is not unique in reactor -- To stop receiving notification emails like this one, please contact hbout...@apache.org.