Skip to content

Commit dd25a20

Browse files
authored
ADD JDK 22 support (#121)
1 parent 9089371 commit dd25a20

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
strategy:
1111
matrix:
1212
os: [ 'ubuntu-latest', 'macos-latest', 'windows-latest' ]
13-
java: [ '8', '11', '17', '21' ]
13+
java: [ '8', '11', '17', '21', '22' ]
1414
fail-fast: false
1515
steps:
1616
- uses: actions/checkout@v4

commons/http-framework/core/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
1515
Copyright 2010–2011 ApexIdentity Inc.
1616
Portions Copyright 2011-2016 ForgeRock AS.
17+
Portions Copyright 2017-2024 3A Systems, LLC.
1718
-->
1819
<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">
1920
<modelVersion>4.0.0</modelVersion>
@@ -75,7 +76,7 @@
7576
</dependency>
7677
<dependency>
7778
<groupId>org.codehaus.groovy</groupId>
78-
<artifactId>groovy-jsr223</artifactId>
79+
<artifactId>groovy-all</artifactId>
7980
<scope>test</scope>
8081
</dependency>
8182
</dependencies>

commons/launcher/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
~ with the fields enclosed by brackets [] replaced by
2222
~ your own identifying information:
2323
~ "Portions Copyrighted [year] [name of copyright owner]"
24+
25+
Portions Copyright 2017-2024 3A Systems, LLC.
2426
-->
2527
<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">
2628
<modelVersion>4.0.0</modelVersion>
@@ -37,8 +39,6 @@
3739

3840
<properties>
3941
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
40-
<maven.compiler.target>1.8</maven.compiler.target>
41-
<maven.compiler.source>1.8</maven.compiler.source>
4242

4343
<!-- Documentation and site properties -->
4444
<docTargetVersion>1.0.0</docTargetVersion>

i18n-framework/pom.xml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
! CDDL HEADER END
2424
!
2525
! Copyright 2011 ForgeRock AS
26-
!
26+
! Portions Copyright 2017-2024 3A Systems, LLC.
2727
-->
2828
<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">
2929
<modelVersion>4.0.0</modelVersion>
@@ -65,10 +65,6 @@
6565
</plugin>
6666
</plugins>
6767
</reporting>
68-
<properties>
69-
<maven.compiler.target>1.8</maven.compiler.target>
70-
<maven.compiler.source>1.8</maven.compiler.source>
71-
</properties>
7268
<dependencies>
7369
<dependency>
7470
<groupId>org.easytesting</groupId>

pom.xml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
with the fields enclosed by brackets [] replaced by
2222
your own identifying information:
2323
"Portions Copyrighted [year] [name of copyright owner]"
24+
25+
Portions Copyright 2017-2024 3A Systems, LLC.
2426
-->
2527

2628
<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 @@
100102
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
101103

102104
<!-- maven-compiler-plugin http://maven.apache.org/plugins/maven-compiler-plugin -->
103-
<mavenCompilerPluginVersion>3.11.0</mavenCompilerPluginVersion>
105+
<mavenCompilerPluginVersion>3.13.0</mavenCompilerPluginVersion>
106+
<maven.compiler.release>8</maven.compiler.release>
104107
<maven.compiler.target>1.8</maven.compiler.target>
105108
<maven.compiler.source>1.8</maven.compiler.source>
106109

@@ -839,8 +842,8 @@
839842
</dependency>
840843
<dependency>
841844
<groupId>org.codehaus.groovy</groupId>
842-
<artifactId>groovy-jsr223</artifactId>
843-
<version>3.0.19</version>
845+
<artifactId>groovy-all</artifactId>
846+
<version>2.4.21</version>
844847
</dependency>
845848
</dependencies>
846849
</dependencyManagement>
@@ -931,6 +934,7 @@
931934
<artifactId>maven-compiler-plugin</artifactId>
932935
<version>${mavenCompilerPluginVersion}</version>
933936
<configuration>
937+
<release>${maven.compiler.release}</release>
934938
<source>${maven.compiler.source}</source>
935939
<target>${maven.compiler.target}</target>
936940
<encoding>${project.build.sourceEncoding}</encoding>
@@ -1004,7 +1008,7 @@
10041008
<!-- </dependency> -->
10051009
<!-- </dependencies> -->
10061010
<configuration>
1007-
<source>8</source>
1011+
<source>1.8</source>
10081012
<author>false</author>
10091013
<quiet>true</quiet>
10101014
<windowtitle>${javadocWindowTitle}</windowtitle>

0 commit comments

Comments
 (0)