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

apache · Feb 10, 2022 · d69d7ad · d69d7ad
1 parent 8221223
commit d69d7ad
Show file tree

Hide file tree

Showing 6 changed files with 185 additions and 3 deletions.
diff --git a/...rc/test/java/org/apache/maven/surefire/its/jiras/Surefire2006ShadefireTransformersIT.java b/...rc/test/java/org/apache/maven/surefire/its/jiras/Surefire2006ShadefireTransformersIT.java
@@ -0,0 +1,42 @@
+package org.apache.maven.surefire.its.jiras;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.surefire.its.fixture.SurefireJUnit4IntegrationTestCase;
+import org.junit.Test;
+
+/**
+ * Test for shadefire usage
+ *
+ * @author Slawomir Jaranowski
+ */
+public class Surefire2006ShadefireTransformersIT
+    extends SurefireJUnit4IntegrationTestCase
+{
+    @Test
+    public void shadefireShouldBeUsed()
+    {
+        unpack( "surefire-2006-shadefire-transformers" )
+            .executeTest()
+            .assertTestSuiteResults( 1, 0, 0, 0 )
+            .verifyTextInLog(
+                "[INFO] Using configured provider org.apache.maven.shadefire.surefire.junit.JUnit3Provider" );
+    }
+}
diff --git a/surefire-its/src/test/resources/surefire-2006-shadefire-transformers/pom.xml b/surefire-its/src/test/resources/surefire-2006-shadefire-transformers/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.plugins.surefire</groupId>
+  <artifactId>surefire-2006</artifactId>
+  <version>1.0-SNAPSHOT</version>
+  <name>shadefire usage test</name>
+
+  <properties>
+    <maven.compiler.source>${java.specification.version}</maven.compiler.source>
+    <maven.compiler.target>${java.specification.version}</maven.compiler.target>
+  </properties>
+
+  <!-- NOTE: This has no dependencies on JUnit or TestNG, just nothing -->
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <version>${surefire.version}</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-shadefire</artifactId>
+            <version>${surefire.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/...e-its/src/test/resources/surefire-2006-shadefire-transformers/src/test/java/PojoTest.java b/...e-its/src/test/resources/surefire-2006-shadefire-transformers/src/test/java/PojoTest.java
@@ -0,0 +1,26 @@
+/*
+ * 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.
+ */
+
+public class PojoTest
+{
+    public void testSuccess()
+    {
+        assert true;
+    }
+}
diff --git a/surefire-shadefire/pom.xml b/surefire-shadefire/pom.xml
@@ -88,9 +88,30 @@
                   <shadedPattern>org.apache.maven.shadefire</shadedPattern>
                 </relocation>
               </relocations>
-                <transformers>
-                    <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-                </transformers>
+              <filters>
+                <filter>
+                  <!-- exclude all services to be sure that everything is manually taken -->
+                  <artifact>org.apache.maven.surefire:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/services/**</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+              <transformers>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                  <resource>META-INF/services/org.apache.maven.shadefire.surefire.spi.MasterProcessChannelProcessorFactory</resource>
+                  <file>src/main/resources/META-INF/services/org.apache.maven.shadefire.surefire.spi.MasterProcessChannelProcessorFactory</file>
+                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+                  <resource>META-INF/services/org.apache.maven.surefire.api.provider.SurefireProvider</resource>
+                  <file>src/main/resources/META-INF/services/org.apache.maven.surefire.api.provider.SurefireProvider</file>
+                </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer"/>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"/>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                  <resource>META-INF/DEPENDENCIES</resource>
+                </transformer>
+              </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