diff --git a/.gitignore b/.gitignore index 95c3bb9..26aa478 100644 --- a/.gitignore +++ b/.gitignore @@ -129,3 +129,4 @@ /4f9a68a.tar.gz /extra-enforcer-rules.tar.xz /javapackages-bootstrap-1.7.0.tar.xz +/javapackages-bootstrap-1.7.1.tar.xz diff --git a/0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch b/0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch deleted file mode 100644 index 38c1726..0000000 --- a/0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch +++ /dev/null @@ -1,1910 +0,0 @@ -From ed96595dda4b84370b88d7f784c0c69d243c3595 Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Fri, 13 May 2022 13:53:32 +0200 -Subject: [PATCH 1/2] Revert "Update maven-surefire to version 3.0.0~M6" - -This reverts commit 50c1e58288a8834aab84b1d370565e7b907cee1d. ---- - mbi/dist/metadata.txt | 28 +- - ...0.patch => 0001-Port-to-TestNG-6.11.patch} | 28 +- - ...2-Port-to-current-maven-shared-utils.patch | 72 + - ...003-Disable-JUnit-4.8-test-grouping.patch} | 31 +- - .../0003-Port-to-JUnit-5.8.1.patch | 71 - - ...004-Port-to-maven-shared-utils-3.3.3.patch | 59 + - .../0004-Unshade-dependencies.patch | 1392 ----------------- - project/maven-surefire.properties | 2 +- - project/maven-surefire.xml | 6 +- - 9 files changed, 173 insertions(+), 1516 deletions(-) - rename patches/maven-surefire/{0001-Port-to-TestNG-7.4.0.patch => 0001-Port-to-TestNG-6.11.patch} (83%) - create mode 100644 patches/maven-surefire/0002-Port-to-current-maven-shared-utils.patch - rename patches/maven-surefire/{0002-Disable-JUnit-4.8-test-grouping.patch => 0003-Disable-JUnit-4.8-test-grouping.patch} (87%) - delete mode 100644 patches/maven-surefire/0003-Port-to-JUnit-5.8.1.patch - create mode 100644 patches/maven-surefire/0004-Port-to-maven-shared-utils-3.3.3.patch - delete mode 100644 patches/maven-surefire/0004-Unshade-dependencies.patch - -diff --git a/mbi/dist/metadata.txt b/mbi/dist/metadata.txt -index 84aa01f..1b949de 100644 ---- a/mbi/dist/metadata.txt -+++ b/mbi/dist/metadata.txt -@@ -615,7 +615,6 @@ MOD maven-surefire - DEP org.apache.maven.surefire surefire-api - ART org.apache.maven.surefire surefire-junit3 - DEP org.apache.maven.surefire common-junit3 -- DEP org.apache.maven.surefire common-java5 - DEP org.apache.maven.surefire surefire-api - ART org.apache.maven.surefire surefire-junit4 - DEP org.apache.maven.surefire common-junit4 -@@ -633,40 +632,33 @@ MOD maven-surefire - DEP org.apache.maven.surefire common-java5 - DEP org.apache.maven.surefire surefire-testng-utils - DEP org.apache.maven.surefire surefire-api -- ART org.apache.maven.surefire surefire-shared-utils -- DEP org.apache.maven.shared maven-shared-utils -- DEP commons-io commons-io -- DEP org.apache.commons commons-lang3 -- DEP org.apache.commons commons-compress - ART org.apache.maven.surefire surefire-logger-api - ART org.apache.maven.surefire surefire-api - DEP org.apache.maven.surefire surefire-logger-api -- DEP org.apache.maven.surefire surefire-shared-utils -- ART org.apache.maven.surefire surefire-extensions-api -- DEP org.apache.maven.surefire surefire-shared-utils -- ART org.apache.maven.surefire surefire-extensions-spi -- DEP org.apache.maven.surefire surefire-api -+ DEP org.apache.maven.shared maven-shared-utils - ART org.apache.maven.surefire surefire-booter - DEP org.apache.maven.surefire surefire-api -- DEP org.apache.maven.surefire surefire-extensions-spi -+ DEP org.apache.commons commons-lang3 -+ DEP commons-io commons-io - ART org.apache.maven.surefire common-java5 -- DEP org.apache.maven.surefire surefire-shared-utils -+ DEP org.apache.maven.shared maven-shared-utils - DEP org.apache.maven.surefire surefire-api - MOD maven-surefire-plugin - ART org.apache.maven.plugins maven-surefire-plugin - DEP org.apache.maven.surefire maven-surefire-common - ART org.apache.maven.plugins maven-failsafe-plugin - DEP org.apache.maven.surefire maven-surefire-common -+ DEP org.apache.maven.shared maven-shared-utils -+ DEP org.apache.commons commons-lang3 -+ DEP commons-io commons-io - ART org.apache.maven.surefire maven-surefire-common - DEP org.apache.maven.surefire surefire-api -- DEP org.apache.maven.surefire surefire-extensions-api - DEP org.apache.maven.surefire surefire-booter - DEP org.apache.maven.shared maven-common-artifact-filters -- DEP org.apache.maven.shared maven-shared-utils -- DEP org.apache.maven maven-model -- DEP org.eclipse.sisu org.eclipse.sisu.plexus - DEP org.codehaus.plexus plexus-java -- DEP org.apache.maven.surefire surefire-shared-utils -+ DEP org.apache.maven.shared maven-shared-utils -+ DEP commons-io commons-io -+ DEP org.apache.commons commons-lang3 - MOD maven-verifier - ART org.apache.maven.shared maven-verifier - DEP org.apache.maven.shared maven-shared-utils -diff --git a/patches/maven-surefire/0001-Port-to-TestNG-7.4.0.patch b/patches/maven-surefire/0001-Port-to-TestNG-6.11.patch -similarity index 83% -rename from patches/maven-surefire/0001-Port-to-TestNG-7.4.0.patch -rename to patches/maven-surefire/0001-Port-to-TestNG-6.11.patch -index e6b6bd0..a1ca19d 100644 ---- a/patches/maven-surefire/0001-Port-to-TestNG-7.4.0.patch -+++ b/patches/maven-surefire/0001-Port-to-TestNG-6.11.patch -@@ -1,4 +1,4 @@ --From 219edb700ee76f167a329e5bab64feceee5b6b8f Mon Sep 17 00:00:00 2001 -+From 14196b58bc1d96d76636914b575dc22b7cc94b1a Mon Sep 17 00:00:00 2001 - From: Mikolaj Izdebski - Date: Mon, 10 Jul 2017 10:37:50 +0200 - Subject: [PATCH 1/4] Port to TestNG 7.4.0 -@@ -11,21 +11,21 @@ Forwarded: no - 3 files changed, 3 insertions(+), 4 deletions(-) - - diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml --index ece647d6a..682f296e6 100644 -+index 49e75b6ea..a9db4a8d9 100644 - --- a/surefire-providers/surefire-testng/pom.xml - +++ b/surefire-providers/surefire-testng/pom.xml - @@ -51,8 +51,7 @@ -- -- org.testng -- testng --- 5.10 --- jdk15 --+ 7.4.0 -- provided -- -- -+ -+ org.testng -+ testng -+- 5.10 -+- jdk15 -++ 7.4.0 -+ provided -+ -+ - diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java --index ed918f538..c4a0cd19d 100644 -+index e9667316b..7021ef561 100644 - --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java - +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/AbstractDirectConfigurator.java - @@ -63,7 +63,7 @@ public void configure( TestNG testng, Map options ) -@@ -38,7 +38,7 @@ index ed918f538..c4a0cd19d 100644 - - @Override - diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java --index 6caf82459..2d988381f 100755 -+index b6bf82e03..8164f4f4d 100755 - --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java - +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/conf/TestNGMapConfigurator.java - @@ -68,7 +68,7 @@ public void configure( XmlSuite suite, Map options ) -@@ -51,5 +51,5 @@ index 6caf82459..2d988381f 100755 - } - - -- --2.35.1 -+2.31.1 - -diff --git a/patches/maven-surefire/0002-Port-to-current-maven-shared-utils.patch b/patches/maven-surefire/0002-Port-to-current-maven-shared-utils.patch -new file mode 100644 -index 0000000..e793bd2 ---- /dev/null -+++ b/patches/maven-surefire/0002-Port-to-current-maven-shared-utils.patch -@@ -0,0 +1,72 @@ -+From 6a94c7674f844218752827f2b62de629691fcf39 Mon Sep 17 00:00:00 2001 -+From: Michael Simacek -+Date: Fri, 16 Mar 2018 13:45:01 +0100 -+Subject: [PATCH 2/3] Port to current maven-shared-utils -+ -+Forwarded: no -+ -+--- -+ .../plugin/surefire/report/StatelessXmlReporter.java | 12 ++++++------ -+ 1 file changed, 6 insertions(+), 6 deletions(-) -+ -+diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java -+index b89c4e9b0..8cf0b60c3 100644 -+--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java -++++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java -+@@ -326,7 +326,7 @@ private static File getReportFile( ReportEntry report, File reportsDirectory, St -+ } -+ -+ private static void startTestElement( XMLWriter ppw, WrappedReportEntry report, String reportNameSuffix, -+- String timeAsString ) -++ String timeAsString ) throws IOException -+ { -+ ppw.startElement( "testcase" ); -+ ppw.addAttribute( "name", report.getReportName() ); -+@@ -349,7 +349,7 @@ private static void startTestElement( XMLWriter ppw, WrappedReportEntry report, -+ } -+ -+ private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, TestSetStats testSetStats, -+- String timeAsString ) -++ String timeAsString ) throws IOException -+ { -+ ppw.startElement( "testsuite" ); -+ -+@@ -377,7 +377,7 @@ private void createTestSuiteElement( XMLWriter ppw, WrappedReportEntry report, T -+ -+ private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLWriter ppw, -+ WrappedReportEntry report, boolean trimStackTrace, OutputStream fw, -+- String testErrorType, boolean createOutErrElementsInside ) -++ String testErrorType, boolean createOutErrElementsInside ) throws IOException -+ { -+ ppw.startElement( testErrorType ); -+ -+@@ -434,7 +434,7 @@ private static void getTestProblems( OutputStreamWriter outputStreamWriter, XMLW -+ -+ // Create system-out and system-err elements -+ private static void createOutErrElements( OutputStreamWriter outputStreamWriter, XMLWriter ppw, -+- WrappedReportEntry report, OutputStream fw ) -++ WrappedReportEntry report, OutputStream fw ) throws IOException -+ { -+ EncodingOutputStream eos = new EncodingOutputStream( fw ); -+ addOutputStreamElement( outputStreamWriter, eos, ppw, report.getStdout(), "system-out" ); -+@@ -444,7 +444,7 @@ private static void createOutErrElements( OutputStreamWriter outputStreamWriter, -+ private static void addOutputStreamElement( OutputStreamWriter outputStreamWriter, -+ EncodingOutputStream eos, XMLWriter xmlWriter, -+ Utf8RecodingDeferredFileOutputStream utf8RecodingDeferredFileOutputStream, -+- String name ) -++ String name ) throws IOException -+ { -+ if ( utf8RecodingDeferredFileOutputStream != null && utf8RecodingDeferredFileOutputStream.getByteCount() > 0 ) -+ { -+@@ -474,7 +474,7 @@ private static void addOutputStreamElement( OutputStreamWriter outputStreamWrite -+ * -+ * @param xmlWriter The test suite to report to -+ */ -+- private static void showProperties( XMLWriter xmlWriter, Map systemProperties ) -++ private static void showProperties( XMLWriter xmlWriter, Map systemProperties ) throws IOException -+ { -+ xmlWriter.startElement( "properties" ); -+ for ( final Entry entry : systemProperties.entrySet() ) -+-- -+2.25.2 -+ -diff --git a/patches/maven-surefire/0002-Disable-JUnit-4.8-test-grouping.patch b/patches/maven-surefire/0003-Disable-JUnit-4.8-test-grouping.patch -similarity index 87% -rename from patches/maven-surefire/0002-Disable-JUnit-4.8-test-grouping.patch -rename to patches/maven-surefire/0003-Disable-JUnit-4.8-test-grouping.patch -index 21fb0de..c80ab94 100644 ---- a/patches/maven-surefire/0002-Disable-JUnit-4.8-test-grouping.patch -+++ b/patches/maven-surefire/0003-Disable-JUnit-4.8-test-grouping.patch -@@ -1,36 +1,37 @@ --From 68a41813f6fad18f5192932d5c07d89ef090643c Mon Sep 17 00:00:00 2001 -+From 21890515f3eeba73065b79b6a65678ec1e2a821d Mon Sep 17 00:00:00 2001 - From: Mikolaj Izdebski - Date: Mon, 27 Apr 2020 10:45:30 +0200 --Subject: [PATCH 2/4] Disable JUnit 4.8 test grouping -+Subject: [PATCH 3/3] Disable JUnit 4.8 test grouping - - Forwarded: not-needed -+ - --- - .../surefire/junitcore/JUnitCoreProvider.java | 25 +++-------------- - .../maven/surefire/testng/TestNGExecutor.java | 27 ------------------- - 2 files changed, 3 insertions(+), 49 deletions(-) - - diff --git a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java --index 7ed483426..1ffd826db 100644 -+index 7c74e8b86..c86bb276c 100644 - --- a/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java - +++ b/surefire-providers/surefire-junit47/src/main/java/org/apache/maven/surefire/junitcore/JUnitCoreProvider.java --@@ -40,7 +40,6 @@ -+@@ -25,7 +25,6 @@ - import org.apache.maven.surefire.common.junit4.JUnit4RunListener; - import org.apache.maven.surefire.common.junit4.JUnitTestFailureListener; - import org.apache.maven.surefire.common.junit4.Notifier; - -import org.apache.maven.surefire.common.junit48.FilterFactory; - import org.apache.maven.surefire.common.junit48.JUnit48Reflector; - import org.apache.maven.surefire.common.junit48.JUnit48TestChecker; -- import org.junit.runner.Description; --@@ -51,6 +50,7 @@ -- import static org.apache.maven.surefire.api.report.RunMode.RERUN_TEST_AFTER_FAILURE; -- import static org.apache.maven.surefire.api.testset.TestListResolver.optionallyWildcardFilter; -- import static org.apache.maven.surefire.api.util.TestsToRun.fromClass; -+ import org.apache.maven.surefire.providerapi.AbstractProvider; -+@@ -47,6 +46,7 @@ -+ import java.util.concurrent.ConcurrentHashMap; -+ -+ import static org.apache.maven.surefire.booter.CommandReader.getReader; - +import static org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.createMatchAnyDescriptionFilter; - import static org.apache.maven.surefire.common.junit4.JUnit4ProviderUtil.generateFailingTestDescriptions; - import static org.apache.maven.surefire.common.junit4.JUnit4RunListenerFactory.createCustomListeners; - import static org.apache.maven.surefire.common.junit4.Notifier.pureNotifier; - @@ -126,7 +126,7 @@ public RunResult invoke( Object forkTestSet ) -- Notifier notifier = new Notifier( listener, getSkipAfterFailureCount() ); -+ new Notifier( createRunListener( reporterFactory, consoleStream ), getSkipAfterFailureCount() ); - // startCapture() called in createRunListener() in prior to setTestsToRun() - - - Filter filter = jUnit48Reflector.isJUnit48Available() ? createJUnit48Filter() : null; -@@ -38,7 +39,7 @@ index 7ed483426..1ffd826db 100644 - - if ( testsToRun == null ) - { --@@ -169,8 +169,7 @@ public RunResult invoke( Object forkTestSet ) -+@@ -168,8 +168,7 @@ public RunResult invoke( Object forkTestSet ) - { - Set failures = generateFailingTestDescriptions( testFailureListener.getAllFailures() ); - testFailureListener.reset(); -@@ -48,7 +49,7 @@ index 7ed483426..1ffd826db 100644 - rerunCore.execute( testsToRun, failureDescriptionFilter ); - } - } --@@ -271,24 +270,6 @@ private boolean isParallelTypes() -+@@ -270,24 +269,6 @@ private boolean isParallelTypes() - return jUnitCoreParameters.isParallelClasses() || jUnitCoreParameters.isParallelSuites(); - } - -@@ -74,10 +75,10 @@ index 7ed483426..1ffd826db 100644 - { - TestsToRun scanned = scanResult.applyFilter( scannerFilter, testClassLoader ); - diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java --index 7ed1719a8..07d3ad33c 100644 -+index 6bc30a300..05c55f55a 100644 - --- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java - +++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java --@@ -278,36 +278,9 @@ private static XmlMethodSelector createMethodNameFilteringSelector( TestListReso -+@@ -237,36 +237,9 @@ private static XmlMethodSelector createMethodNameFilteringSelector( TestListReso - private static XmlMethodSelector createGroupMatchingSelector( Map options ) - throws TestSetFailedException - { -@@ -115,5 +116,5 @@ index 7ed1719a8..07d3ad33c 100644 - - static void run( List suiteFiles, String testSourceDirectory, - -- --2.35.1 -+2.25.2 - -diff --git a/patches/maven-surefire/0003-Port-to-JUnit-5.8.1.patch b/patches/maven-surefire/0003-Port-to-JUnit-5.8.1.patch -deleted file mode 100644 -index 80e492f..0000000 ---- a/patches/maven-surefire/0003-Port-to-JUnit-5.8.1.patch -+++ /dev/null -@@ -1,71 +0,0 @@ --From 3d0dad9c32ce059b8f562e3c5bd754f6b3394a74 Mon Sep 17 00:00:00 2001 --From: Mikolaj Izdebski --Date: Fri, 22 Apr 2022 00:28:31 +0200 --Subject: [PATCH 3/4] Port to JUnit 5.8.1 -- --Forwarded: no ----- -- pom.xml | 6 +++--- -- .../maven/surefire/junitplatform/LazyLauncher.java | 14 ++++++++++++++ -- 2 files changed, 17 insertions(+), 3 deletions(-) -- --diff --git a/pom.xml b/pom.xml --index c261bf3c2..a75e156ce 100644 ----- a/pom.xml --+++ b/pom.xml --@@ -250,17 +250,17 @@ -- -- org.junit.platform -- junit-platform-launcher --- 1.3.2 --+ 1.8.1 -- -- -- org.junit.jupiter -- junit-jupiter-engine --- 5.3.2 --+ 5.8.1 -- -- -- org.junit.jupiter -- junit-jupiter-params --- 5.3.2 --+ 5.8.1 -- -- -- org.mockito --diff --git a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java --index 6a1a3b3b3..dee110e3c 100644 ----- a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java --+++ b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/LazyLauncher.java --@@ -21,6 +21,7 @@ -- -- import org.apache.maven.surefire.api.util.ReflectionUtils; -- import org.junit.platform.launcher.Launcher; --+import org.junit.platform.launcher.LauncherDiscoveryListener; -- import org.junit.platform.launcher.LauncherDiscoveryRequest; -- import org.junit.platform.launcher.TestExecutionListener; -- import org.junit.platform.launcher.TestPlan; --@@ -55,6 +56,19 @@ public void execute( LauncherDiscoveryRequest launcherDiscoveryRequest, -- launcher().execute( launcherDiscoveryRequest, testExecutionListeners ); -- } -- --+ @Override --+ public void execute( TestPlan testPlan, --+ TestExecutionListener... testExecutionListeners ) --+ { --+ launcher().execute( testPlan, testExecutionListeners ); --+ } --+ --+ @Override --+ public void registerLauncherDiscoveryListeners( LauncherDiscoveryListener... launcherDiscoveryListeners ) --+ { --+ launcher().registerLauncherDiscoveryListeners( launcherDiscoveryListeners ); --+ } --+ -- private Launcher launcher() -- { -- if ( launcher == null ) ---- --2.35.1 -- -diff --git a/patches/maven-surefire/0004-Port-to-maven-shared-utils-3.3.3.patch b/patches/maven-surefire/0004-Port-to-maven-shared-utils-3.3.3.patch -new file mode 100644 -index 0000000..cec5651 ---- /dev/null -+++ b/patches/maven-surefire/0004-Port-to-maven-shared-utils-3.3.3.patch -@@ -0,0 +1,59 @@ -+From 980a109bd3607f1035097d6ad923f82cc58c95d2 Mon Sep 17 00:00:00 2001 -+From: Marian Koncek -+Date: Fri, 11 Sep 2020 12:17:15 +0200 -+Subject: [PATCH] Port to maven-shared-utils 3.3.3 -+ -+Forwarded: no -+ -+--- -+ .../DefaultForkConfiguration.java | 26 ++++++++++++------- -+ 1 file changed, 16 insertions(+), 10 deletions(-) -+ -+diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java -+index fa9945123..ed75ecdff 100644 -+--- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java -++++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java -+@@ -42,6 +42,8 @@ -+ import static org.apache.maven.plugin.surefire.SurefireHelper.replaceThreadNumberPlaceholders; -+ import static org.apache.maven.surefire.booter.Classpath.join; -+ -++import org.apache.maven.shared.utils.cli.CommandLineException; -++ -+ /** -+ * Basic framework which constructs CLI. -+ * -+@@ -131,17 +133,21 @@ public OutputStreamFlushableCommandline createCommandLine( @Nonnull StartupConfi -+ -+ cli.setExecutable( getJdkForTests().getJvmExecutable() ); -+ -+- String jvmArgLine = newJvmArgLine( forkNumber ); -+- if ( !jvmArgLine.isEmpty() ) -+- { -+- cli.createArg() -+- .setLine( jvmArgLine ); -+- } -++ try { -++ String jvmArgLine = newJvmArgLine( forkNumber ); -++ if ( !jvmArgLine.isEmpty() ) -++ { -++ cli.createArg() -++ .setLine( jvmArgLine ); -++ } -+ -+- if ( getDebugLine() != null && !getDebugLine().isEmpty() ) -+- { -+- cli.createArg() -+- .setLine( getDebugLine() ); -++ if ( getDebugLine() != null && !getDebugLine().isEmpty() ) -++ { -++ cli.createArg() -++ .setLine( getDebugLine() ); -++ } -++ } catch (CommandLineException ex) { -++ throw new SurefireBooterForkException("", ex); -+ } -+ -+ resolveClasspath( cli, findStartClass( config ), config, dumpLogDirectory ); -+-- -+2.26.2 -+ -diff --git a/patches/maven-surefire/0004-Unshade-dependencies.patch b/patches/maven-surefire/0004-Unshade-dependencies.patch -deleted file mode 100644 -index f8feb71..0000000 ---- a/patches/maven-surefire/0004-Unshade-dependencies.patch -+++ /dev/null -@@ -1,1392 +0,0 @@ --From 8977691d5ff2842b06c5cfa5b8a2b14b3e7d684a Mon Sep 17 00:00:00 2001 --From: Mikolaj Izdebski --Date: Thu, 12 May 2022 06:57:19 +0200 --Subject: [PATCH 4/4] Unshade dependencies -- --Patch can be generated with: -- -- find -name \*.java -exec sed \ -- -e s/org.apache.maven.surefire.shared.utils/org.apache.maven.shared.utils/ \ -- -e s/org.apache.maven.surefire.shared.io/org.apache.commons.io/ \ -- -e s/org.apache.maven.surefire.shared.lang3/org.apache.commons.lang3/ \ -- -e s/org.apache.maven.surefire.shared.compress/org.apache.commons.compress/ \ -- -i \{\} \; -- --Forwarded: not-needed ----- -- .../maven/plugin/failsafe/VerifyMojo.java | 2 +- -- .../util/FailsafeSummaryXmlUtils.java | 8 +++---- -- .../plugin/surefire/AbstractSurefireMojo.java | 22 +++++++++---------- -- .../surefire/StartupReportConfiguration.java | 2 +- -- .../maven/plugin/surefire/SurefireHelper.java | 2 +- -- .../plugin/surefire/SurefireProperties.java | 2 +- -- .../maven/plugin/surefire/TestClassPath.java | 2 +- -- .../ClasspathForkConfiguration.java | 2 +- -- .../DefaultForkConfiguration.java | 2 +- -- .../surefire/booterclient/ForkStarter.java | 4 ++-- -- .../JarManifestForkConfiguration.java | 8 +++---- -- .../ModularClasspathForkConfiguration.java | 2 +- -- .../lazytestprovider/Commandline.java | 6 ++--- -- .../extensions/SurefireForkChannel.java | 4 ++-- -- .../surefire/report/ConsoleReporter.java | 4 ++-- -- .../report/DefaultReporterFactory.java | 4 ++-- -- .../plugin/surefire/report/FileReporter.java | 2 +- -- .../surefire/report/FileReporterUtils.java | 2 +- -- .../surefire/report/StatelessXmlReporter.java | 6 ++--- -- .../plugin/surefire/report/TestSetStats.java | 4 ++-- -- .../surefire/report/WrappedReportEntry.java | 2 +- -- .../plugin/surefire/util/FileScanner.java | 2 +- -- .../plugin/surefire/util/ScannerUtil.java | 2 +- -- .../surefire/util/SpecificFileFilter.java | 2 +- -- .../maven/surefire/stream/EventDecoder.java | 2 +- -- .../surefire/AbstractSurefireMojoTest.java | 6 ++--- -- .../AbstractSurefireMojoToolchainsTest.java | 2 +- -- .../plugin/surefire/SurefireHelperTest.java | 2 +- -- ...DeserializerProviderConfigurationTest.java | 2 +- -- ...rDeserializerStartupConfigurationTest.java | 2 +- -- .../booterclient/ForkConfigurationTest.java | 16 +++++++------- -- .../booterclient/ForkStarterTest.java | 6 ++--- -- ...ModularClasspathForkConfigurationTest.java | 2 +- -- .../lazytestprovider/CommandlineTest.java | 4 ++-- -- .../report/DefaultReporterFactoryTest.java | 2 +- -- .../report/StatelessXmlReporterTest.java | 6 ++--- -- .../surefire/report/TestSetStatsTest.java | 2 +- -- .../runorder/RunEntryStatisticsMapTest.java | 2 +- -- .../StatelessTestsetInfoReporterTest.java | 2 +- -- .../report/ConsoleOutputFileReporterTest.java | 2 +- -- .../maven/surefire/api/booter/Command.java | 2 +- -- .../api/filter/SpecificTestClassFilter.java | 2 +- -- .../report/LegacyPojoStackTraceWriter.java | 2 +- -- .../api/stream/AbstractStreamDecoder.java | 2 +- -- .../surefire/api/testset/ResolvedTest.java | 14 ++++++------ -- .../api/testset/TestListResolver.java | 10 ++++----- -- .../api/util/DefaultDirectoryScanner.java | 4 ++-- -- .../api/util/internal/ClassMethod.java | 2 +- -- .../api/util/internal/ObjectUtils.java | 4 ++-- -- .../api/util/internal/ObjectUtilsTest.java | 4 ++-- -- .../maven/surefire/booter/CommandReader.java | 4 ++-- -- .../maven/surefire/booter/ForkedBooter.java | 2 +- -- .../maven/surefire/booter/PpidChecker.java | 12 +++++----- -- .../surefire/booter/ProcessCheckerType.java | 2 +- -- .../surefire/booter/PropertiesWrapper.java | 2 +- -- .../booter/SurefireBooterForkException.java | 2 +- -- .../maven/surefire/booter/SystemUtils.java | 14 ++++++------ -- .../booter/stream/CommandDecoder.java | 2 +- -- .../surefire/booter/ForkedBooterMockTest.java | 2 +- -- .../surefire/booter/ForkedBooterTest.java | 2 +- -- .../booter/IsolatedClassLoaderTest.java | 2 +- -- .../surefire/booter/NewClassLoaderRunner.java | 2 +- -- .../surefire/booter/PpidCheckerTest.java | 4 ++-- -- .../surefire/booter/SystemUtilsTest.java | 12 +++++----- -- .../extensions/ConsoleOutputReporter.java | 2 +- -- .../extensions/StatelessReporter.java | 2 +- -- .../extensions/util/CommandlineExecutor.java | 8 +++---- -- .../extensions/CommandlineExecutorTest.java | 4 ++-- -- .../report/SmartStackTraceParser.java | 4 ++-- -- .../junit4/JUnit4RunListenerFactory.java | 2 +- -- .../common/junit48/FilterFactory.java | 2 +- -- .../common/junit48/FilterFactoryTest.java | 2 +- -- .../junitplatform/JUnitPlatformProvider.java | 4 ++-- -- .../junitplatform/RunListenerAdapter.java | 2 +- -- .../surefire/junit/JUnitTestSetTest.java | 4 ++-- -- .../testng/TestNGDirectoryTestSuite.java | 2 +- -- .../maven/surefire/testng/TestNGExecutor.java | 2 +- -- 77 files changed, 154 insertions(+), 154 deletions(-) -- --diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java --index 9c91bf70d..f3832727f 100644 ----- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java --+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java --@@ -39,7 +39,7 @@ -- import java.util.Collection; -- -- import static org.apache.maven.plugin.surefire.SurefireHelper.reportExecution; ---import static org.apache.maven.surefire.shared.utils.StringUtils.capitalizeFirstLetter; --+import static org.apache.maven.shared.utils.StringUtils.capitalizeFirstLetter; -- import static org.apache.maven.surefire.api.suite.RunResult.noTestsRun; -- -- /** --diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java --index 03e340ca7..b77c1b515 100644 ----- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java --+++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/util/FailsafeSummaryXmlUtils.java --@@ -19,7 +19,7 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.io.IOUtils; --+import org.apache.commons.io.IOUtils; -- import org.apache.maven.surefire.api.suite.RunResult; -- import org.w3c.dom.Node; -- import org.xml.sax.InputSource; --@@ -39,9 +39,9 @@ -- import static java.lang.String.format; -- import static java.nio.charset.StandardCharsets.UTF_8; -- import static javax.xml.xpath.XPathConstants.NODE; ---import static org.apache.maven.surefire.shared.lang3.StringEscapeUtils.escapeXml10; ---import static org.apache.maven.surefire.shared.lang3.StringEscapeUtils.unescapeXml; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.commons.lang3.StringEscapeUtils.escapeXml10; --+import static org.apache.commons.lang3.StringEscapeUtils.unescapeXml; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- /** -- * @author Tibor Digana (tibor17) --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java --index 1937d75c7..7a7973069 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java --@@ -110,7 +110,7 @@ -- import org.apache.maven.surefire.providerapi.ProviderDetector; -- import org.apache.maven.surefire.providerapi.ProviderInfo; -- import org.apache.maven.surefire.providerapi.ProviderRequirements; ---import org.apache.maven.surefire.shared.utils.io.FileUtils; --+import org.apache.maven.shared.utils.io.FileUtils; -- import org.apache.maven.toolchain.DefaultToolchain; -- import org.apache.maven.toolchain.Toolchain; -- import org.apache.maven.toolchain.ToolchainManager; --@@ -147,16 +147,16 @@ -- import static org.apache.maven.surefire.booter.SystemUtils.isJava9AtLeast; -- import static org.apache.maven.surefire.booter.SystemUtils.toJdkHomeFromJvmExec; -- import static org.apache.maven.surefire.booter.SystemUtils.toJdkVersionFromReleaseFile; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; ---import static org.apache.maven.surefire.shared.lang3.StringUtils.substringBeforeLast; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; ---import static org.apache.maven.surefire.shared.utils.StringUtils.capitalizeFirstLetter; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isEmpty; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotEmpty; ---import static org.apache.maven.surefire.shared.utils.StringUtils.split; ---import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.addShutDownHook; ---import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; --+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; --+import static org.apache.commons.lang3.StringUtils.substringBeforeLast; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.maven.shared.utils.StringUtils.capitalizeFirstLetter; --+import static org.apache.maven.shared.utils.StringUtils.isEmpty; --+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; --+import static org.apache.maven.shared.utils.StringUtils.isNotEmpty; --+import static org.apache.maven.shared.utils.StringUtils.split; --+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.addShutDownHook; --+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; -- -- /** -- * Abstract base class for running tests using Surefire. --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java --index a15f8027e..02ec44b8e 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/StartupReportConfiguration.java --@@ -41,7 +41,7 @@ -- import java.util.concurrent.ConcurrentHashMap; -- -- import static java.nio.charset.StandardCharsets.UTF_8; ---import static org.apache.maven.surefire.shared.lang3.StringUtils.trimToNull; --+import static org.apache.commons.lang3.StringUtils.trimToNull; -- import static org.apache.maven.plugin.surefire.SurefireHelper.replaceForkThreadsInPath; -- import static org.apache.maven.plugin.surefire.report.ConsoleReporter.BRIEF; -- import static org.apache.maven.plugin.surefire.report.ConsoleReporter.PLAIN; --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java --index 582245104..e9b7cfcf3 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java --@@ -39,7 +39,7 @@ -- -- import static java.util.Collections.unmodifiableList; -- import static org.apache.maven.surefire.api.util.internal.DumpFileUtils.newFormattedDateFileName; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- import static org.apache.maven.surefire.api.booter.DumpErrorSingleton.DUMPSTREAM_FILE_EXT; -- import static org.apache.maven.surefire.api.booter.DumpErrorSingleton.DUMP_FILE_EXT; -- import static org.apache.maven.surefire.api.cli.CommandLineOption.LOGGING_LEVEL_DEBUG; --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java --index 2f5e91945..fb78191a8 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireProperties.java --@@ -35,7 +35,7 @@ -- -- import org.apache.maven.surefire.booter.Classpath; -- import org.apache.maven.surefire.booter.KeyValueSource; ---import org.apache.maven.surefire.shared.utils.StringUtils; --+import org.apache.maven.shared.utils.StringUtils; -- -- import static java.util.Arrays.asList; -- import static java.util.Map.Entry; --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java --index ba7336177..3a37816c0 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/TestClassPath.java --@@ -29,7 +29,7 @@ -- import java.util.Map; -- -- import static java.util.Collections.addAll; ---import static org.apache.maven.surefire.shared.utils.StringUtils.split; --+import static org.apache.maven.shared.utils.StringUtils.split; -- -- final class TestClassPath -- { --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ClasspathForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ClasspathForkConfiguration.java --index 1ce9d617e..54f9fa9b1 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ClasspathForkConfiguration.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ClasspathForkConfiguration.java --@@ -32,7 +32,7 @@ -- import java.util.Map; -- import java.util.Properties; -- ---import static org.apache.maven.surefire.shared.utils.StringUtils.join; --+import static org.apache.maven.shared.utils.StringUtils.join; -- -- /** -- * @author Tibor Digana (tibor17) --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java --index c7a77e77f..8932ba4a7 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/DefaultForkConfiguration.java --@@ -28,7 +28,7 @@ -- import org.apache.maven.surefire.booter.SurefireBooterForkException; -- import org.apache.maven.surefire.extensions.ForkNodeFactory; -- import org.apache.maven.surefire.api.util.internal.ImmutableMap; ---import org.apache.maven.surefire.shared.utils.cli.CommandLineException; --+import org.apache.maven.shared.utils.cli.CommandLineException; -- -- import javax.annotation.Nonnull; -- import javax.annotation.Nullable; --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java --index 17b0e5412..796235c6d 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java --@@ -97,8 +97,8 @@ -- import static org.apache.maven.plugin.surefire.booterclient.lazytestprovider.TestLessInputStream.TestLessInputStreamBuilder; -- import static org.apache.maven.surefire.booter.SystemPropertyManager.writePropertiesFile; -- import static org.apache.maven.surefire.api.cli.CommandLineOption.SHOW_ERRORS; ---import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.addShutDownHook; ---import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; --+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.addShutDownHook; --+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; -- import static org.apache.maven.surefire.api.suite.RunResult.SUCCESS; -- import static org.apache.maven.surefire.api.suite.RunResult.failure; -- import static org.apache.maven.surefire.api.suite.RunResult.timeout; --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java --index 50caad055..40a57f797 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/JarManifestForkConfiguration.java --@@ -19,9 +19,9 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.compress.archivers.zip.Zip64Mode; ---import org.apache.maven.surefire.shared.compress.archivers.zip.ZipArchiveEntry; ---import org.apache.maven.surefire.shared.compress.archivers.zip.ZipArchiveOutputStream; --+import org.apache.commons.compress.archivers.zip.Zip64Mode; --+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; --+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; -- import org.apache.maven.plugin.surefire.booterclient.lazytestprovider.Commandline; -- import org.apache.maven.plugin.surefire.booterclient.output.InPluginProcessDumpSingleton; -- import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; --@@ -54,7 +54,7 @@ -- import static org.apache.maven.plugin.surefire.SurefireHelper.escapeToPlatformPath; -- import static org.apache.maven.plugin.surefire.booterclient.JarManifestForkConfiguration.ClasspathElementUri.absolute; -- import static org.apache.maven.plugin.surefire.booterclient.JarManifestForkConfiguration.ClasspathElementUri.relative; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; --+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; -- import static org.apache.maven.surefire.api.util.internal.StringUtils.NL; -- -- /** --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java --index 0fd796cdd..4ad180256 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfiguration.java --@@ -46,7 +46,7 @@ -- import static java.io.File.pathSeparatorChar; -- import static org.apache.maven.plugin.surefire.SurefireHelper.escapeToPlatformPath; -- import static org.apache.maven.surefire.api.util.internal.StringUtils.NL; ---import static org.apache.maven.surefire.shared.utils.StringUtils.replace; --+import static org.apache.maven.shared.utils.StringUtils.replace; -- -- /** -- * @author Tibor Digana (tibor17) --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/Commandline.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/Commandline.java --index bbc14bfe8..d01e48b18 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/Commandline.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/Commandline.java --@@ -25,17 +25,17 @@ -- import java.util.Set; -- import java.util.concurrent.ConcurrentLinkedDeque; -- ---import org.apache.maven.surefire.shared.utils.cli.CommandLineUtils; --+import org.apache.maven.shared.utils.cli.CommandLineUtils; -- -- import static java.util.Collections.addAll; -- -- /** --- * A {@link org.apache.maven.surefire.shared.utils.cli.Commandline} implementation. --+ * A {@link org.apache.maven.shared.utils.cli.Commandline} implementation. -- * -- * @author Andreas Gudian -- */ -- public class Commandline --- extends org.apache.maven.surefire.shared.utils.cli.Commandline --+ extends org.apache.maven.shared.utils.cli.Commandline -- { -- private final Collection excludedEnvironmentVariables; -- private final Set addedEnvironmentVariables; --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java --index f0c5bbfef..a744f952a 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/extensions/SurefireForkChannel.java --@@ -58,8 +58,8 @@ -- import static org.apache.maven.surefire.api.util.internal.Channels.newInputStream; -- import static org.apache.maven.surefire.api.util.internal.Channels.newOutputStream; -- import static org.apache.maven.surefire.api.util.internal.DaemonThreadFactory.newDaemonThreadFactory; ---import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank; ---import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotBlank; --+import static org.apache.commons.lang3.StringUtils.isBlank; --+import static org.apache.commons.lang3.StringUtils.isNotBlank; -- -- /** -- * The TCP/IP server accepting only one client connection. The forked JVM connects to the server using the --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java --index 6541b05fb..00671663a 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/ConsoleReporter.java --@@ -22,14 +22,14 @@ -- import java.util.List; -- -- import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; ---import org.apache.maven.surefire.shared.utils.logging.MessageBuilder; --+import org.apache.maven.shared.utils.logging.MessageBuilder; -- import org.apache.maven.plugin.surefire.log.api.Level; -- import org.apache.maven.surefire.extensions.StatelessTestsetInfoConsoleReportEventListener; -- import org.apache.maven.surefire.api.report.TestSetReportEntry; -- -- import static org.apache.maven.plugin.surefire.log.api.Level.resolveLevel; -- import static org.apache.maven.plugin.surefire.report.TestSetStats.concatenateWithTestGroup; ---import static org.apache.maven.surefire.shared.utils.logging.MessageUtils.buffer; --+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; -- -- /** -- * Base class for console reporters. --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java --index d45ae83cf..34f38b5a3 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactory.java --@@ -24,7 +24,7 @@ -- import org.apache.maven.plugin.surefire.log.api.Level; -- import org.apache.maven.plugin.surefire.runorder.StatisticsReporter; -- import org.apache.maven.surefire.api.report.TestOutputReportEntry; ---import org.apache.maven.surefire.shared.utils.logging.MessageBuilder; --+import org.apache.maven.shared.utils.logging.MessageBuilder; -- import org.apache.maven.surefire.extensions.ConsoleOutputReportEventListener; -- import org.apache.maven.surefire.extensions.StatelessReportEventListener; -- import org.apache.maven.surefire.extensions.StatelessTestsetInfoConsoleReportEventListener; --@@ -55,7 +55,7 @@ -- import static org.apache.maven.plugin.surefire.report.ReportEntryType.ERROR; -- import static org.apache.maven.plugin.surefire.report.ReportEntryType.FAILURE; -- import static org.apache.maven.plugin.surefire.report.ReportEntryType.SUCCESS; ---import static org.apache.maven.surefire.shared.utils.logging.MessageUtils.buffer; --+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; -- import static org.apache.maven.surefire.api.util.internal.ObjectUtils.useNonNull; -- -- /** --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java --index b3410f70b..eafba006f 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporter.java --@@ -32,7 +32,7 @@ -- import java.util.List; -- -- import static org.apache.maven.plugin.surefire.report.FileReporterUtils.stripIllegalFilenameChars; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; --+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; -- -- /** -- * Base class for file reporters. --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java --index 5ef061015..e27fe6d97 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/FileReporterUtils.java --@@ -19,7 +19,7 @@ -- * under the License. -- */ -- ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- -- /** -- * Utils class for file-based reporters --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java --index 45f1c5003..e27691278 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporter.java --@@ -20,8 +20,8 @@ -- */ -- -- import org.apache.maven.plugin.surefire.booterclient.output.InPluginProcessDumpSingleton; ---import org.apache.maven.surefire.shared.utils.xml.PrettyPrintXMLWriter; ---import org.apache.maven.surefire.shared.utils.xml.XMLWriter; --+import org.apache.maven.shared.utils.xml.PrettyPrintXMLWriter; --+import org.apache.maven.shared.utils.xml.XMLWriter; -- import org.apache.maven.surefire.extensions.StatelessReportEventListener; -- import org.apache.maven.surefire.api.report.SafeThrowable; -- --@@ -47,7 +47,7 @@ -- import static org.apache.maven.plugin.surefire.report.FileReporterUtils.stripIllegalFilenameChars; -- import static org.apache.maven.plugin.surefire.report.ReportEntryType.SKIPPED; -- import static org.apache.maven.plugin.surefire.report.ReportEntryType.SUCCESS; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- @SuppressWarnings( { "javadoc", "checkstyle:javadoctype" } ) -- // CHECKSTYLE_OFF: LineLength --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java --index 869f58a5a..dcf6b0709 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/TestSetStats.java --@@ -19,7 +19,7 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.utils.logging.MessageBuilder; --+import org.apache.maven.shared.utils.logging.MessageBuilder; -- import org.apache.maven.surefire.api.report.ReportEntry; -- -- import java.util.ArrayList; --@@ -28,7 +28,7 @@ -- import java.util.Queue; -- import java.util.concurrent.ConcurrentLinkedQueue; -- ---import static org.apache.maven.surefire.shared.utils.logging.MessageUtils.buffer; --+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; -- import static org.apache.maven.surefire.api.report.CategorizedReportEntry.GROUP_PREFIX; -- -- /** --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java --index bc2fca0c5..1520caeb6 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/report/WrappedReportEntry.java --@@ -31,7 +31,7 @@ -- import static java.util.Collections.unmodifiableMap; -- import static org.apache.maven.plugin.surefire.report.ReporterUtils.formatElapsedTime; -- import static org.apache.maven.surefire.api.util.internal.StringUtils.NL; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- /** -- * @author Kristian Rosenvold --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java --index 69a6945a9..4fc533d3f 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/FileScanner.java --@@ -24,7 +24,7 @@ -- import java.io.File; -- import java.util.Collection; -- ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- final class FileScanner -- { --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java --index afd9cf23e..8073907a8 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/ScannerUtil.java --@@ -19,7 +19,7 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.lang3.StringUtils; --+import org.apache.commons.lang3.StringUtils; -- import javax.annotation.Nonnull; -- -- final class ScannerUtil --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java --index 00ea5990a..6b97b2f4f 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/SpecificFileFilter.java --@@ -24,7 +24,7 @@ -- -- import javax.annotation.Nullable; -- ---import org.apache.maven.surefire.shared.utils.io.SelectorUtils; --+import org.apache.maven.shared.utils.io.SelectorUtils; -- -- import static org.apache.maven.plugin.surefire.util.ScannerUtil.convertSlashToSystemFileSeparator; -- --diff --git a/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java b/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java --index ea1188984..70ebd3c56 100644 ----- a/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java --+++ b/maven-surefire-common/src/main/java/org/apache/maven/surefire/stream/EventDecoder.java --@@ -72,7 +72,7 @@ -- import static org.apache.maven.surefire.api.stream.SegmentType.RUN_MODE; -- import static org.apache.maven.surefire.api.stream.SegmentType.STRING_ENCODING; -- import static org.apache.maven.surefire.api.stream.SegmentType.TEST_RUN_ID; ---import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.addShutDownHook; --+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.addShutDownHook; -- -- /** -- * --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java --index ec00a22a4..7bd3154cb 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java --@@ -97,9 +97,9 @@ -- import static java.util.Collections.singletonList; -- import static org.apache.maven.artifact.versioning.VersionRange.createFromVersion; -- import static org.apache.maven.artifact.versioning.VersionRange.createFromVersionSpec; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_9; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.lang3.JavaVersion.JAVA_9; --+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.codehaus.plexus.languages.java.jpms.ModuleNameSource.MODULEDESCRIPTOR; -- import static org.junit.Assert.fail; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java --index 4ebe62a6e..6c5110f79 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoToolchainsTest.java --@@ -21,7 +21,7 @@ -- -- import org.apache.maven.execution.MavenSession; -- import org.apache.maven.plugin.MojoFailureException; ---import org.apache.maven.surefire.shared.io.FilenameUtils; --+import org.apache.commons.io.FilenameUtils; -- import org.apache.maven.toolchain.Toolchain; -- import org.apache.maven.toolchain.ToolchainManager; -- import org.apache.maven.toolchain.java.DefaultJavaToolChain; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java --index dbe2c3697..570adf32b 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/SurefireHelperTest.java --@@ -40,7 +40,7 @@ -- import static java.util.Collections.singleton; -- import static org.apache.maven.plugin.surefire.SurefireHelper.escapeToPlatformPath; -- import static org.apache.maven.plugin.surefire.SurefireHelper.reportExecution; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.hamcrest.Matchers.containsString; -- import static org.junit.Assume.assumeTrue; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java --index 55f63f358..34c021269 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerProviderConfigurationTest.java --@@ -21,7 +21,7 @@ -- -- import junit.framework.Assert; -- import junit.framework.TestCase; ---import org.apache.maven.surefire.shared.io.FileUtils; --+import org.apache.commons.io.FileUtils; -- import org.apache.maven.surefire.booter.BooterDeserializer; -- import org.apache.maven.surefire.booter.ClassLoaderConfiguration; -- import org.apache.maven.surefire.booter.ClasspathConfiguration; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java --index 9baf914af..a2041a541 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/BooterDeserializerStartupConfigurationTest.java --@@ -31,7 +31,7 @@ -- import org.apache.maven.surefire.booter.StartupConfiguration; -- import org.apache.maven.surefire.api.cli.CommandLineOption; -- import org.apache.maven.surefire.api.report.ReporterConfiguration; ---import org.apache.maven.surefire.shared.io.FileUtils; --+import org.apache.commons.io.FileUtils; -- import org.apache.maven.surefire.api.testset.DirectoryScannerParameters; -- import org.apache.maven.surefire.api.testset.RunOrderParameters; -- import org.apache.maven.surefire.api.testset.TestArtifactInfo; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java --index d1771889e..89aeb679e 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkConfigurationTest.java --@@ -31,7 +31,7 @@ -- import org.apache.maven.surefire.booter.StartupConfiguration; -- import org.apache.maven.surefire.booter.SurefireBooterForkException; -- import org.apache.maven.surefire.extensions.ForkNodeFactory; ---import org.apache.maven.surefire.shared.io.FileUtils; --+import org.apache.commons.io.FileUtils; -- import org.junit.After; -- import org.junit.Before; -- import org.junit.Test; --@@ -54,7 +54,7 @@ -- import static org.apache.maven.surefire.api.util.internal.StringUtils.NL; -- import static org.apache.maven.surefire.booter.Classpath.emptyClasspath; -- import static org.apache.maven.surefire.booter.ProcessCheckerType.ALL; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.apache.commons.io.FileUtils.getTempDirectory; -- import static org.junit.Assert.assertEquals; --@@ -128,7 +128,7 @@ protected void resolveClasspath( @Nonnull Commandline cli, -- ClassLoaderConfiguration clc = new ClassLoaderConfiguration( true, true ); -- StartupConfiguration startup = new StartupConfiguration( "cls", cpConfig, clc, ALL, providerJpmsArgs ); -- --- org.apache.maven.surefire.shared.utils.cli.Commandline --+ org.apache.maven.shared.utils.cli.Commandline -- cli = config.createCommandLine( startup, 1, getTempDirectory() ); -- -- assertThat( cli.getEnvironmentVariables() ) --@@ -159,7 +159,7 @@ public void testCliArgs() throws Exception -- ClassLoaderConfiguration clc = new ClassLoaderConfiguration( true, true ); -- StartupConfiguration startup = new StartupConfiguration( "cls", cpConfig, clc, ALL, providerJpmsArgs ); -- --- org.apache.maven.surefire.shared.utils.cli.Commandline --+ org.apache.maven.shared.utils.cli.Commandline -- cli = config.createCommandLine( startup, 1, getTempDirectory() ); -- String cliAsString = cli.toString(); -- --@@ -237,7 +237,7 @@ protected void resolveClasspath( @Nonnull Commandline cli, -- assertThat( startup.isShadefire() ) -- .isFalse(); -- --- org.apache.maven.surefire.shared.utils.cli.Commandline --+ org.apache.maven.shared.utils.cli.Commandline -- cli = config.createCommandLine( startup, 1, getTempDirectory() ); -- -- assertThat( cli.toString() ) --@@ -259,7 +259,7 @@ public void testCreateCommandLine_UseSystemClassLoaderForkOnce_ShouldConstructMa -- StartupConfiguration startup = -- new StartupConfiguration( "", cpConfig, clc, ALL, Collections.emptyList() ); -- --- org.apache.maven.surefire.shared.utils.cli.Commandline --+ org.apache.maven.shared.utils.cli.Commandline -- cli = config.createCommandLine( startup, 1, getTempDirectory() ); -- -- String line = join( " ", cli.getCommandline() ); --@@ -281,7 +281,7 @@ public void testArglineWithNewline() -- StartupConfiguration startup = -- new StartupConfiguration( "", cpConfig, clc, ALL, Collections.emptyList() ); -- --- org.apache.maven.surefire.shared.utils.cli.Commandline --+ org.apache.maven.shared.utils.cli.Commandline -- commandLine = config.createCommandLine( startup, 1, getTempDirectory() ); -- assertThat( commandLine.toString() ).contains( IS_OS_WINDOWS ? "abc def" : "'abc' 'def'" ); -- } --@@ -298,7 +298,7 @@ public void testCurrentWorkingDirectoryPropagationIncludingForkNumberExpansion() -- StartupConfiguration startup = -- new StartupConfiguration( "", cpConfig, clc, ALL, Collections.emptyList() ); -- ForkConfiguration config = getForkConfiguration( cwd.getCanonicalFile() ); --- org.apache.maven.surefire.shared.utils.cli.Commandline --+ org.apache.maven.shared.utils.cli.Commandline -- commandLine = config.createCommandLine( startup, 1, getTempDirectory() ); -- -- File forkDirectory = new File( basedir, "fork_1" ); --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkStarterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkStarterTest.java --index ff04152a5..7b88ada69 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkStarterTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ForkStarterTest.java --@@ -43,9 +43,9 @@ -- import org.apache.maven.surefire.booter.SurefireBooterForkException; -- import org.apache.maven.surefire.extensions.ForkNodeFactory; -- import org.apache.maven.surefire.api.report.ReporterConfiguration; ---import org.apache.maven.surefire.shared.compress.archivers.zip.Zip64Mode; ---import org.apache.maven.surefire.shared.compress.archivers.zip.ZipArchiveEntry; ---import org.apache.maven.surefire.shared.compress.archivers.zip.ZipArchiveOutputStream; --+import org.apache.commons.compress.archivers.zip.Zip64Mode; --+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry; --+import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream; -- import org.junit.AfterClass; -- import org.junit.BeforeClass; -- import org.junit.Rule; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java --index 668859185..bca3acd9c 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/ModularClasspathForkConfigurationTest.java --@@ -45,7 +45,7 @@ -- import static java.util.Arrays.asList; -- import static java.util.Collections.singleton; -- import static org.apache.maven.surefire.booter.Classpath.emptyClasspath; ---import static org.apache.maven.surefire.shared.utils.StringUtils.replace; --+import static org.apache.maven.shared.utils.StringUtils.replace; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.mockito.Mockito.mock; -- --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/CommandlineTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/CommandlineTest.java --index 86d3f3c22..40ad62dd5 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/CommandlineTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/booterclient/lazytestprovider/CommandlineTest.java --@@ -19,11 +19,11 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.utils.cli.CommandLineException; --+import org.apache.maven.shared.utils.cli.CommandLineException; -- import org.assertj.core.api.Condition; -- import org.junit.Test; -- ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- import static org.assertj.core.api.Assertions.assertThat; -- -- /** --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java --index ded28a3d3..8d03ee1b7 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/DefaultReporterFactoryTest.java --@@ -35,7 +35,7 @@ -- import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; -- import org.apache.maven.surefire.api.report.TestOutputReportEntry; -- import org.apache.maven.surefire.api.report.TestReportListener; ---import org.apache.maven.surefire.shared.utils.logging.MessageUtils; --+import org.apache.maven.shared.utils.logging.MessageUtils; -- import org.apache.maven.surefire.report.RunStatistics; -- import org.apache.maven.surefire.api.report.SafeThrowable; -- import org.apache.maven.surefire.api.report.StackTraceWriter; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java --index 8744c91f0..99d4dcfed 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java --@@ -24,8 +24,8 @@ -- import org.apache.maven.surefire.api.report.ReportEntry; -- import org.apache.maven.surefire.api.report.SimpleReportEntry; -- import org.apache.maven.surefire.api.report.StackTraceWriter; ---import org.apache.maven.surefire.shared.utils.xml.Xpp3Dom; ---import org.apache.maven.surefire.shared.utils.xml.Xpp3DomBuilder; --+import org.apache.maven.shared.utils.xml.Xpp3Dom; --+import org.apache.maven.shared.utils.xml.Xpp3DomBuilder; -- -- import java.io.ByteArrayOutputStream; -- import java.io.File; --@@ -49,7 +49,7 @@ -- import static org.apache.maven.surefire.api.report.RunMode.NORMAL_RUN; -- import static org.apache.maven.surefire.api.report.RunMode.RERUN_TEST_AFTER_FAILURE; -- import static org.apache.maven.surefire.api.util.internal.ObjectUtils.systemProps; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isEmpty; --+import static org.apache.maven.shared.utils.StringUtils.isEmpty; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.mockito.Mockito.doThrow; -- import static org.mockito.Mockito.mock; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/TestSetStatsTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/TestSetStatsTest.java --index 0d9bd6a48..c26051c26 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/TestSetStatsTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/TestSetStatsTest.java --@@ -26,7 +26,7 @@ -- import org.powermock.core.classloader.annotations.PowerMockIgnore; -- import org.powermock.modules.junit4.PowerMockRunner; -- ---import static org.apache.maven.surefire.shared.utils.logging.MessageUtils.buffer; --+import static org.apache.maven.shared.utils.logging.MessageUtils.buffer; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.mockito.Mockito.times; -- import static org.mockito.Mockito.verify; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java --index 8f5f58054..86db1648d 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/runorder/RunEntryStatisticsMapTest.java --@@ -39,7 +39,7 @@ -- -- import static java.nio.charset.StandardCharsets.UTF_8; -- import static org.apache.maven.surefire.api.report.RunMode.NORMAL_RUN; ---import static org.apache.maven.surefire.shared.io.IOUtils.readLines; --+import static org.apache.commons.io.IOUtils.readLines; -- import static org.apache.maven.surefire.api.util.internal.StringUtils.NL; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.powermock.reflect.Whitebox.getInternalState; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/StatelessTestsetInfoReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/StatelessTestsetInfoReporterTest.java --index 58d2803e8..3abdc2927 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/StatelessTestsetInfoReporterTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/extensions/StatelessTestsetInfoReporterTest.java --@@ -27,7 +27,7 @@ -- import org.apache.maven.plugin.surefire.report.TestSetStats; -- import org.apache.maven.plugin.surefire.report.WrappedReportEntry; -- import org.apache.maven.surefire.api.report.TestSetReportEntry; ---import org.apache.maven.surefire.shared.utils.logging.MessageUtils; --+import org.apache.maven.shared.utils.logging.MessageUtils; -- import org.junit.Test; -- import org.junit.runner.RunWith; -- import org.mockito.ArgumentCaptor; --diff --git a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java --index 6b0ee446a..71d70a7f4 100644 ----- a/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java --+++ b/maven-surefire-common/src/test/java/org/apache/maven/surefire/report/ConsoleOutputFileReporterTest.java --@@ -31,7 +31,7 @@ -- import org.apache.maven.surefire.api.report.SimpleReportEntry; -- import org.apache.maven.surefire.api.report.TestOutputReportEntry; -- import org.apache.maven.surefire.api.report.TestSetReportEntry; ---import org.apache.maven.surefire.shared.utils.io.FileUtils; --+import org.apache.maven.shared.utils.io.FileUtils; -- -- import static java.nio.charset.StandardCharsets.US_ASCII; -- import static org.apache.maven.surefire.api.report.RunMode.NORMAL_RUN; --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Command.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Command.java --index d768e1142..a74d97fe0 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Command.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/booter/Command.java --@@ -22,7 +22,7 @@ -- import java.util.Objects; -- -- import static java.util.Objects.requireNonNull; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- /** -- * Encapsulates data and command sent from master to forked process. --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/filter/SpecificTestClassFilter.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/filter/SpecificTestClassFilter.java --index 112f5eece..a768b15dd 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/filter/SpecificTestClassFilter.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/filter/SpecificTestClassFilter.java --@@ -22,7 +22,7 @@ -- import java.util.Collections; -- import java.util.HashSet; -- import java.util.Set; ---import org.apache.maven.surefire.shared.utils.io.SelectorUtils; --+import org.apache.maven.shared.utils.io.SelectorUtils; -- import org.apache.maven.surefire.api.util.ScannerFilter; -- -- /** --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/report/LegacyPojoStackTraceWriter.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/report/LegacyPojoStackTraceWriter.java --index ffb09c7fa..83bf77834 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/report/LegacyPojoStackTraceWriter.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/report/LegacyPojoStackTraceWriter.java --@@ -21,7 +21,7 @@ -- -- -- import org.apache.maven.surefire.api.util.internal.StringUtils; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotEmpty; --+import static org.apache.maven.shared.utils.StringUtils.isNotEmpty; -- -- import java.io.PrintWriter; -- import java.io.StringWriter; --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java --index facf30bcb..4614926ea 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/stream/AbstractStreamDecoder.java --@@ -46,7 +46,7 @@ -- import static org.apache.maven.surefire.api.booter.Constants.DEFAULT_STREAM_ENCODING; -- import static org.apache.maven.surefire.api.stream.AbstractStreamDecoder.StreamReadStatus.OVERFLOW; -- import static org.apache.maven.surefire.api.stream.AbstractStreamDecoder.StreamReadStatus.UNDERFLOW; ---import static org.apache.maven.surefire.shared.lang3.StringUtils.isBlank; --+import static org.apache.commons.lang3.StringUtils.isBlank; -- -- /** -- * @param message object --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/ResolvedTest.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/ResolvedTest.java --index 24503581c..aa690d34e 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/ResolvedTest.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/ResolvedTest.java --@@ -19,18 +19,18 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.utils.StringUtils; ---import org.apache.maven.surefire.shared.utils.io.MatchPatterns; --+import org.apache.maven.shared.utils.StringUtils; --+import org.apache.maven.shared.utils.io.MatchPatterns; -- -- import java.util.regex.Pattern; -- -- import static java.io.File.separatorChar; -- import static java.util.regex.Pattern.compile; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; ---import static org.apache.maven.surefire.shared.utils.io.MatchPatterns.from; ---import static org.apache.maven.surefire.shared.utils.io.SelectorUtils.PATTERN_HANDLER_SUFFIX; ---import static org.apache.maven.surefire.shared.utils.io.SelectorUtils.REGEX_HANDLER_PREFIX; ---import static org.apache.maven.surefire.shared.utils.io.SelectorUtils.matchPath; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.io.MatchPatterns.from; --+import static org.apache.maven.shared.utils.io.SelectorUtils.PATTERN_HANDLER_SUFFIX; --+import static org.apache.maven.shared.utils.io.SelectorUtils.REGEX_HANDLER_PREFIX; --+import static org.apache.maven.shared.utils.io.SelectorUtils.matchPath; -- -- /** -- * Single pattern test filter resolved from multi pattern filter -Dtest=MyTest#test,AnotherTest#otherTest. --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java --index bae7c2924..799011a69 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/testset/TestListResolver.java --@@ -26,11 +26,11 @@ -- import java.util.Set; -- -- import static java.util.Collections.unmodifiableSet; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; ---import static org.apache.maven.surefire.shared.utils.StringUtils.split; ---import static org.apache.maven.surefire.shared.utils.io.SelectorUtils.PATTERN_HANDLER_SUFFIX; ---import static org.apache.maven.surefire.shared.utils.io.SelectorUtils.REGEX_HANDLER_PREFIX; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; --+import static org.apache.maven.shared.utils.StringUtils.split; --+import static org.apache.maven.shared.utils.io.SelectorUtils.PATTERN_HANDLER_SUFFIX; --+import static org.apache.maven.shared.utils.io.SelectorUtils.REGEX_HANDLER_PREFIX; -- import static java.util.Collections.singleton; -- import static org.apache.maven.surefire.api.testset.ResolvedTest.Type.CLASS; -- import static org.apache.maven.surefire.api.testset.ResolvedTest.Type.METHOD; --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultDirectoryScanner.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultDirectoryScanner.java --index fcdba6bd7..8edee7816 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultDirectoryScanner.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/DefaultDirectoryScanner.java --@@ -109,8 +109,8 @@ String[] collectTests() -- String[] tests = EMPTY_STRING_ARRAY; -- if ( basedir.exists() ) -- { --- org.apache.maven.surefire.shared.utils.io.DirectoryScanner scanner = --- new org.apache.maven.surefire.shared.utils.io.DirectoryScanner(); --+ org.apache.maven.shared.utils.io.DirectoryScanner scanner = --+ new org.apache.maven.shared.utils.io.DirectoryScanner(); -- -- scanner.setBasedir( basedir ); -- --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ClassMethod.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ClassMethod.java --index 03661d825..1d2a060d6 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ClassMethod.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ClassMethod.java --@@ -21,7 +21,7 @@ -- -- import java.util.Objects; -- ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- /** -- * Data transfer object of class and method literals. --diff --git a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ObjectUtils.java b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ObjectUtils.java --index 9ee7571e4..58276b9d0 100644 ----- a/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ObjectUtils.java --+++ b/surefire-api/src/main/java/org/apache/maven/surefire/api/util/internal/ObjectUtils.java --@@ -22,8 +22,8 @@ -- import java.lang.management.ManagementFactory; -- import java.util.Map; -- ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_17; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; --+import static org.apache.commons.lang3.JavaVersion.JAVA_17; --+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; -- -- /** -- * Similar to Java 7 java.util.Objects. --diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/ObjectUtilsTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/ObjectUtilsTest.java --index ef5035ec4..303b0ea85 100644 ----- a/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/ObjectUtilsTest.java --+++ b/surefire-api/src/test/java/org/apache/maven/surefire/api/util/internal/ObjectUtilsTest.java --@@ -21,8 +21,8 @@ -- -- import org.junit.Test; -- ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_17; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; --+import static org.apache.commons.lang3.JavaVersion.JAVA_17; --+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; -- import static org.assertj.core.api.Assertions.assertThat; -- -- /** --diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/CommandReader.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/CommandReader.java --index 609327ccf..a88bbd621 100644 ----- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/CommandReader.java --+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/CommandReader.java --@@ -54,8 +54,8 @@ -- import static org.apache.maven.surefire.api.booter.MasterProcessCommand.NOOP; -- import static org.apache.maven.surefire.api.booter.MasterProcessCommand.SHUTDOWN; -- import static org.apache.maven.surefire.api.booter.MasterProcessCommand.SKIP_SINCE_NEXT_TEST; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; -- import static org.apache.maven.surefire.api.util.internal.DaemonThreadFactory.newDaemonThread; -- -- /** --diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java --index bd44d55c4..e750194bf 100644 ----- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java --+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ForkedBooter.java --@@ -34,7 +34,7 @@ -- import org.apache.maven.surefire.api.testset.TestSetFailedException; -- import org.apache.maven.surefire.booter.spi.LegacyMasterProcessChannelProcessorFactory; -- import org.apache.maven.surefire.booter.spi.SurefireMasterProcessChannelProcessorFactory; ---import org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils; --+import org.apache.maven.shared.utils.cli.ShutdownHookUtils; -- import org.apache.maven.surefire.spi.MasterProcessChannelProcessorFactory; -- -- import java.io.File; --diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java --index 1fb8a30ae..4e21f43c9 100644 ----- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java --+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PpidChecker.java --@@ -45,12 +45,12 @@ -- import static java.util.concurrent.TimeUnit.HOURS; -- import static java.util.concurrent.TimeUnit.MINUTES; -- import static java.util.regex.Pattern.compile; ---import static org.apache.maven.surefire.shared.io.IOUtils.closeQuietly; ---import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotBlank; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_HP_UX; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_LINUX; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_UNIX; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.io.IOUtils.closeQuietly; --+import static org.apache.commons.lang3.StringUtils.isNotBlank; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_HP_UX; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_LINUX; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_UNIX; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- import static org.apache.maven.surefire.booter.ProcessInfo.unixProcessInfo; -- import static org.apache.maven.surefire.booter.ProcessInfo.windowsProcessInfo; -- import static org.apache.maven.surefire.booter.ProcessInfo.ERR_PROCESS_INFO; --diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java --index 03a0e880d..281d5b4f0 100644 ----- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java --+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/ProcessCheckerType.java --@@ -19,7 +19,7 @@ -- * under the License. -- */ -- ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- /** -- * --diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java --index b5cccf478..13e60aec0 100644 ----- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java --+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/PropertiesWrapper.java --@@ -23,7 +23,7 @@ -- import java.util.ArrayList; -- import java.util.List; -- import java.util.Map; ---import org.apache.maven.surefire.shared.utils.StringUtils; --+import org.apache.maven.shared.utils.StringUtils; -- -- /** -- * @author Kristian Rosenvold --diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java --index bae4ed086..8620be11b 100644 ----- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java --+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SurefireBooterForkException.java --@@ -22,7 +22,7 @@ -- -- import org.apache.maven.surefire.api.suite.RunResult; -- ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; --+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; -- -- /** -- * Encapsulates exceptions thrown during Surefire forking. --diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java --index 674cb22ed..844c4ce11 100644 ----- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java --+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/SystemUtils.java --@@ -36,15 +36,15 @@ -- import static java.lang.Thread.currentThread; -- import static java.util.Objects.requireNonNull; -- import static org.apache.maven.surefire.api.util.ReflectionUtils.invokeMethodWithArray; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_9; ---import static org.apache.maven.surefire.shared.lang3.StringUtils.isNumeric; --+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; --+import static org.apache.commons.lang3.JavaVersion.JAVA_9; --+import static org.apache.commons.lang3.StringUtils.isNumeric; -- import static org.apache.maven.surefire.api.util.ReflectionUtils.invokeMethodChain; -- import static org.apache.maven.surefire.api.util.ReflectionUtils.tryLoadClass; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_LINUX; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_FREE_BSD; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_NET_BSD; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_OPEN_BSD; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_LINUX; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_FREE_BSD; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_NET_BSD; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_OPEN_BSD; -- -- /** -- * JDK 9 support. --diff --git a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/stream/CommandDecoder.java b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/stream/CommandDecoder.java --index 4a7e257f7..86235dbfc 100644 ----- a/surefire-booter/src/main/java/org/apache/maven/surefire/booter/stream/CommandDecoder.java --+++ b/surefire-booter/src/main/java/org/apache/maven/surefire/booter/stream/CommandDecoder.java --@@ -48,7 +48,7 @@ -- import static org.apache.maven.surefire.api.stream.SegmentType.DATA_STRING; -- import static org.apache.maven.surefire.api.stream.SegmentType.END_OF_FRAME; -- import static org.apache.maven.surefire.api.stream.SegmentType.STRING_ENCODING; ---import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.addShutDownHook; --+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.addShutDownHook; -- -- /** -- * --diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterMockTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterMockTest.java --index 62df89930..fe02fdc7e 100644 ----- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterMockTest.java --+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterMockTest.java --@@ -29,7 +29,7 @@ -- import org.apache.maven.surefire.booter.spi.EventChannelEncoder; -- import org.apache.maven.surefire.booter.spi.LegacyMasterProcessChannelProcessorFactory; -- import org.apache.maven.surefire.booter.spi.SurefireMasterProcessChannelProcessorFactory; ---import org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils; --+import org.apache.maven.shared.utils.cli.ShutdownHookUtils; -- import org.apache.maven.surefire.spi.MasterProcessChannelProcessorFactory; -- import org.junit.Rule; -- import org.junit.Test; --diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterTest.java --index b5a1851ea..e367798fe 100644 ----- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterTest.java --+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/ForkedBooterTest.java --@@ -19,7 +19,7 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.io.FileUtils; --+import org.apache.commons.io.FileUtils; -- import org.junit.Test; -- -- import java.io.File; --diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/IsolatedClassLoaderTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/IsolatedClassLoaderTest.java --index 801346633..3eff7b13c 100644 ----- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/IsolatedClassLoaderTest.java --+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/IsolatedClassLoaderTest.java --@@ -20,7 +20,7 @@ -- */ -- -- import org.apache.maven.surefire.api.provider.AbstractProvider; ---import org.apache.maven.surefire.shared.utils.io.FileUtils; --+import org.apache.maven.shared.utils.io.FileUtils; -- import org.junit.Before; -- import org.junit.Test; -- --diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java --index ecc997d97..188cff090 100644 ----- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java --+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/NewClassLoaderRunner.java --@@ -19,7 +19,7 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.utils.io.FileUtils; --+import org.apache.maven.shared.utils.io.FileUtils; -- import org.junit.After; -- import org.junit.Before; -- import org.junit.Test; --diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java --index c5d916e5e..fa6d0df88 100644 ----- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java --+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/PpidCheckerTest.java --@@ -38,8 +38,8 @@ -- import static java.nio.charset.StandardCharsets.US_ASCII; -- import static java.nio.file.Files.readAllBytes; -- import static java.util.concurrent.TimeUnit.SECONDS; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_UNIX; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_UNIX; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- import static org.apache.maven.surefire.booter.ProcessInfo.unixProcessInfo; -- import static org.apache.maven.surefire.booter.ProcessInfo.windowsProcessInfo; -- import static org.assertj.core.api.Assertions.assertThat; --diff --git a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java --index 6b2ac265f..3fa825cab 100644 ----- a/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java --+++ b/surefire-booter/src/test/java/org/apache/maven/surefire/booter/SystemUtilsTest.java --@@ -32,12 +32,12 @@ -- import java.math.BigDecimal; -- -- import static java.io.File.separator; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_9; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_FREE_BSD; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_LINUX; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_NET_BSD; ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_OPEN_BSD; --+import static org.apache.commons.lang3.JavaVersion.JAVA_9; --+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_FREE_BSD; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_LINUX; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_NET_BSD; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_OPEN_BSD; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.junit.Assume.assumeTrue; -- import static org.mockito.Matchers.any; --diff --git a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java --index ae9d92799..eaf017b12 100644 ----- a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java --+++ b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/ConsoleOutputReporter.java --@@ -22,7 +22,7 @@ -- import java.io.File; -- import java.io.PrintStream; -- ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- /** -- * Extension for logger. --diff --git a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java --index effb7de73..3dd0678b1 100644 ----- a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java --+++ b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/StatelessReporter.java --@@ -21,7 +21,7 @@ -- -- import org.apache.maven.surefire.api.report.TestSetReportEntry; -- ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- /** -- * Extension for stateless reporter. --diff --git a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/CommandlineExecutor.java b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/CommandlineExecutor.java --index 14a055d94..ddb96cf67 100644 ----- a/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/CommandlineExecutor.java --+++ b/surefire-extensions-api/src/main/java/org/apache/maven/surefire/extensions/util/CommandlineExecutor.java --@@ -19,13 +19,13 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.utils.cli.CommandLineException; ---import org.apache.maven.surefire.shared.utils.cli.Commandline; --+import org.apache.maven.shared.utils.cli.CommandLineException; --+import org.apache.maven.shared.utils.cli.Commandline; -- -- import java.io.Closeable; -- ---import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.addShutDownHook; ---import static org.apache.maven.surefire.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; --+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.addShutDownHook; --+import static org.apache.maven.shared.utils.cli.ShutdownHookUtils.removeShutdownHook; -- -- /** -- * Programming model with this class: --diff --git a/surefire-extensions-api/src/test/java/org/apache/maven/plugin/surefire/extensions/CommandlineExecutorTest.java b/surefire-extensions-api/src/test/java/org/apache/maven/plugin/surefire/extensions/CommandlineExecutorTest.java --index e3197befe..4f98c9634 100644 ----- a/surefire-extensions-api/src/test/java/org/apache/maven/plugin/surefire/extensions/CommandlineExecutorTest.java --+++ b/surefire-extensions-api/src/test/java/org/apache/maven/plugin/surefire/extensions/CommandlineExecutorTest.java --@@ -24,7 +24,7 @@ -- import org.apache.maven.surefire.extensions.util.CommandlineStreams; -- import org.apache.maven.surefire.extensions.util.CountdownCloseable; -- import org.apache.maven.surefire.extensions.util.LineConsumerThread; ---import org.apache.maven.surefire.shared.utils.cli.Commandline; --+import org.apache.maven.shared.utils.cli.Commandline; -- import org.junit.After; -- import org.junit.Before; -- import org.junit.Test; --@@ -32,7 +32,7 @@ -- import java.io.Closeable; -- import java.nio.file.Paths; -- ---import static org.apache.maven.surefire.shared.lang3.SystemUtils.IS_OS_WINDOWS; --+import static org.apache.commons.lang3.SystemUtils.IS_OS_WINDOWS; -- import static org.assertj.core.api.Assertions.assertThat; -- import static org.assertj.core.util.Files.delete; -- import static org.mockito.ArgumentMatchers.contains; --diff --git a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java --index 3770f2bab..4e3396a4e 100644 ----- a/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java --+++ b/surefire-providers/common-java5/src/main/java/org/apache/maven/surefire/report/SmartStackTraceParser.java --@@ -27,8 +27,8 @@ -- -- import static java.util.Arrays.asList; -- import static java.util.Collections.reverse; ---import static org.apache.maven.surefire.shared.utils.StringUtils.chompLast; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotEmpty; --+import static org.apache.maven.shared.utils.StringUtils.chompLast; --+import static org.apache.maven.shared.utils.StringUtils.isNotEmpty; -- -- /** -- * @author Kristian Rosenvold --diff --git a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java --index f1f54e076..d6478f3c4 100644 ----- a/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java --+++ b/surefire-providers/common-junit4/src/main/java/org/apache/maven/surefire/common/junit4/JUnit4RunListenerFactory.java --@@ -26,7 +26,7 @@ -- -- import org.junit.runner.notification.RunListener; -- ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; --+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; -- -- /** -- * @author Kristian Rosenvold --diff --git a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java --index c532404e5..5f3400e26 100644 ----- a/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java --+++ b/surefire-providers/common-junit48/src/main/java/org/apache/maven/surefire/common/junit48/FilterFactory.java --@@ -32,7 +32,7 @@ -- -- import static org.apache.maven.surefire.api.booter.ProviderParameterNames.TESTNG_EXCLUDEDGROUPS_PROP; -- import static org.apache.maven.surefire.api.booter.ProviderParameterNames.TESTNG_GROUPS_PROP; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isNotBlank; --+import static org.apache.maven.shared.utils.StringUtils.isNotBlank; -- -- /** -- * @author Todd Lipcon --diff --git a/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/FilterFactoryTest.java b/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/FilterFactoryTest.java --index a69d87007..f3c41ef3f 100644 ----- a/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/FilterFactoryTest.java --+++ b/surefire-providers/common-junit48/src/test/java/org/apache/maven/surefire/common/junit48/FilterFactoryTest.java --@@ -19,7 +19,7 @@ -- * under the License. -- */ -- ---import org.apache.maven.surefire.shared.utils.io.MatchPatterns; --+import org.apache.maven.shared.utils.io.MatchPatterns; -- import org.apache.maven.surefire.common.junit48.tests.pt.PT; -- import org.apache.maven.surefire.api.testset.ResolvedTest; -- import org.apache.maven.surefire.api.testset.TestListResolver; --diff --git a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java --index ad2ec944d..5022107a5 100644 ----- a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java --+++ b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/JUnitPlatformProvider.java --@@ -34,7 +34,7 @@ -- import static org.apache.maven.surefire.api.report.RunMode.RERUN_TEST_AFTER_FAILURE; -- import static org.apache.maven.surefire.api.testset.TestListResolver.optionallyWildcardFilter; -- import static org.apache.maven.surefire.api.util.TestsToRun.fromClass; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- import static org.junit.platform.engine.discovery.DiscoverySelectors.selectClass; -- import static org.junit.platform.engine.discovery.DiscoverySelectors.selectUniqueId; -- import static org.junit.platform.launcher.core.LauncherDiscoveryRequestBuilder.request; --@@ -60,7 +60,7 @@ -- import org.apache.maven.surefire.api.util.ScanResult; -- import org.apache.maven.surefire.api.util.SurefireReflectionException; -- import org.apache.maven.surefire.api.util.TestsToRun; ---import org.apache.maven.surefire.shared.utils.StringUtils; --+import org.apache.maven.shared.utils.StringUtils; -- import org.junit.platform.engine.DiscoverySelector; -- import org.junit.platform.engine.Filter; -- import org.junit.platform.launcher.EngineFilter; --diff --git a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java --index aeb24576e..3fd39d4b3 100644 ----- a/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java --+++ b/surefire-providers/surefire-junit-platform/src/main/java/org/apache/maven/surefire/junitplatform/RunListenerAdapter.java --@@ -22,7 +22,7 @@ -- import static java.util.Collections.emptyMap; -- import static java.util.stream.Collectors.joining; -- import static org.apache.maven.surefire.api.util.internal.ObjectUtils.systemProps; ---import static org.apache.maven.surefire.shared.lang3.StringUtils.isNotBlank; --+import static org.apache.commons.lang3.StringUtils.isNotBlank; -- import static org.junit.platform.engine.TestExecutionResult.Status.FAILED; -- -- import java.util.Map; --diff --git a/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java b/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java --index 417511a72..6593fbd4a 100644 ----- a/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java --+++ b/surefire-providers/surefire-junit3/src/test/java/org/apache/maven/surefire/junit/JUnitTestSetTest.java --@@ -36,8 +36,8 @@ -- import java.util.ArrayList; -- import java.util.List; -- ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_17; ---import static org.apache.maven.surefire.shared.lang3.JavaVersion.JAVA_RECENT; --+import static org.apache.commons.lang3.JavaVersion.JAVA_17; --+import static org.apache.commons.lang3.JavaVersion.JAVA_RECENT; -- -- /** -- * --diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java --index e9ede9d15..8d56b5653 100644 ----- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java --+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGDirectoryTestSuite.java --@@ -34,7 +34,7 @@ -- -- import static java.util.Collections.singleton; -- import static org.apache.maven.surefire.testng.TestNGExecutor.run; ---import static org.apache.maven.surefire.shared.utils.StringUtils.isBlank; --+import static org.apache.maven.shared.utils.StringUtils.isBlank; -- -- /** -- * Test suite for TestNG based on a directory of Java test classes. Can also execute JUnit tests. --diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java --index 07d3ad33c..ba5610bb6 100644 ----- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java --+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java --@@ -29,7 +29,7 @@ -- import org.apache.maven.surefire.testng.utils.Stoppable; -- import org.apache.maven.surefire.api.testset.TestListResolver; -- import org.apache.maven.surefire.api.testset.TestSetFailedException; ---import org.apache.maven.surefire.shared.utils.StringUtils; --+import org.apache.maven.shared.utils.StringUtils; -- import org.testng.ITestNGListener; -- import org.testng.TestNG; -- import org.testng.annotations.Test; ---- --2.35.1 -- -diff --git a/project/maven-surefire.properties b/project/maven-surefire.properties -index e78136e..52be8fe 100644 ---- a/project/maven-surefire.properties -+++ b/project/maven-surefire.properties -@@ -1,3 +1,3 @@ - url=https://github.com/apache/maven-surefire.git - ref=surefire-@.@.@-@@ --version=3.0.0~M6 -+version=3.0.0~M3 -diff --git a/project/maven-surefire.xml b/project/maven-surefire.xml -index 83633d3..089e5c6 100644 ---- a/project/maven-surefire.xml -+++ b/project/maven-surefire.xml -@@ -14,8 +14,6 @@ - - surefire-api/src/main/java - surefire-booter/src/main/java -- surefire-extensions-api/src/main/java -- surefire-extensions-spi/src/main/java - surefire-logger-api/src/main/java - surefire-providers/common-java5/src/main/java - surefire-providers/common-junit3/src/main/java -@@ -30,6 +28,7 @@ - org/apache/maven/surefire/common/junit48/FilterFactory - org/apache/maven/surefire/common/junit48/GroupMatcherCategoryFilter - org/apache/maven/surefire/testng/utils/GroupMatcherMethodSelector -+ surefire-api/src/main/resources - - - -@@ -50,8 +49,6 @@ - maven-artifact - asm - plexus-java -- commons-compress -- plexus-component-annotations - - - src/main/java -@@ -61,7 +58,6 @@ - - maven-surefire-plugin - -- - - - --- -2.35.1 - diff --git a/0002-Remove-mojo-parent-dependency-on-junit-bom.patch b/0002-Remove-mojo-parent-dependency-on-junit-bom.patch deleted file mode 100644 index ae17435..0000000 --- a/0002-Remove-mojo-parent-dependency-on-junit-bom.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 60154680d275ef707d7a3a9f32721b02e38199cd Mon Sep 17 00:00:00 2001 -From: Mikolaj Izdebski -Date: Fri, 13 May 2022 14:17:13 +0200 -Subject: [PATCH 2/2] Remove mojo-parent dependency on junit-bom - ---- - .../0001-Remove-dependency-on-junit-bom.patch | 30 +++++++++++++++++++ - 1 file changed, 30 insertions(+) - create mode 100644 patches/mojo-parent-pom/0001-Remove-dependency-on-junit-bom.patch - -diff --git a/patches/mojo-parent-pom/0001-Remove-dependency-on-junit-bom.patch b/patches/mojo-parent-pom/0001-Remove-dependency-on-junit-bom.patch -new file mode 100644 -index 0000000..dab700a ---- /dev/null -+++ b/patches/mojo-parent-pom/0001-Remove-dependency-on-junit-bom.patch -@@ -0,0 +1,30 @@ -+From 64b34bc217f861e84017b56522e8e0efbc267405 Mon Sep 17 00:00:00 2001 -+From: Mikolaj Izdebski -+Date: Fri, 13 May 2022 14:11:25 +0200 -+Subject: [PATCH] Remove dependency on junit-bom -+ -+--- -+ pom.xml | 7 ------- -+ 1 file changed, 7 deletions(-) -+ -+diff --git a/pom.xml b/pom.xml -+index 8785f76..5b2c08b 100644 -+--- a/pom.xml -++++ b/pom.xml -+@@ -275,13 +275,6 @@ -+ 4.13.2 -+ test -+ -+- -+- org.junit -+- junit-bom -+- ${junit5.version} -+- pom -+- import -+- -+ -+ org.apache.maven.plugin-tools -+ maven-plugin-annotations -+-- -+2.35.1 -+ --- -2.35.1 - diff --git a/javapackages-bootstrap.spec b/javapackages-bootstrap.spec index da3808d..d0c0909 100644 --- a/javapackages-bootstrap.spec +++ b/javapackages-bootstrap.spec @@ -16,8 +16,8 @@ #global git_short_hash %(echo %{git_hash} | cut -b -7) Name: javapackages-bootstrap -Version: 1.7.0 -Release: 3%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Summary: A means of bootstrapping Java Packages Tools # For detailed info see the file javapackages-bootstrap-PACKAGE-LICENSING License: ASL 2.0 and ASL 1.1 and (ASL 2.0 or EPL-2.0) and (EPL-2.0 or GPLv2 with exceptions) and MIT and BSD with advertising and BSD and EPL-1.0 and EPL-2.0 and CDDL-1.0 and xpp and CC0 and Public Domain @@ -150,8 +150,6 @@ Source1107: xmvn.tar.xz Source1108: xz-java.tar.xz Patch0: 0001-Bind-to-OpenJDK-17-for-runtime.patch -Patch1: 0001-Revert-Update-maven-surefire-to-version-3.0.0-M6.patch -Patch2: 0002-Remove-mojo-parent-dependency-on-junit-bom.patch Provides: bundled(ant) = 1.10.12 Provides: bundled(apache-parent) = 26 @@ -220,7 +218,7 @@ Provides: bundled(maven-shared-incremental) = 1.1 Provides: bundled(maven-shared-io) = 3.0.0 Provides: bundled(maven-shared-utils) = 3.3.4 Provides: bundled(maven-source-plugin) = 3.2.1 -Provides: bundled(maven-surefire) = 3.0.0~M3 +Provides: bundled(maven-surefire) = 3.0.0~M6 Provides: bundled(maven-verifier) = 1.7.2 Provides: bundled(maven-wagon) = 3.5.1 Provides: bundled(maven) = 3.8.5 @@ -310,8 +308,6 @@ do done %patch0 -p1 -%patch1 -p1 -%patch2 -p1 for patch_path in patches/*/* do @@ -365,6 +361,9 @@ echo '%%jpb_env PATH=/usr/libexec/javapackages-bootstrap:$PATH' >%{buildroot}%{_ %doc AUTHORS %changelog +* Wed Jun 22 2022 Mikolaj Izdebski - 1.7.1-1 +- Update to upstream version 1.7.1 + * Tue Jun 14 2022 Mikolaj Izdebski - 1.7.0-3 - Add openjdk8 toolchain subpackage diff --git a/sources b/sources index e11279c..99ca6af 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (javapackages-bootstrap-1.7.0.tar.xz) = a2c176448b2beb7f29c81f17102c36c387d36c6f4be543b9e69ee3b76480cde631e5f5aeb05c2e206fbe3aff1b2adb1bc27bc0d360ee2d746f03d8a9a999c16a +SHA512 (javapackages-bootstrap-1.7.1.tar.xz) = 2bb425478127950d242193f62cb2eb19abc6ed017368f6ca9b7449ea4688542e8d9abf8f523f88259d0fd2bf741ea317e388597771735493ebeca2aead5c1f46 SHA512 (ant.tar.xz) = d2a4babb7766fc2acf3e9377ffd5af790c7d0612d3e34a9642a9a2b85ffb0f15936ef2979389496dce8ea72ed941797cd1f7507beeb1853a46394019adde4152 SHA512 (apache-pom.tar.xz) = feebe0142114a6fb61dec26153bdef4314554d109bcf4910518ae9ecaf27e5dd9dc1f03d48271833f3497ab7045265900c5816708f513ae834643c533cd1291f SHA512 (apiguardian.tar.xz) = c3d75e88a983eb53c06007fd01f11c89083e119d2d4ed5d0e97644f45d5e451fd611bee493d720d011562ae29e7cdfd1d6fb4621d17c9db4b61430e62afea2bf @@ -66,7 +66,7 @@ SHA512 (maven-shared-incremental.tar.xz) = 77ca067f25b396ccef4f4f911323a3b8bfae1 SHA512 (maven-shared-io.tar.xz) = 0963cca6ff1acb9090d703d384f54f2b036be032f4ebdbbc59fafff806c593a17afe25cedaa562d47dcc2e0ab2b66e4ed7f3b0c66e133ebdee8ede3c81a3d2dd SHA512 (maven-shared-utils.tar.xz) = 1c73783e10a47595963ee93db8090abf18e69395a62917993d3f4ee3a99c27e38c813ba881deb1d24d3e7c1c0b17d6a3e06123e054a1aa2908a85ec90a5bb68c SHA512 (maven-source-plugin.tar.xz) = a512ba17da295771e488fbf9c4f8fd488ed82f07e9a5d56d5327dc6aef28788ed4ff36e65c7231ea70c874425212ccd9a3e3c562a6d96ed6225eaaaed1d873a2 -SHA512 (maven-surefire.tar.xz) = f2069b89a5d5d8e335ab10b227973b3c43e58deaa006b9c4eb4419aaab5c4eee0159dbc8448f8df26fe3c8c00017bf5535b6a6fea962fbbfc2b2b808b1444264 +SHA512 (maven-surefire.tar.xz) = 96b4f2457e78bc272d6054a17b3b27ec7204bcc5c16e83564fc2abeb17214e5810f91f25cf3b172a5e750dfa72b4c3bc0dac861d9751c8db73190480e3acaff7 SHA512 (maven-verifier.tar.xz) = 74977699bf37a9c0929a9583c57128b6c58376953248c16b3aa40f836613e7f0caba0229f5a6d622f814b7d4a94fd201034be7c98d8f9568f93269beccb3ae95 SHA512 (maven-wagon.tar.xz) = abac6ca4ec8b813a7829dea5b90c67938d0c23a03dd24b08b64df005cf5cf113ab0806501a61faa41331f2b399decb1f5259a01fe0ecc4aab4d349dcaa9b1553 SHA512 (maven.tar.xz) = dca267003c12bfbde23bdf5b0a3f90351ba79e7a4a5b3fd7e062441c5b94909043791bc4c2ccd4313c72ddd280502361bd53106b4fc99c6b1cc3fd2c07d4b74c @@ -100,7 +100,7 @@ SHA512 (sisu-inject.tar.xz) = 419f2065f1acdce764ffcfcfb3716fb67a3b85cf596e047f66 SHA512 (sisu-mojos.tar.xz) = ed9462baa5f59561131d84b6ea8d114a16b99fec0c502e2698e38556f1247a3c3550172d551ad8f38107558a8c78890a09ceebfee7ca2fceffea334b3da13ded SHA512 (sisu-plexus.tar.xz) = 044d8738f5387cdecc9e2fdf78ff7b7c46e2240ea982aa09057aa6518c19b8537a115839e3a474ca271cbdf9f1225fc4610a28c875d0759a5af1e7c9f03711d1 SHA512 (slf4j.tar.xz) = 434da37f9efaa3faba2ccda7781290a92904c29a24be6234c4a681bd55d9e33e3e4242282a4995cd40cf72b507aa26d761c8d8de1781d1c4997b50323b9250a6 -SHA512 (testng.tar.xz) = 409fafaa772b92db0ac1978d1de108ed952d8d53ca3fd5d3c212dd67fb8408d45ea0cf9b94e25b08b1d6fe0d5bfcc3175d87fff2c151bb7ba29672fa10e801ae +SHA512 (testng.tar.xz) = 0990fe21441057f08beffad08feb0be62b5a207001bd05c122dd0356231f3ca3ac91ae7cbe974ef2192f1803cd889a389d039b1b9b4136795f279825e03dd6ed SHA512 (univocity-parsers.tar.xz) = 7daa3f54d26d7c64714990c7ad9d539bc7dd531917354b5b90970114e51c20aedac3e1fdd8b45e073d8c196b4ce2fa93c2f84a5498147de951ac147900ce51fa SHA512 (velocity-engine.tar.xz) = c8baa9e159acae579848c1dd33b488eb70f64280e2f806e0e2ccf3024d1bc4f588086cb523e0d8e6ea2f8802ff908ff5578e86e646131768356c6d6e9b7214d0 SHA512 (xbean.tar.xz) = 78bd8f7ed95b04e23df68f89890b16d86e7328b00881ddaaedcde07456761992cf4a25f4e83ebf48637ccb09dd48ff8d6646f8e3062468eb4f2a5f100369a756