diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index 954d93e5ed..9e178a6e68 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -75,7 +75,6 @@ org.apache.maven.surefire surefire-shared-utils ${surefire-shared-utils.version} - shaded com.google.code.findbugs diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java index 7647eb3e03..af4a26a994 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java @@ -71,7 +71,7 @@ final class SurefireDependencyResolver {"org.apache.maven.surefire", "surefire-junit-platform"}, {"org.apache.maven.surefire", "surefire-api"}, {"org.apache.maven.surefire", "surefire-logger-api"}, - {"org.apache.maven.surefire", "surefire-shared-utils", "shaded"}, + {"org.apache.maven.surefire", "surefire-shared-utils"}, {"org.apache.maven.surefire", "common-java5"}, {"org.apache.maven.surefire", "common-junit3"}, {"org.apache.maven.surefire", "common-junit4"}, diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java index a7f5a09259..c3e144c70d 100644 --- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java +++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java @@ -196,8 +196,8 @@ public void shouldHaveStartupConfigForModularClasspath() booter.setFile( mockFile( "surefire-booter.jar" ) ); Artifact utils = new DefaultArtifact( "org.apache.maven.surefire", "surefire-shared-utils", - createFromVersion( "1" ), "runtime", "jar", "shaded", handler ); - utils.setFile( mockFile( "surefire-shared-utils-1-shaded.jar" ) ); + createFromVersion( "1" ), "runtime", "jar", "", handler ); + utils.setFile( mockFile( "surefire-shared-utils.jar" ) ); Map artifacts = new HashMap<>(); artifacts.put( "org.apache.maven.surefire:maven-surefire-common", common ); @@ -244,8 +244,8 @@ public void shouldHaveStartupConfigForModularClasspath() "test(compact) classpath: non-modular.jar junit.jar hamcrest.jar", "test(compact) modulepath: modular.jar classes", "provider(compact) classpath: surefire-provider.jar", - "in-process classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils-1-shaded.jar", - "in-process(compact) classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils-1-shaded.jar" + "in-process classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils.jar", + "in-process(compact) classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils.jar" ); assertThat( conf ).isNotNull(); @@ -356,8 +356,8 @@ public void shouldHaveStartupConfigForModularClasspathAndTestDescriptor() booter.setFile( mockFile( "surefire-booter.jar" ) ); Artifact utils = new DefaultArtifact( "org.apache.maven.surefire", "surefire-shared-utils", - createFromVersion( "1" ), "runtime", "jar", "shaded", handler ); - utils.setFile( mockFile( "surefire-shared-utils-1-shaded.jar" ) ); + createFromVersion( "1" ), "runtime", "jar", "", handler ); + utils.setFile( mockFile( "surefire-shared-utils.jar" ) ); Map artifacts = new HashMap<>(); artifacts.put( "org.apache.maven.surefire:maven-surefire-common", common ); @@ -390,8 +390,8 @@ public void shouldHaveStartupConfigForModularClasspathAndTestDescriptor() "test(compact) classpath:", "test(compact) modulepath: test-classes classes modular.jar non-modular.jar junit.jar hamcrest.jar", "provider(compact) classpath: surefire-provider.jar", - "in-process classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils-1-shaded.jar", - "in-process(compact) classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils-1-shaded.jar" + "in-process classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils.jar", + "in-process(compact) classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils.jar" ); assertThat( conf ).isNotNull(); 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 28c25065f0..936666321a 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 @@ -478,8 +478,8 @@ public void shouldHaveStartupConfigForNonModularClasspath() booter.setFile( mockFile( "surefire-booter.jar" ) ); Artifact utils = new DefaultArtifact( "org.apache.maven.surefire", "surefire-shared-utils", - createFromVersion( "1" ), "runtime", "jar", "shaded", handler ); - utils.setFile( mockFile( "surefire-shared-utils-1-shaded.jar" ) ); + createFromVersion( "1" ), "runtime", "jar", "", handler ); + utils.setFile( mockFile( "surefire-shared-utils.jar" ) ); Map providerArtifactsMap = new HashMap<>(); providerArtifactsMap.put( "org.apache.maven.surefire:maven-surefire-common", common ); @@ -541,8 +541,8 @@ public void shouldHaveStartupConfigForNonModularClasspath() "provider classpath: surefire-provider.jar", "test(compact) classpath: test-classes classes junit.jar hamcrest.jar", "provider(compact) classpath: surefire-provider.jar", - "in-process classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils-1-shaded.jar", - "in-process(compact) classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils-1-shaded.jar" + "in-process classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils.jar", + "in-process(compact) classpath: surefire-provider.jar maven-surefire-common.jar surefire-booter.jar surefire-extensions-api.jar surefire-api.jar surefire-extensions-spi.jar surefire-logger-api.jar surefire-shared-utils.jar" ); assertThat( conf.getClassLoaderConfiguration() ) @@ -632,8 +632,8 @@ private StartupConfiguration startupConfigurationForProvider( ProviderInfo provi booter.setFile( mockFile( "surefire-booter.jar" ) ); Artifact utils = new DefaultArtifact( "org.apache.maven.surefire", "surefire-shared-utils", - createFromVersion( "1" ), "runtime", "jar", "shaded", handler ); - utils.setFile( mockFile( "surefire-shared-utils-1-shaded.jar" ) ); + createFromVersion( "1" ), "runtime", "jar", "", handler ); + utils.setFile( mockFile( "surefire-shared-utils.jar" ) ); Map providerArtifactsMap = new HashMap<>(); providerArtifactsMap.put( "org.apache.maven.surefire:maven-surefire-common", common ); diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml index 8446a5fd2e..4452a22d39 100644 --- a/surefire-api/pom.xml +++ b/surefire-api/pom.xml @@ -41,7 +41,6 @@ org.apache.maven.surefire surefire-shared-utils ${surefire-shared-utils.version} - shaded com.google.code.findbugs diff --git a/surefire-extensions-api/pom.xml b/surefire-extensions-api/pom.xml index 5f6754fa05..d16347fddb 100644 --- a/surefire-extensions-api/pom.xml +++ b/surefire-extensions-api/pom.xml @@ -46,7 +46,6 @@ org.apache.maven.surefire surefire-shared-utils ${surefire-shared-utils.version} - shaded org.mockito diff --git a/surefire-providers/common-java5/pom.xml b/surefire-providers/common-java5/pom.xml index be06f97ada..90626116b6 100644 --- a/surefire-providers/common-java5/pom.xml +++ b/surefire-providers/common-java5/pom.xml @@ -36,7 +36,6 @@ org.apache.maven.surefire surefire-shared-utils ${surefire-shared-utils.version} - shaded diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml index 9d6c4e3ec0..c8304293bc 100644 --- a/surefire-report-parser/pom.xml +++ b/surefire-report-parser/pom.xml @@ -42,7 +42,6 @@ org.apache.maven.surefire surefire-shared-utils ${surefire-shared-utils.version} - shaded org.apache.maven.reporting diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml index c7940fb031..164e35ccb2 100644 --- a/surefire-shadefire/pom.xml +++ b/surefire-shadefire/pom.xml @@ -73,7 +73,7 @@ - org.apache.maven.surefire:surefire-shared-utils:jar:shaded + org.apache.maven.surefire:surefire-shared-utils org.apache.maven.surefire:surefire-logger-api org.apache.maven.surefire:surefire-api org.apache.maven.surefire:surefire-extensions-spi diff --git a/surefire-shared-utils/pom.xml b/surefire-shared-utils/pom.xml index 8a301eb9aa..b28d3c25fd 100644 --- a/surefire-shared-utils/pom.xml +++ b/surefire-shared-utils/pom.xml @@ -70,8 +70,6 @@ shade - true - shaded org.apache.maven.shared:maven-shared-utils @@ -126,8 +124,7 @@ surefire-shared-utils 3-SNAPSHOT - shaded - target/${project.build.finalName}-shaded.jar + target/${project.build.finalName}.jar