[SUREFIRE-2006] Don't use Services Transformer in shadefire

apache · Feb 8, 2022 · fdaf79d · fdaf79d
1 parent 9ba1733
commit fdaf79d
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 9 deletions.
diff --git a/surefire-its/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java b/surefire-its/src/test/java/org/apache/maven/surefire/its/PojoSimpleIT.java
@@ -38,11 +38,13 @@ public class PojoSimpleIT
     public void twoTestsWithFixtures() throws VerificationException
     {
         unpack( "pojo-simple" )
-                .executeTest()
-                .assertTestSuiteResults( 2, 0, 1, 0 )
-                .assertThatLogLine( containsString( "setUp called 1" ), is( 1 ) )
-                .assertThatLogLine( containsString( "setUp called 2" ), is( 1 ) )
-                .assertThatLogLine( containsString( "tearDown called 1" ), is( 1 ) )
-                .assertThatLogLine( containsString( "tearDown called 2" ), is( 1 ) );
+            .executeTest()
+            .assertTestSuiteResults( 2, 0, 1, 0 )
+            .assertThatLogLine( containsString(
+                "[INFO] Using configured provider org.apache.maven.shadefire.surefire.junit.JUnit3Provider" ), is( 1 ) )
+            .assertThatLogLine( containsString( "setUp called 1" ), is( 1 ) )
+            .assertThatLogLine( containsString( "setUp called 2" ), is( 1 ) )
+            .assertThatLogLine( containsString( "tearDown called 1" ), is( 1 ) )
+            .assertThatLogLine( containsString( "tearDown called 2" ), is( 1 ) );
     }
 }
diff --git a/surefire-its/src/test/resources/pojo-simple/pom.xml b/surefire-its/src/test/resources/pojo-simple/pom.xml
@@ -44,6 +44,13 @@
         <configuration>
           <testFailureIgnore>true</testFailureIgnore>
         </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-shadefire</artifactId>
+            <version>${surefire.version}</version>
+          </dependency>
+        </dependencies>
       </plugin>
     </plugins>
   </build>

diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml
@@ -88,9 +88,6 @@
                   <shadedPattern>org.apache.maven.shadefire</shadedPattern>
                 </relocation>
               </relocations>
-                <transformers>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                </transformers>
             </configuration>
           </execution>
         </executions>

diff --git a/...INF/services/org.apache.maven.shadefire.surefire.spi.MasterProcessChannelProcessorFactory b/...INF/services/org.apache.maven.shadefire.surefire.spi.MasterProcessChannelProcessorFactory
@@ -0,0 +1,20 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+org.apache.maven.shadefire.surefire.booter.spi.LegacyMasterProcessChannelProcessorFactory
+org.apache.maven.shadefire.surefire.booter.spi.SurefireMasterProcessChannelProcessorFactory
diff --git a/.../main/resources/META-INF/services/org.apache.maven.surefire.api.provider.SurefireProvider b/.../main/resources/META-INF/services/org.apache.maven.surefire.api.provider.SurefireProvider
@@ -0,0 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+org.apache.maven.shadefire.surefire.junit.JUnit3Provider