From a01c09131546b597b807af363fe4cba0db9eeb8c Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 27 Feb 2022 18:32:12 +1000 Subject: [PATCH 01/17] try to include those dependencies to fake the build plan and be sure its are runned last when using -Txx or mvnd Signed-off-by: Olivier Lamy --- surefire-its/pom.xml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml index 13adedc5fe..638b75156e 100644 --- a/surefire-its/pom.xml +++ b/surefire-its/pom.xml @@ -78,6 +78,21 @@ commons-lang3 test + + + org.apache.maven.plugins + maven-surefire-plugin + ${project.version} + provided + + + org.apache.maven.plugins + maven-failsafe-plugin + ${project.version} + provided + From f244735d1a4da5ec64470434740601b4733d6816 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 27 Mar 2022 00:38:03 +1000 Subject: [PATCH 02/17] try -T3 for Jenkins and gh Signed-off-by: Olivier Lamy --- .github/workflows/maven-verify.yml | 4 ++-- Jenkinsfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index bdecc6a77a..c544aeaf7a 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -28,9 +28,9 @@ jobs: with: jdk-matrix: '[ "8", "11", "17", "18" ]' ff-jdk: '18' - ff-goal: 'clean install site site:stage -P reporting -nsu' + ff-goal: 'clean install site site:stage -P reporting -nsu -T3' ff-site-goal: '-v' - verify-goal: 'clean install -nsu -P run-its' + verify-goal: 'clean install -nsu -P run-its -T3' verify-fail-fast: false failure-upload-path: | surefire-its/target/*/log.txt diff --git a/Jenkinsfile b/Jenkinsfile index c3f1381912..419aece38e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ final def mavens = env.BRANCH_NAME == 'master' ? ['3.8.x', '3.2.x'] : ['3.8.x'] // all non-EOL versions and the first EA final def jdks = [18, 17, 11, 8] -final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its'] +final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its','-T3'] final def goals = ['clean', 'install'] final def goalsDepl = ['clean', 'deploy'] final Map stages = [:] From 9c50e638a43308ae122fd370dded89406511d940 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 2 Mar 2022 10:22:28 +1000 Subject: [PATCH 03/17] maven-surefire-report-plugin need as well Signed-off-by: Olivier Lamy --- surefire-its/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml index 638b75156e..8fdac7dccf 100644 --- a/surefire-its/pom.xml +++ b/surefire-its/pom.xml @@ -93,6 +93,12 @@ ${project.version} provided + + org.apache.maven.plugins + maven-surefire-report-plugin + ${project.version} + provided + From 881881103cab670ce5065b1f347d69485c2a70ba Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Wed, 2 Mar 2022 11:05:12 +1000 Subject: [PATCH 04/17] try to get plugins installed locally so we can have verify working, ideally we should use a different local repo Signed-off-by: Olivier Lamy --- surefire-its/pom.xml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml index 8fdac7dccf..ad60c0708e 100644 --- a/surefire-its/pom.xml +++ b/surefire-its/pom.xml @@ -238,6 +238,27 @@ + + org.apache.maven.plugins + maven-invoker-plugin + + ${settings.localRepository} + + org.apache.maven.plugins:maven-surefire-report-plugin:${project.version} + org.apache.maven.plugins:maven-surefire-plugin:${project.version} + org.apache.maven.plugins:maven-failsafe-plugin:${project.version} + + + + + install-dependencies + pre-integration-test + + install + + + + From 6212c4a5343e51467d627c8c010caa0ce283761e Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 27 Mar 2022 00:40:23 +1000 Subject: [PATCH 05/17] no need of extraArtifacts Signed-off-by: Olivier Lamy --- surefire-its/pom.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml index ad60c0708e..060c15e841 100644 --- a/surefire-its/pom.xml +++ b/surefire-its/pom.xml @@ -243,11 +243,6 @@ maven-invoker-plugin ${settings.localRepository} - - org.apache.maven.plugins:maven-surefire-report-plugin:${project.version} - org.apache.maven.plugins:maven-surefire-plugin:${project.version} - org.apache.maven.plugins:maven-failsafe-plugin:${project.version} - From d65f1a65167f37d7b632ea6fd4f200bce060c2ca Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 27 Mar 2022 00:41:48 +1000 Subject: [PATCH 06/17] wrong merge Signed-off-by: Olivier Lamy --- .github/workflows/maven-verify.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index c544aeaf7a..2351864d2b 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -26,6 +26,7 @@ jobs: name: Verify uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2 with: +<<<<<<< HEAD jdk-matrix: '[ "8", "11", "17", "18" ]' ff-jdk: '18' ff-goal: 'clean install site site:stage -P reporting -nsu -T3' From 880d96f180bf2ddbfb6ab883de482559ff05bf0e Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 27 Mar 2022 00:46:13 +1000 Subject: [PATCH 07/17] add junit platform provider as well Signed-off-by: Olivier Lamy --- surefire-its/pom.xml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml index 060c15e841..46c8d727dc 100644 --- a/surefire-its/pom.xml +++ b/surefire-its/pom.xml @@ -85,19 +85,25 @@ org.apache.maven.plugins maven-surefire-plugin ${project.version} - provided + compile org.apache.maven.plugins maven-failsafe-plugin ${project.version} - provided + compile org.apache.maven.plugins maven-surefire-report-plugin ${project.version} - provided + compile + + + org.apache.maven.surefire + surefire-junit-platform + ${project.version} + compile From 3c1a52b2efe18d0663acf2cadc4eb9b0be310c7a Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 27 Mar 2022 00:48:49 +1000 Subject: [PATCH 08/17] surefire-its should depend on all providers Signed-off-by: Olivier Lamy --- surefire-its/pom.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml index 46c8d727dc..f2e5c8f5c6 100644 --- a/surefire-its/pom.xml +++ b/surefire-its/pom.xml @@ -105,6 +105,30 @@ ${project.version} compile + + org.apache.maven.surefire + surefire-junit48 + ${project.version} + compile + + + org.apache.maven.surefire + suerfire-junit4 + ${project.version} + compile + + + org.apache.maven.surefire + surefire-junit3 + ${project.version} + compile + + + org.apache.maven.surefire + surefire-testng + ${project.version} + compile + From 33f95339cf1564d0257a6373cb557aecb4801ca5 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 27 Mar 2022 07:50:53 +1000 Subject: [PATCH 09/17] fix typo Signed-off-by: Olivier Lamy --- surefire-its/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml index f2e5c8f5c6..9908a0d178 100644 --- a/surefire-its/pom.xml +++ b/surefire-its/pom.xml @@ -107,13 +107,13 @@ org.apache.maven.surefire - surefire-junit48 + surefire-junit47 ${project.version} compile org.apache.maven.surefire - suerfire-junit4 + surefire-junit4 ${project.version} compile From 2c655f4a4d54be307dda692387eb366ca2f2c637 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 10 Jun 2022 14:13:53 +1000 Subject: [PATCH 10/17] fix merge Signed-off-by: Olivier Lamy --- .github/workflows/maven-verify.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index 2351864d2b..c544aeaf7a 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -26,7 +26,6 @@ jobs: name: Verify uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2 with: -<<<<<<< HEAD jdk-matrix: '[ "8", "11", "17", "18" ]' ff-jdk: '18' ff-goal: 'clean install site site:stage -P reporting -nsu -T3' From 074d532cb497972183d61fb21b5c9a6e95a9bd81 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 10 Jun 2022 18:07:29 +1000 Subject: [PATCH 11/17] test Verifier using embedded/auto mode Signed-off-by: Olivier Lamy --- surefire-its/pom.xml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml index 9908a0d178..13da1f6e32 100644 --- a/surefire-its/pom.xml +++ b/surefire-its/pom.xml @@ -223,6 +223,11 @@ run-its + + auto + -Xmx512m + -server -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djava.awt.headless=true -Djdk.net.URLClassPath.disableClassPathURLCheck=true + @@ -234,7 +239,7 @@ 1 false once - -server -Xmx64m -XX:+UseG1GC -XX:+TieredCompilation -XX:TieredStopAtLevel=1 -Djava.awt.headless=true -Djdk.net.URLClassPath.disableClassPathURLCheck=true + ${surefireMemory} ${surefire.extraArgLine} org/apache/**/*IT*.java @@ -246,7 +251,7 @@ ${project.build.directory}/private/settings.xml ${project.build.directory}/private/toolchains.xml ${project.build.directory} - forked + ${verifier.forkMode} ${jacoco-it.agent} true From aa49e6301cf7861b59323cf15ec0ff3d2a24f7d9 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 10 Jun 2022 21:10:38 +1000 Subject: [PATCH 12/17] only one thread to avoid flaky tests and fix path of log4j logs to be in target directory Signed-off-by: Olivier Lamy --- .github/workflows/maven-verify.yml | 4 ++-- .../src/main/resources/log4j.properties | 6 +++--- .../src/main/resources/log4j.properties | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index c544aeaf7a..bdecc6a77a 100644 --- a/.github/workflows/maven-verify.yml +++ b/.github/workflows/maven-verify.yml @@ -28,9 +28,9 @@ jobs: with: jdk-matrix: '[ "8", "11", "17", "18" ]' ff-jdk: '18' - ff-goal: 'clean install site site:stage -P reporting -nsu -T3' + ff-goal: 'clean install site site:stage -P reporting -nsu' ff-site-goal: '-v' - verify-goal: 'clean install -nsu -P run-its -T3' + verify-goal: 'clean install -nsu -P run-its' verify-fail-fast: false failure-upload-path: | surefire-its/target/*/log.txt diff --git a/surefire-its/src/test/resources/surefire-1744-alwaysIncludeOutputLogs/src/main/resources/log4j.properties b/surefire-its/src/test/resources/surefire-1744-alwaysIncludeOutputLogs/src/main/resources/log4j.properties index 070ddc9f22..cd8271ed10 100644 --- a/surefire-its/src/test/resources/surefire-1744-alwaysIncludeOutputLogs/src/main/resources/log4j.properties +++ b/surefire-its/src/test/resources/surefire-1744-alwaysIncludeOutputLogs/src/main/resources/log4j.properties @@ -5,7 +5,7 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.xml=org.apache.log4j.FileAppender -log4j.appender.xml.file=example_xml.log +log4j.appender.xml.file=target/example_xml.log log4j.appender.xml.append=false log4j.appender.xml.layout=org.apache.log4j.xml.XMLLayout @@ -13,7 +13,7 @@ log4j.appender.xml.layout=org.apache.log4j.xml.XMLLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n log4j.appender.R=org.apache.log4j.RollingFileAppender -log4j.appender.R.File=example.log +log4j.appender.R.File=target/example.log log4j.appender.R.MaxFileSize=100KB @@ -21,4 +21,4 @@ log4j.appender.R.MaxFileSize=100KB log4j.appender.R.MaxBackupIndex=1 log4j.appender.R.layout=org.apache.log4j.PatternLayout -log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n \ No newline at end of file +log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n diff --git a/surefire-its/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties b/surefire-its/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties index 070ddc9f22..cd8271ed10 100644 --- a/surefire-its/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties +++ b/surefire-its/src/test/resources/surefire-812-log4j-classloader/src/main/resources/log4j.properties @@ -5,7 +5,7 @@ log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.xml=org.apache.log4j.FileAppender -log4j.appender.xml.file=example_xml.log +log4j.appender.xml.file=target/example_xml.log log4j.appender.xml.append=false log4j.appender.xml.layout=org.apache.log4j.xml.XMLLayout @@ -13,7 +13,7 @@ log4j.appender.xml.layout=org.apache.log4j.xml.XMLLayout log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n log4j.appender.R=org.apache.log4j.RollingFileAppender -log4j.appender.R.File=example.log +log4j.appender.R.File=target/example.log log4j.appender.R.MaxFileSize=100KB @@ -21,4 +21,4 @@ log4j.appender.R.MaxFileSize=100KB log4j.appender.R.MaxBackupIndex=1 log4j.appender.R.layout=org.apache.log4j.PatternLayout -log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n \ No newline at end of file +log4j.appender.R.layout.ConversionPattern=%p %t %c - %m%n From 674877f7502b7e1bbb72f71d202ff6bdc5dabae9 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 24 Jul 2022 21:30:08 +1000 Subject: [PATCH 13/17] remove -T3 option Signed-off-by: Olivier Lamy --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 419aece38e..c3f1381912 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -34,7 +34,7 @@ final def mavens = env.BRANCH_NAME == 'master' ? ['3.8.x', '3.2.x'] : ['3.8.x'] // all non-EOL versions and the first EA final def jdks = [18, 17, 11, 8] -final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its','-T3'] +final def options = ['-e', '-V', '-B', '-nsu', '-P', 'run-its'] final def goals = ['clean', 'install'] final def goalsDepl = ['clean', 'deploy'] final Map stages = [:] From 06ba494f4f4c22c2ef10fc254156c454c4142887 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 28 Jul 2022 11:38:51 +1000 Subject: [PATCH 14/17] those tests expect the verifier to be forked Signed-off-by: Olivier Lamy --- .../test/java/org/apache/maven/surefire/its/ForkModeIT.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java index 22dc5fdb79..79db83deba 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/ForkModeIT.java @@ -73,7 +73,7 @@ public void testForkModePerTest() @Test public void testForkModeNever() { - String[] pids = doTest( unpack( getProject() ).forkNever() ); + String[] pids = doTest( unpack( getProject() ).setForkJvm().forkNever() ); assertSamePids( pids ); assertEndWith( pids, "_1_1", 3 ); assertEquals( "my pid is equal to pid 1 of the test", getMainPID(), pids[0] ); @@ -82,7 +82,7 @@ public void testForkModeNever() @Test public void testForkModeNone() { - String[] pids = doTest( unpack( getProject() ).forkMode( "none" ) ); + String[] pids = doTest( unpack( getProject() ).setForkJvm().forkMode( "none" ) ); assertSamePids( pids ); assertEndWith( pids, "_1_1", 3 ); assertEquals( "my pid is equal to pid 1 of the test", getMainPID(), pids[0] ); @@ -116,7 +116,7 @@ public void testForkModeOncePerThreadTwoThreads() @Test public void testForkCountZero() { - String[] pids = doTest( unpack( getProject() ).forkCount( 0 ) ); + String[] pids = doTest( unpack( getProject() ).setForkJvm().forkCount( 0 ) ); assertSamePids( pids ); assertEndWith( pids, "_1_1", 3 ); assertEquals( "my pid is equal to pid 1 of the test", getMainPID(), pids[0] ); From 1fe7653b2eda90733db6e257f109877f5d94cd6b Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 28 Jul 2022 13:17:29 +1000 Subject: [PATCH 15/17] force this test as verifier fork Signed-off-by: Olivier Lamy --- .../its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java index 1263ab3315..a0c44ba6f0 100644 --- a/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java +++ b/surefire-its/src/test/java/org/apache/maven/surefire/its/jiras/Surefire855AllowFailsafeUseArtifactFileIT.java @@ -46,7 +46,7 @@ public void jarShouldUseFile() @Test public void jarNotForkingShouldUseFile() { - unpack( "surefire-855-failsafe-use-jar" ) + unpack( "surefire-855-failsafe-use-jar" ).setForkJvm() .maven().sysProp( "forkMode", "never" ).executeVerify().assertIntegrationTestSuiteResults( 3, 0, 0, 1 ); } @@ -55,4 +55,4 @@ public void osgiBundleShouldUseFile() { unpack( "surefire-855-failsafe-use-bundle" ).maven().executeVerify().verifyErrorFree( 2 ); } -} \ No newline at end of file +} From 6fb66af0c6f0b611f7d417ad361ae1bb49f553a3 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Thu, 28 Jul 2022 16:30:45 +1000 Subject: [PATCH 16/17] move this a property so it is possible to use -D Signed-off-by: Olivier Lamy --- surefire-its/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/surefire-its/pom.xml b/surefire-its/pom.xml index 13da1f6e32..d3b7dddff8 100644 --- a/surefire-its/pom.xml +++ b/surefire-its/pom.xml @@ -34,6 +34,7 @@ UTF-8 + true @@ -254,7 +255,6 @@ ${verifier.forkMode} ${jacoco-it.agent} - true kill From 6b0ed1bb90bc648777b350d3aa283d39f3fddba0 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Fri, 2 Sep 2022 16:26:39 +1000 Subject: [PATCH 17/17] touch to trigger build --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index c3f1381912..d942364eec 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,6 +29,7 @@ properties( disableConcurrentBuilds() ] ) + final def oses = ['linux':'ubuntu && maven', 'windows':'windows-he'] final def mavens = env.BRANCH_NAME == 'master' ? ['3.8.x', '3.2.x'] : ['3.8.x'] // all non-EOL versions and the first EA