You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2023/09/19 10:42:09 UTC

[maven-shade-plugin] 01/01: wip Java21

This is an automated email from the ASF dual-hosted git repository.

slachiewicz pushed a commit to branch java21
in repository https://gitbox.apache.org/repos/asf/maven-shade-plugin.git

commit 0f7d4a5d31acbddd191b6de9f7b0101009b64365
Author: Sylwester Lachiewicz <sl...@gmail.com>
AuthorDate: Tue Sep 19 12:41:59 2023 +0200

    wip Java21
---
 .github/workflows/maven-verify.yml |  3 +++
 pom.xml                            | 39 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/.github/workflows/maven-verify.yml b/.github/workflows/maven-verify.yml
index afb80ac..1a018d9 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 14fd08b..4908475 100644
--- a/pom.xml
+++ b/pom.xml
@@ -365,5 +365,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>