[MSHADE-459] Adjust to test also with Java 21 (#196)

slachiewicz · web-flow · commit 64f577be1778 · 2023-09-19T14:26:45.000+02:00
diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
@@ -24,3 +24,6 @@ jobs:
   build:
     name: Verify
     uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3
+    with:
+          ff-jdk: "21"
+          ff-jdk-distribution: "corretto"
diff --git a/pom.xml b/pom.xml
@@ -327,6 +327,7 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-invoker-plugin</artifactId>
+            <version>3.6.0</version>
             <configuration>
               <goals>
                 <goal>package</goal>
@@ -365,5 +366,44 @@
         </plugins>
       </build>
     </profile>
+
+    <!-- TODO remove with parent pom or spotless plugin update https://github.com/diffplug/spotless/issues/1774 -->
+    <profile>
+      <id>java11+</id>
+      <activation>
+        <jdk>[11,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.diffplug.spotless</groupId>
+            <artifactId>spotless-maven-plugin</artifactId>
+            <version>2.39.0</version>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>java21+</id>
+      <activation>
+        <jdk>[21,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>com.diffplug.spotless</groupId>
+            <artifactId>spotless-maven-plugin</artifactId>
+            <configuration>
+              <java>
+                <palantirJavaFormat>
+                  <version>2.35.0</version>
+                </palantirJavaFormat>
+              </java>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>
diff --git a/src/it/MSHADE-321_respectDrpFlag/verify.groovy b/src/it/MSHADE-321_respectDrpFlag/verify.groovy
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import groovy.xml.XmlParser
 
 File jarRenamedFile = new File(basedir, "target/shade_321.jar")
 assert jarRenamedFile.isFile()
diff --git a/src/it/projects/MSHADE-185/verify.groovy b/src/it/projects/MSHADE-185/verify.groovy
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import groovy.xml.XmlSlurper;
 
 File pomFile = new File( basedir, "dependency-reduced-pom.xml" );
 assert pomFile.isFile()
diff --git a/src/it/projects/dep-reduced-pom-artifactset-provided-excludes/verify.groovy b/src/it/projects/dep-reduced-pom-artifactset-provided-excludes/verify.groovy
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import groovy.xml.XmlParser
 
 File pomFile = new File( basedir, "target/dependency-reduced-pom.xml" );
 assert pomFile.isFile()
diff --git a/src/it/projects/dep-reduced-pom-exclusions/verify.groovy b/src/it/projects/dep-reduced-pom-exclusions/verify.groovy
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import groovy.xml.XmlParser
 
 File pomFile = new File( basedir, "dependency-reduced-pom.xml" )
 assert pomFile.isFile()
diff --git a/src/it/projects/dep-reduced-pom-unique/verify.groovy b/src/it/projects/dep-reduced-pom-unique/verify.groovy
@@ -19,6 +19,7 @@
 
 import java.io.*;
 import java.util.Properties;
+import groovy.xml.XmlParser
 
 def drps = basedir.listFiles( { dir, file -> file ==~ "dependency-reduced-.*\\.xml" } as FilenameFilter )
 
diff --git a/src/it/projects/dep-reduced-pom-use-base-version/verify.groovy b/src/it/projects/dep-reduced-pom-use-base-version/verify.groovy
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import groovy.xml.XmlParser
 
 File pomFile = new File( basedir, "target/dependency-reduced-pom.xml" );
 assert pomFile.isFile()
diff --git a/src/it/projects/dep-reduced-pom/verify.groovy b/src/it/projects/dep-reduced-pom/verify.groovy
@@ -16,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+import groovy.xml.XmlParser
 
 File pomFile = new File( basedir, "target/dependency-reduced-pom.xml" );
 assert pomFile.isFile()
diff --git a/src/it/projects/plugin-descriptor-relocation/verify.groovy b/src/it/projects/plugin-descriptor-relocation/verify.groovy
@@ -1,24 +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.
- */
-def shadedJar = new File( basedir, "app/target/mshade-135-1.0.jar")
-def pluginXml = new URL( "jar:" + shadedJar.toURL() + "!/META-INF/maven/plugin.xml" )
-def plugin = new XmlSlurper().parse( pluginXml.openStream() );
-assert plugin.mojos.mojo[0].implementation == "hidden.impl.TestMojo";
-assert plugin.mojos.mojo[0].parameters.parameter[0].type == "hidden.impl.Entry";
+/*
+ * 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 groovy.xml.XmlSlurper
+
+def shadedJar = new File( basedir, "app/target/mshade-135-1.0.jar")
+def pluginXml = new URL( "jar:" + shadedJar.toURL() + "!/META-INF/maven/plugin.xml" )
+def plugin = new XmlSlurper().parse( pluginXml.openStream() );
+assert plugin.mojos.mojo[0].implementation == "hidden.impl.TestMojo";
+assert plugin.mojos.mojo[0].parameters.parameter[0].type == "hidden.impl.Entry";
 assert plugin.mojos.mojo[0].requirements.requirement[0].role == "hidden.api.Component"; 
