ADD JDK 22 support

OpenIdentityPlatform · Aug 22, 2024 · 4564327 · 4564327
1 parent 3d6e91b
commit 4564327
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [ '8', '11', '17', '21' ]
+        java: [ '8', '11', '17', '21','22' ]
         os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
       fail-fast: false
     steps:

diff --git a/...on/openam-distribution-ssoadmintools/src/main/assembly/openAMToolsAssembly_Descriptor.xml b/...on/openam-distribution-ssoadmintools/src/main/assembly/openAMToolsAssembly_Descriptor.xml
@@ -22,6 +22,7 @@
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
+* Portions Copyrighted 2019-2024 3A Systems, LLC
 -->
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -86,7 +87,7 @@
                 <include>org.mozilla:rhino</include>
                 <include>org.codehaus.groovy:groovy</include>
                 <include>org.kohsuke:groovy-sandbox</include>
-                <include>org.codehaus.groovy:groovy-jsr223:jar</include>
+                <include>org.codehaus.groovy:*:jar</include>
                 <include>org.openidentityplatform.opendj:opendj-core</include>
                 <include>org.openidentityplatform.commons.i18n-framework:core</include>
                 <include>org.openidentityplatform.commons.audit:core</include>

diff --git a/openam-scripting/pom.xml b/openam-scripting/pom.xml
@@ -13,6 +13,7 @@
  * information: "Portions copyright [year] [name of copyright owner]".
  *
  * Copyright 2014-2016 ForgeRock AS.
+ * Portions Copyrighted 2017-2024 3A Systems, LLC
 -->
 <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>
@@ -77,13 +78,13 @@
 
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
-            <artifactId>groovy-jsr223</artifactId>
+            <artifactId>groovy-all</artifactId>
         </dependency>
 
-        <dependency>
+        <!--dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-json</artifactId>
-        </dependency>
+        </dependency-->
 
         <dependency>
             <groupId>org.kohsuke</groupId>

diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
  *
  * Copyright 2011-2016 ForgeRock AS.
  * Portions Copyrighted 2016 Agile Digital Engineering
- * Portions Copyrighted 2017-2023 Open Identity Platform Community.
+ * Portions Copyrighted 2017-2024 3A Systems, LLC
 -->
 <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/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -1104,15 +1104,15 @@
       <!-- Groovy scripting support -->
       <dependency>
         <groupId>org.codehaus.groovy</groupId>
-        <artifactId>groovy-jsr223</artifactId>
-        <version>3.0.19</version>
+        <artifactId>groovy-all</artifactId>
+        <version>2.4.21</version>
       </dependency>
       <!-- Groovy JSON parsing support -->
-      <dependency>
+      <!--dependency>
         <groupId>org.codehaus.groovy</groupId>
         <artifactId>groovy-json</artifactId>
         <version>3.0.19</version>
-      </dependency>
+      </dependency-->
       <dependency>
         <!-- MIT licensed: http://groovy-sandbox.kohsuke.org/license.html -->
         <groupId>org.kohsuke</groupId>