Merge remote-tracking branch 'origin/main' into g/migrate-unit-tests

// Conflicts:
//	src/test/groovy/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocatorParameterTest.groovy
//	src/test/groovy/com/github/jengelman/gradle/plugins/shadow/relocation/SimpleRelocatorTest.groovy
//	src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheLicenseResourceTransformerTest.groovy
//	src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/ApacheNoticeResourceTransformerTest.groovy
//	src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/AppendingTransformerTest.groovy
//	src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/XmlAppendingTransformerTest.groovy

src/test/.editorconfig

@@ -0,0 +1,4 @@
+root = true
+
+[*.{groovy,java}]
+indent_size = 2

src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/ComponentsXmlResourceTransformerTest.groovy

@@ -1,22 +1,3 @@
-/*
- * 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.
- */
-
 package com.github.jengelman.gradle.plugins.shadow.transformers
 
 import com.github.jengelman.gradle.plugins.shadow.ShadowStats
@@ -29,46 +10,41 @@ import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 
 /**
- * Test for {@link ComponentsXmlResourceTransformer}.
- *
- * @author Brett Porter
- * @version $Id: ComponentsXmlResourceTransformerTest.java 1379994 2012-09-02 15:22:49Z hboutemy $
- *
  * Modified from org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformerTest.java
  */
 class ComponentsXmlResourceTransformerTest extends TransformerTestSupport<ComponentsXmlResourceTransformer> {
-    private static ShadowStats stats
+  private static ShadowStats stats
 
-    @BeforeEach
-    void setUp() {
-        transformer = new ComponentsXmlResourceTransformer()
-        stats = new ShadowStats()
-    }
+  @BeforeEach
+  void setUp() {
+    transformer = new ComponentsXmlResourceTransformer()
+    stats = new ShadowStats()
+  }
 
-    @Test
-    void testConfigurationMerging() {
+  @Test
+  void testConfigurationMerging() {
 
-        XMLUnit.setNormalizeWhitespace(true)
+    XMLUnit.setNormalizeWhitespace(true)
 
-        transformer.transform(
-            TransformerContext.builder()
-                .path("components-1.xml")
-                .inputStream(getClass().getResourceAsStream("/components-1.xml"))
-                .relocators(Collections.<Relocator> emptyList())
-                .stats(stats)
-                .build())
-        transformer.transform(
-            TransformerContext.builder()
-                .path("components-1.xml")
-                .inputStream(getClass().getResourceAsStream("/components-2.xml"))
-                .relocators(Collections.<Relocator> emptyList())
-                .stats(stats)
-                .build())
-        Diff diff = XMLUnit.compareXML(
-            IOUtil.toString(getClass().getResourceAsStream("/components-expected.xml"), "UTF-8"),
-            IOUtil.toString(transformer.getTransformedResource(), "UTF-8"))
-        //assertEquals( IOUtil.toString( getClass().getResourceAsStream( "/components-expected.xml" ), "UTF-8" ),
-        //              IOUtil.toString( transformer.getTransformedResource(), "UTF-8" ).replaceAll("\r\n", "\n") )
-        XMLAssert.assertXMLIdentical(diff, true)
-    }
+    transformer.transform(
+      TransformerContext.builder()
+        .path("components-1.xml")
+        .inputStream(getClass().getResourceAsStream("/components-1.xml"))
+        .relocators(Collections.<Relocator> emptyList())
+        .stats(stats)
+        .build())
+    transformer.transform(
+      TransformerContext.builder()
+        .path("components-1.xml")
+        .inputStream(getClass().getResourceAsStream("/components-2.xml"))
+        .relocators(Collections.<Relocator> emptyList())
+        .stats(stats)
+        .build())
+    Diff diff = XMLUnit.compareXML(
+      IOUtil.toString(getClass().getResourceAsStream("/components-expected.xml"), "UTF-8"),
+      IOUtil.toString(transformer.getTransformedResource(), "UTF-8"))
+    //assertEquals( IOUtil.toString( getClass().getResourceAsStream( "/components-expected.xml" ), "UTF-8" ),
+    //              IOUtil.toString( transformer.getTransformedResource(), "UTF-8" ).replaceAll("\r\n", "\n") )
+    XMLAssert.assertXMLIdentical(diff, true)
+  }
 }

src/test/groovy/com/github/jengelman/gradle/plugins/shadow/transformers/ManifestAppenderTransformerTest.groovy

@@ -1,22 +1,3 @@
-/*
- * 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.
- */
-
 package com.github.jengelman.gradle.plugins.shadow.transformers
 
 import com.github.jengelman.gradle.plugins.shadow.ShadowStats
@@ -34,107 +15,107 @@ import static org.junit.jupiter.api.Assertions.*
  * Test for {@link ManifestAppenderTransformer}.
  */
 class ManifestAppenderTransformerTest extends TransformerTestSupport<ManifestAppenderTransformer> {
-    private static final String MANIFEST_NAME = "META-INF/MANIFEST.MF"
-
-    @BeforeEach
-    void setUp() {
-        transformer = new ManifestAppenderTransformer(objectFactory)
+  private static final String MANIFEST_NAME = "META-INF/MANIFEST.MF"
+
+  @BeforeEach
+  void setUp() {
+    transformer = new ManifestAppenderTransformer(objectFactory)
+  }
+
+  @Test
+  void testCanTransformResource() {
+    transformer.with {
+      append('Name', 'org/foo/bar/')
+      append('Sealed', true)
     }
 
-    @Test
-    void testCanTransformResource() {
-        transformer.with {
-            append('Name', 'org/foo/bar/')
-            append('Sealed', true)
-        }
+    assertTrue(transformer.canTransformResource(getFileElement(MANIFEST_NAME)))
+    assertTrue(transformer.canTransformResource(getFileElement(MANIFEST_NAME.toLowerCase())))
+  }
 
-        assertTrue(transformer.canTransformResource(getFileElement(MANIFEST_NAME)))
-        assertTrue(transformer.canTransformResource(getFileElement(MANIFEST_NAME.toLowerCase())))
-    }
+  @Test
+  void testHasTransformedResource() {
+    transformer.append('Tag', 'Something')
 
-    @Test
-    void testHasTransformedResource() {
-        transformer.append('Tag', 'Something')
+    assertTrue(transformer.hasTransformedResource())
+  }
 
-        assertTrue(transformer.hasTransformedResource())
-    }
+  @Test
+  void testHasNotTransformedResource() {
+    assertFalse(transformer.hasTransformedResource())
+  }
 
-    @Test
-    void testHasNotTransformedResource() {
-        assertFalse(transformer.hasTransformedResource())
-    }
+  @Test
+  void testTransformation() {
+    transformer.with {
+      append('Name', 'org/foo/bar/')
+      append('Sealed', true)
+      append('Name', 'com/example/')
+      append('Sealed', false)
 
-    @Test
-    void testTransformation() {
-        transformer.with {
-            append('Name', 'org/foo/bar/')
-            append('Sealed', true)
-            append('Name', 'com/example/')
-            append('Sealed', false)
-
-            transform(new TransformerContext(MANIFEST_NAME, getResourceStream(MANIFEST_NAME), Collections.<Relocator> emptyList(), new ShadowStats()))
-        }
-
-        def testableZipFile = File.createTempFile("testable-zip-file-", ".jar")
-        def fileOutputStream = new FileOutputStream(testableZipFile)
-        def bufferedOutputStream = new BufferedOutputStream(fileOutputStream)
-        def zipOutputStream = new ZipOutputStream(bufferedOutputStream)
-
-        try {
-            transformer.modifyOutputStream(zipOutputStream, true)
-        } finally {
-            zipOutputStream.close()
-        }
-
-        def targetLines = readFrom(testableZipFile, MANIFEST_NAME)
-        assertFalse(targetLines.isEmpty())
-        assertTrue(targetLines.size() > 4)
-
-        def trailer = targetLines.with { subList(size() - 5, size()) }
-        assertEquals(asList(
-            "Name: org/foo/bar/",
-            "Sealed: true",
-            "Name: com/example/",
-            "Sealed: false",
-            ""), trailer
-        )
+      transform(new TransformerContext(MANIFEST_NAME, getResourceStream(MANIFEST_NAME), Collections.<Relocator> emptyList(), new ShadowStats()))
     }
 
-    @Test
-    void testNoTransformation() {
-        def sourceLines = getResourceStream(MANIFEST_NAME).readLines()
+    def testableZipFile = File.createTempFile("testable-zip-file-", ".jar")
+    def fileOutputStream = new FileOutputStream(testableZipFile)
+    def bufferedOutputStream = new BufferedOutputStream(fileOutputStream)
+    def zipOutputStream = new ZipOutputStream(bufferedOutputStream)
 
-        transformer.transform(new TransformerContext(MANIFEST_NAME, getResourceStream(MANIFEST_NAME), Collections.<Relocator> emptyList(), new ShadowStats()))
-
-        def testableZipFile = File.createTempFile("testable-zip-file-", ".jar")
-        def fileOutputStream = new FileOutputStream(testableZipFile)
-        def bufferedOutputStream = new BufferedOutputStream(fileOutputStream)
-        def zipOutputStream = new ZipOutputStream(bufferedOutputStream)
-
-        try {
-            transformer.modifyOutputStream(zipOutputStream, true)
-        } finally {
-            zipOutputStream.close()
-        }
-        def targetLines = readFrom(testableZipFile, MANIFEST_NAME)
-
-        assertEquals(sourceLines, targetLines)
+    try {
+      transformer.modifyOutputStream(zipOutputStream, true)
+    } finally {
+      zipOutputStream.close()
     }
 
-    static List<String> readFrom(File jarFile, String resourceName) {
-        def zip = new ZipFile(jarFile)
-        try {
-            def entry = zip.getEntry(resourceName)
-            if (!entry) {
-                return Collections.emptyList()
-            }
-            return zip.getInputStream(entry).readLines()
-        } finally {
-            zip.close()
-        }
+    def targetLines = readFrom(testableZipFile, MANIFEST_NAME)
+    assertFalse(targetLines.isEmpty())
+    assertTrue(targetLines.size() > 4)
+
+    def trailer = targetLines.with { subList(size() - 5, size()) }
+    assertEquals(asList(
+      "Name: org/foo/bar/",
+      "Sealed: true",
+      "Name: com/example/",
+      "Sealed: false",
+      ""), trailer
+    )
+  }
+
+  @Test
+  void testNoTransformation() {
+    def sourceLines = getResourceStream(MANIFEST_NAME).readLines()
+
+    transformer.transform(new TransformerContext(MANIFEST_NAME, getResourceStream(MANIFEST_NAME), Collections.<Relocator> emptyList(), new ShadowStats()))
+
+    def testableZipFile = File.createTempFile("testable-zip-file-", ".jar")
+    def fileOutputStream = new FileOutputStream(testableZipFile)
+    def bufferedOutputStream = new BufferedOutputStream(fileOutputStream)
+    def zipOutputStream = new ZipOutputStream(bufferedOutputStream)
+
+    try {
+      transformer.modifyOutputStream(zipOutputStream, true)
+    } finally {
+      zipOutputStream.close()
     }
-
-    InputStream getResourceStream(String resource) {
-        this.class.classLoader.getResourceAsStream(resource)
+    def targetLines = readFrom(testableZipFile, MANIFEST_NAME)
+
+    assertEquals(sourceLines, targetLines)
+  }
+
+  static List<String> readFrom(File jarFile, String resourceName) {
+    def zip = new ZipFile(jarFile)
+    try {
+      def entry = zip.getEntry(resourceName)
+      if (!entry) {
+        return Collections.emptyList()
+      }
+      return zip.getInputStream(entry).readLines()
+    } finally {
+      zip.close()
     }
+  }
+
+  InputStream getResourceStream(String resource) {
+    this.class.classLoader.getResourceAsStream(resource)
+  }
 }