ADD JDK 22 support (#121)

OpenIdentityPlatform · Aug 27, 2024 · dd25a20 · dd25a20
1 parent 9089371
commit dd25a20
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 13 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,7 +10,7 @@ jobs:
     strategy:
       matrix:
         os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
-        java: [ '8', '11', '17', '21' ]
+        java: [ '8', '11', '17', '21', '22' ]
       fail-fast: false
     steps:
     - uses: actions/checkout@v4

diff --git a/commons/http-framework/core/pom.xml b/commons/http-framework/core/pom.xml
@@ -14,6 +14,7 @@
 
   Copyright 2010–2011 ApexIdentity Inc.
   Portions Copyright 2011-2016 ForgeRock AS.
+  Portions Copyright 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>
@@ -75,7 +76,7 @@
     </dependency>
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-jsr223</artifactId>
+      <artifactId>groovy-all</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/commons/launcher/pom.xml b/commons/launcher/pom.xml
@@ -21,6 +21,8 @@
   ~ with the fields enclosed by brackets [] replaced by
   ~ your own identifying information:
   ~ "Portions Copyrighted [year] [name of copyright owner]"
+
+    Portions Copyright 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>
@@ -37,8 +39,6 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.source>1.8</maven.compiler.source>
 
         <!-- Documentation and site properties -->
         <docTargetVersion>1.0.0</docTargetVersion>

diff --git a/i18n-framework/pom.xml b/i18n-framework/pom.xml
@@ -23,7 +23,7 @@
   ! CDDL HEADER END
   !
   !      Copyright 2011 ForgeRock AS
-  !    
+  !      Portions Copyright 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>
@@ -65,10 +65,6 @@
       </plugin>
     </plugins>
   </reporting>
-  <properties>
-    <maven.compiler.target>1.8</maven.compiler.target>
-    <maven.compiler.source>1.8</maven.compiler.source>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>org.easytesting</groupId>

diff --git a/pom.xml b/pom.xml
@@ -21,6 +21,8 @@
  with the fields enclosed by brackets [] replaced by
  your own identifying information:
  "Portions Copyrighted [year] [name of copyright owner]"
+
+   Portions Copyright 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">
@@ -100,7 +102,8 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- maven-compiler-plugin http://maven.apache.org/plugins/maven-compiler-plugin -->
-        <mavenCompilerPluginVersion>3.11.0</mavenCompilerPluginVersion>
+        <mavenCompilerPluginVersion>3.13.0</mavenCompilerPluginVersion>
+        <maven.compiler.release>8</maven.compiler.release>
         <maven.compiler.target>1.8</maven.compiler.target>
         <maven.compiler.source>1.8</maven.compiler.source>
 
@@ -839,8 +842,8 @@
 			</dependency>
 			<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>
 		</dependencies>
 	</dependencyManagement>
@@ -931,6 +934,7 @@
                     <artifactId>maven-compiler-plugin</artifactId>
                     <version>${mavenCompilerPluginVersion}</version>
                     <configuration>
+                        <release>${maven.compiler.release}</release>
                         <source>${maven.compiler.source}</source>
                         <target>${maven.compiler.target}</target>
                         <encoding>${project.build.sourceEncoding}</encoding>
@@ -1004,7 +1008,7 @@
 <!--                         </dependency> -->
 <!--                     </dependencies> -->
                     <configuration>
-                    	<source>8</source>
+                    	<source>1.8</source>
                         <author>false</author>
                         <quiet>true</quiet>
                         <windowtitle>${javadocWindowTitle}</windowtitle>