all works fine without classifier with Maven 3.2.5+

apache · Jan 17, 2022 · fd17776 · fd17776
1 parent 253594f
commit fd17776
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 25 deletions.
diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml
@@ -75,7 +75,6 @@
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shared-utils</artifactId>
             <version>${surefire-shared-utils.version}</version>
-            <classifier>shaded</classifier>
         </dependency>
         <dependency>
             <groupId>com.google.code.findbugs</groupId>

diff --git a/...ire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireDependencyResolver.java b/...ire-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/...mon/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoJava7PlusTest.java b/...mon/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<String, Artifact> 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<String, Artifact> 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/...efire-common/src/test/java/org/apache/maven/plugin/surefire/AbstractSurefireMojoTest.java b/...efire-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<String, Artifact> 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<String, Artifact> 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
@@ -41,7 +41,6 @@
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-shared-utils</artifactId>
       <version>${surefire-shared-utils.version}</version>
-      <classifier>shaded</classifier>
     </dependency>
     <dependency>
       <groupId>com.google.code.findbugs</groupId>

diff --git a/surefire-extensions-api/pom.xml b/surefire-extensions-api/pom.xml
@@ -46,7 +46,6 @@
             <groupId>org.apache.maven.surefire</groupId>
             <artifactId>surefire-shared-utils</artifactId>
             <version>${surefire-shared-utils.version}</version>
-            <classifier>shaded</classifier>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>

diff --git a/surefire-providers/common-java5/pom.xml b/surefire-providers/common-java5/pom.xml
@@ -36,7 +36,6 @@
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-shared-utils</artifactId>
       <version>${surefire-shared-utils.version}</version>
-      <classifier>shaded</classifier>
     </dependency>
   </dependencies>
 

diff --git a/surefire-report-parser/pom.xml b/surefire-report-parser/pom.xml
@@ -42,7 +42,6 @@
       <groupId>org.apache.maven.surefire</groupId>
       <artifactId>surefire-shared-utils</artifactId>
       <version>${surefire-shared-utils.version}</version>
-      <classifier>shaded</classifier>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>

diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml
@@ -73,7 +73,7 @@
             <configuration>
               <artifactSet>
                 <includes>
-                  <include>org.apache.maven.surefire:surefire-shared-utils:jar:shaded</include>
+                  <include>org.apache.maven.surefire:surefire-shared-utils</include>
                   <include>org.apache.maven.surefire:surefire-logger-api</include>
                   <include>org.apache.maven.surefire:surefire-api</include>
                   <include>org.apache.maven.surefire:surefire-extensions-spi</include>

diff --git a/surefire-shared-utils/pom.xml b/surefire-shared-utils/pom.xml
@@ -70,8 +70,6 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
-                            <shadedArtifactAttached>true</shadedArtifactAttached>
-                            <shadedClassifierName>shaded</shadedClassifierName>
                             <artifactSet>
                                 <includes>
                                     <include>org.apache.maven.shared:maven-shared-utils</include>
@@ -126,8 +124,7 @@
                                 <configuration>
                                     <artifactId>surefire-shared-utils</artifactId>
                                     <version>3-SNAPSHOT</version>
-                                    <classifier>shaded</classifier>
-                                    <file>target/${project.build.finalName}-shaded.jar</file>
+                                    <file>target/${project.build.finalName}.jar</file>
                                 </configuration>
                             </execution>
                         </executions>