This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 452fb4bc64 Support for JDK 22 (#534)
452fb4bc64 is described below
commit 452fb4bc641ec17bc1fee89b5725c0fadd0ed0e0
Author: Francesco Chicchiriccò <ilgro...@users.noreply.github.com>
AuthorDate: Tue Oct 17 16:13:57 2023 +0200
Support for JDK 22 (#534)
---
.github/workflows/crosschecks.yml | 2 +-
core/idrepo/rest-cxf/pom.xml | 5 --
core/provisioning-api/pom.xml | 5 --
core/provisioning-java/pom.xml | 5 --
ext/elasticsearch/persistence-jpa/pom.xml | 5 --
pom.xml | 93 ++++++++++++++++++++++++++++++-
6 files changed, 93 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/crosschecks.yml
b/.github/workflows/crosschecks.yml
index 443e955d03..5a353a4e91 100644
--- a/.github/workflows/crosschecks.yml
+++ b/.github/workflows/crosschecks.yml
@@ -33,7 +33,7 @@ jobs:
fail-fast: false
matrix:
language: ['java']
- java: [ '21' ]
+ java: [ '21', '22-ea' ]
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
diff --git a/core/idrepo/rest-cxf/pom.xml b/core/idrepo/rest-cxf/pom.xml
index 2f11fffa75..f8f631b815 100644
--- a/core/idrepo/rest-cxf/pom.xml
+++ b/core/idrepo/rest-cxf/pom.xml
@@ -126,11 +126,6 @@ under the License.
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
diff --git a/core/provisioning-api/pom.xml b/core/provisioning-api/pom.xml
index 1ea789a783..75b1c709ef 100644
--- a/core/provisioning-api/pom.xml
+++ b/core/provisioning-api/pom.xml
@@ -69,11 +69,6 @@ under the License.
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
diff --git a/core/provisioning-java/pom.xml b/core/provisioning-java/pom.xml
index 988b50848b..b337b8d6a4 100644
--- a/core/provisioning-java/pom.xml
+++ b/core/provisioning-java/pom.xml
@@ -145,11 +145,6 @@ under the License.
<artifactId>spring-test</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
diff --git a/ext/elasticsearch/persistence-jpa/pom.xml
b/ext/elasticsearch/persistence-jpa/pom.xml
index 5dc191375e..038b9907a0 100644
--- a/ext/elasticsearch/persistence-jpa/pom.xml
+++ b/ext/elasticsearch/persistence-jpa/pom.xml
@@ -56,11 +56,6 @@ under the License.
<artifactId>slf4j-simple</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
diff --git a/pom.xml b/pom.xml
index d4e2335abf..33dee07c22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -420,6 +420,8 @@ under the License.
<jasypt.version>1.9.3</jasypt.version>
+ <groovy.version>5.0.0-SNAPSHOT</groovy.version>
+
<flowable.version>7.0.0</flowable.version>
<flowable-old.version>6.8.0</flowable-old.version>
@@ -870,6 +872,57 @@ under the License.
<version>${connid.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-templates</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-xml</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-jsr223</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-datetime</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-dateutil</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-sql</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-json</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-yaml</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.groovy</groupId>
+ <artifactId>groovy-groovysh</artifactId>
+ <version>${groovy.version}</version>
+ </dependency>
+
<dependency>
<groupId>com.icegreen</groupId>
<artifactId>greenmail</artifactId>
@@ -1698,7 +1751,7 @@ under the License.
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-ant</artifactId>
- <version>4.0.15</version>
+ <version>${groovy.version}</version>
</dependency>
</dependencies>
<executions>
@@ -2200,6 +2253,44 @@ under the License.
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>jdk-22</id>
+
+ <activation>
+ <jdk>22</jdk>
+ </activation>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>5.6.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-junit-jupiter</artifactId>
+ <version>5.6.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy</artifactId>
+ <version>1.14.9</version>
+ </dependency>
+
+ <dependency>
+ <groupId>net.bytebuddy</groupId>
+ <artifactId>byte-buddy-agent</artifactId>
+ <version>1.14.9</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ </profile>
</profiles>
<modules>
