From 64f577be177865fd475500d07ab29f8e93cb381c Mon Sep 17 00:00:00 2001 From: Sylwester Lachiewicz Date: Tue, 19 Sep 2023 14:26:45 +0200 Subject: [PATCH] [MSHADE-459] Adjust to test also with Java 21 (#196) --- .github/workflows/maven-verify.yml | 3 ++ pom.xml | 40 ++++++++++++++++ .../MSHADE-321_respectDrpFlag/verify.groovy | 1 + src/it/projects/MSHADE-185/verify.groovy | 1 + .../verify.groovy | 1 + .../dep-reduced-pom-exclusions/verify.groovy | 1 + .../dep-reduced-pom-unique/verify.groovy | 1 + .../verify.groovy | 1 + src/it/projects/dep-reduced-pom/verify.groovy | 1 + .../verify.groovy | 48 ++++++++++--------- 10 files changed, 75 insertions(+), 23 deletions(-) diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml index afb80ac9..1a018d93 100644 --- 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 index 14fd08ba..de97bc31 100644 --- a/pom.xml +++ b/pom.xml @@ -327,6 +327,7 @@ org.apache.maven.plugins maven-invoker-plugin + 3.6.0 package @@ -365,5 +366,44 @@ + + + + java11+ + + [11,) + + + + + com.diffplug.spotless + spotless-maven-plugin + 2.39.0 + + + + + + + java21+ + + [21,) + + + + + com.diffplug.spotless + spotless-maven-plugin + + + + 2.35.0 + + + + + + + diff --git a/src/it/MSHADE-321_respectDrpFlag/verify.groovy b/src/it/MSHADE-321_respectDrpFlag/verify.groovy index 5a6c4cbb..f0635482 100644 --- 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 index 367fe876..7abf6102 100644 --- 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 index 06093d1e..c2455297 100644 --- 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 index 2765519d..3ce18b94 100644 --- 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 index d8c685c0..aa3eb53c 100644 --- 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 index 7caa7f9f..6f7c3b83 100644 --- 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 index ec7a0757..ab6e4aa7 100644 --- 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 index 811b4b5a..48f2151c 100644 --- 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"; \ No newline at end of file