Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ADD JDK 22 support #787

Merged
merged 1 commit into from
Aug 27, 2024
Merged

ADD JDK 22 support #787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion ...on/openam-distribution-ssoadmintools/src/main/assembly/openAMToolsAssembly_Descriptor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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>
Expand Down
7 changes: 4 additions & 3 deletions openam-scripting/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down