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 5ac7a16e00 Completing JDK 21 upgrade (#520)
5ac7a16e00 is described below
commit 5ac7a16e002e02dc3dae398ecd5aea03e5411904
Author: Francesco Chicchiriccò <[email protected]>
AuthorDate: Fri Sep 22 12:33:05 2023 +0200
Completing JDK 21 upgrade (#520)
---
.github/workflows/codeql-analysis.yml | 2 +-
.github/workflows/crosschecks.yml | 2 +-
.github/workflows/fit_Elasticsearch.yml | 2 +-
.github/workflows/fit_Payara.yml | 2 +-
.github/workflows/fit_Tomcat_H2_JSON.yml | 2 +-
.github/workflows/fit_Tomcat_H2_XML.yml | 2 +-
.github/workflows/fit_Tomcat_H2_YAML.yml | 2 +-
.github/workflows/fit_WA_SAML2PS4UI_OIDCC4UI.yml | 2 +-
.github/workflows/fit_WA_SRA_CASClient.yml | 2 +-
.github/workflows/fit_WA_SRA_OAuth2.yml | 2 +-
.github/workflows/fit_WA_SRA_OIDC.yml | 2 +-
.github/workflows/fit_WA_SRA_SAML2.yml | 2 +-
.github/workflows/fit_Wildfly.yml | 2 +-
.github/workflows/fit_Zookeeper.yml | 2 +-
.github/workflows/mariadb.yml | 2 +-
.github/workflows/mysql.yml | 4 +-
.github/workflows/oracle.yml | 4 +-
.github/workflows/postgresql.yml | 4 +-
core/persistence-jpa/pom.xml | 3 +-
.../persistence/jpa/inner/ConnInstanceTest.java | 9 ++-
.../docker-compose/docker-compose-all.yml | 2 +-
.../resources/docker-compose/docker-compose-ha.yml | 2 +-
.../docker-compose/docker-compose-pgjsonb.yml | 2 +-
.../docker-compose/docker-compose-postgresql.yml | 2 +-
pom.xml | 65 +++++++++++++---------
wa/starter/pom.xml | 2 +-
26 files changed, 70 insertions(+), 59 deletions(-)
diff --git a/.github/workflows/codeql-analysis.yml
b/.github/workflows/codeql-analysis.yml
index b1ade62adf..a84c0acf24 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -46,7 +46,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/.github/workflows/crosschecks.yml
b/.github/workflows/crosschecks.yml
index ffe2735772..202d8e03a3 100644
--- a/.github/workflows/crosschecks.yml
+++ b/.github/workflows/crosschecks.yml
@@ -33,7 +33,7 @@ jobs:
fail-fast: false
matrix:
language: ['java']
- java: [ '21-ea' ]
+ java: [ '21' ]
os: [ubuntu-latest, windows-latest, macos-latest]
steps:
diff --git a/.github/workflows/fit_Elasticsearch.yml
b/.github/workflows/fit_Elasticsearch.yml
index 6c55ee97a9..0ea74b93fb 100644
--- a/.github/workflows/fit_Elasticsearch.yml
+++ b/.github/workflows/fit_Elasticsearch.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/.github/workflows/fit_Payara.yml b/.github/workflows/fit_Payara.yml
index 0d438ee18a..ce60429e5e 100644
--- a/.github/workflows/fit_Payara.yml
+++ b/.github/workflows/fit_Payara.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/.github/workflows/fit_Tomcat_H2_JSON.yml
b/.github/workflows/fit_Tomcat_H2_JSON.yml
index bd48e74757..b5a0e50b62 100644
--- a/.github/workflows/fit_Tomcat_H2_JSON.yml
+++ b/.github/workflows/fit_Tomcat_H2_JSON.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/.github/workflows/fit_Tomcat_H2_XML.yml
b/.github/workflows/fit_Tomcat_H2_XML.yml
index c70ffa5dff..bfbfcadb15 100644
--- a/.github/workflows/fit_Tomcat_H2_XML.yml
+++ b/.github/workflows/fit_Tomcat_H2_XML.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/.github/workflows/fit_Tomcat_H2_YAML.yml
b/.github/workflows/fit_Tomcat_H2_YAML.yml
index b9eca28a64..eef36f8383 100644
--- a/.github/workflows/fit_Tomcat_H2_YAML.yml
+++ b/.github/workflows/fit_Tomcat_H2_YAML.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/.github/workflows/fit_WA_SAML2PS4UI_OIDCC4UI.yml
b/.github/workflows/fit_WA_SAML2PS4UI_OIDCC4UI.yml
index c81a2e1ec6..c3f4387900 100644
--- a/.github/workflows/fit_WA_SAML2PS4UI_OIDCC4UI.yml
+++ b/.github/workflows/fit_WA_SAML2PS4UI_OIDCC4UI.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/.github/workflows/fit_WA_SRA_CASClient.yml
b/.github/workflows/fit_WA_SRA_CASClient.yml
index ac84ef464a..f6bf54ae59 100644
--- a/.github/workflows/fit_WA_SRA_CASClient.yml
+++ b/.github/workflows/fit_WA_SRA_CASClient.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/.github/workflows/fit_WA_SRA_OAuth2.yml
b/.github/workflows/fit_WA_SRA_OAuth2.yml
index 0dacfcd464..23dd4a4e0c 100644
--- a/.github/workflows/fit_WA_SRA_OAuth2.yml
+++ b/.github/workflows/fit_WA_SRA_OAuth2.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/.github/workflows/fit_WA_SRA_OIDC.yml
b/.github/workflows/fit_WA_SRA_OIDC.yml
index 4d516a8152..144cc76e39 100644
--- a/.github/workflows/fit_WA_SRA_OIDC.yml
+++ b/.github/workflows/fit_WA_SRA_OIDC.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/.github/workflows/fit_WA_SRA_SAML2.yml
b/.github/workflows/fit_WA_SRA_SAML2.yml
index c5d80690fc..412456c375 100644
--- a/.github/workflows/fit_WA_SRA_SAML2.yml
+++ b/.github/workflows/fit_WA_SRA_SAML2.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/.github/workflows/fit_Wildfly.yml
b/.github/workflows/fit_Wildfly.yml
index 7ab1730bd7..21c17adcc3 100644
--- a/.github/workflows/fit_Wildfly.yml
+++ b/.github/workflows/fit_Wildfly.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/.github/workflows/fit_Zookeeper.yml
b/.github/workflows/fit_Zookeeper.yml
index 164c70e065..d398987ab8 100644
--- a/.github/workflows/fit_Zookeeper.yml
+++ b/.github/workflows/fit_Zookeeper.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/.github/workflows/mariadb.yml b/.github/workflows/mariadb.yml
index 8a15fb4185..2eb27a9490 100644
--- a/.github/workflows/mariadb.yml
+++ b/.github/workflows/mariadb.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/.github/workflows/mysql.yml b/.github/workflows/mysql.yml
index 1c9637bc0e..40c29c7cbf 100644
--- a/.github/workflows/mysql.yml
+++ b/.github/workflows/mysql.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
@@ -62,7 +62,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/.github/workflows/oracle.yml b/.github/workflows/oracle.yml
index eab09625aa..0e54ea93ec 100644
--- a/.github/workflows/oracle.yml
+++ b/.github/workflows/oracle.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
@@ -62,7 +62,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/.github/workflows/postgresql.yml b/.github/workflows/postgresql.yml
index c330f54417..a48795d932 100644
--- a/.github/workflows/postgresql.yml
+++ b/.github/workflows/postgresql.yml
@@ -36,7 +36,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
@@ -62,7 +62,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: 21-ea
+ java-version: 21
- name: Setup Maven
uses: stCarolas/[email protected]
with:
diff --git a/core/persistence-jpa/pom.xml b/core/persistence-jpa/pom.xml
index 3a191e8f8a..b1e8b1f086 100644
--- a/core/persistence-jpa/pom.xml
+++ b/core/persistence-jpa/pom.xml
@@ -34,6 +34,7 @@ under the License.
<packaging>jar</packaging>
<properties>
+
<syncope.connid.location>file:${bundles.directory}/</syncope.connid.location>
<rootpom.basedir>${basedir}/../..</rootpom.basedir>
</properties>
@@ -178,7 +179,7 @@ under the License.
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<systemPropertyVariables>
-
<syncope.connid.location>file:${bundles.directory}/</syncope.connid.location>
+
<syncope.connid.location>${syncope.connid.location}</syncope.connid.location>
<h2.returnOffsetDateTime>true</h2.returnOffsetDateTime>
<CORE_PROPERTIES>classpath:core-test.properties</CORE_PROPERTIES>
</systemPropertyVariables>
diff --git
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ConnInstanceTest.java
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ConnInstanceTest.java
index d3f7d319a3..f38d1b5ae0 100644
---
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ConnInstanceTest.java
+++
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ConnInstanceTest.java
@@ -22,7 +22,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import java.io.File;
@@ -153,15 +152,15 @@ public class ConnInstanceTest extends AbstractTest {
assertFalse(conf.isEmpty());
assertNotNull(conf);
- assertTrue(conf.size() == 2);
+ assertEquals(2, conf.size());
}
@Test
public void delete() {
- ConnInstance connectorInstance =
connInstanceDAO.find("88a7a819-dab5-46b4-9b90-0b9769eabdb8");
- assertNotNull(connectorInstance);
+ ConnInstance connInstance =
connInstanceDAO.find("88a7a819-dab5-46b4-9b90-0b9769eabdb8");
+ assertNotNull(connInstance);
- connInstanceDAO.delete(connectorInstance.getKey());
+ connInstanceDAO.delete(connInstance.getKey());
ConnInstance actual =
connInstanceDAO.find("88a7a819-dab5-46b4-9b90-0b9769eabdb8");
assertNull(actual);
diff --git a/docker/src/main/resources/docker-compose/docker-compose-all.yml
b/docker/src/main/resources/docker-compose/docker-compose-all.yml
index f1f95dcdf9..68e5304dd0 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-all.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-all.yml
@@ -28,7 +28,7 @@ services:
restart: always
db:
- image: postgres:15
+ image: postgres:16
restart: always
environment:
POSTGRES_DB: syncope
diff --git a/docker/src/main/resources/docker-compose/docker-compose-ha.yml
b/docker/src/main/resources/docker-compose/docker-compose-ha.yml
index a18f1c5ea2..0df7b71215 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-ha.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-ha.yml
@@ -22,7 +22,7 @@ version: '3.3'
services:
db:
- image: postgres:15
+ image: postgres:16
restart: always
environment:
POSTGRES_DB: syncope
diff --git
a/docker/src/main/resources/docker-compose/docker-compose-pgjsonb.yml
b/docker/src/main/resources/docker-compose/docker-compose-pgjsonb.yml
index c66d9a9953..0d39042c70 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-pgjsonb.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-pgjsonb.yml
@@ -21,7 +21,7 @@ version: '3.3'
services:
db:
- image: postgres:15
+ image: postgres:16
restart: always
environment:
POSTGRES_DB: syncope
diff --git
a/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml
b/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml
index 728bb86f0d..8881840a10 100644
--- a/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml
+++ b/docker/src/main/resources/docker-compose/docker-compose-postgresql.yml
@@ -21,7 +21,7 @@ version: '3.3'
services:
db:
- image: postgres:15
+ image: postgres:16
restart: always
environment:
POSTGRES_DB: syncope
diff --git a/pom.xml b/pom.xml
index 984212dd8f..85921b2eff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -413,19 +413,19 @@ under the License.
<bouncycastle.version>1.76</bouncycastle.version>
<nimbus-jose-jwt.version>9.35</nimbus-jose-jwt.version>
- <spring-boot.version>3.2.0-M2</spring-boot.version>
+ <spring-boot.version>3.2.0-M3</spring-boot.version>
<spring-cloud-gateway.version>4.1.0-M1</spring-cloud-gateway.version>
<openjpa.version>4.0.0-SNAPSHOT</openjpa.version>
<jasypt.version>1.9.3</jasypt.version>
- <flowable.version>7.0.0.M2</flowable.version>
+ <flowable.version>7.0.0</flowable.version>
<flowable-old.version>6.8.0</flowable-old.version>
<disruptor.version>3.4.4</disruptor.version>
- <elasticsearch.version>8.10.1</elasticsearch.version>
+ <elasticsearch.version>8.10.2</elasticsearch.version>
<commons-jexl.version>3.3</commons-jexl.version>
<commons-text.version>1.10.0</commons-text.version>
@@ -438,7 +438,7 @@ under the License.
<h2.version>2.2.224</h2.version>
<swagger-core.version>2.2.16</swagger-core.version>
- <swagger-ui.version>5.6.1</swagger-ui.version>
+ <swagger-ui.version>5.7.2</swagger-ui.version>
<jquery-slimscroll.version>1.3.8</jquery-slimscroll.version>
<jquery-cookie.version>1.4.1-1</jquery-cookie.version>
@@ -491,7 +491,7 @@ under the License.
<payara.version>6.2023.7</payara.version>
<jakarta.faces.version>4.0.4</jakarta.faces.version>
- <docker.postgresql.version>15</docker.postgresql.version>
+ <docker.postgresql.version>16</docker.postgresql.version>
<docker.mysql.version>8.0</docker.mysql.version>
<docker.mariadb.version>11</docker.mariadb.version>
@@ -958,22 +958,12 @@ under the License.
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk15on</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.pac4j</groupId>
<artifactId>pac4j-oidc</artifactId>
<version>${pac4j.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- PAC4J -->
@@ -1255,17 +1245,6 @@ under the License.
<enabled>true</enabled>
</releases>
</repository>
- <!-- TMP -->
- <repository>
- <id>projectlombok.org</id>
- <url>https://projectlombok.org/edge-releases</url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
<repository>
<id>repository.spring.milestone</id>
<url>https://repo.spring.io/milestone</url>
@@ -1665,7 +1644,7 @@ under the License.
<plugin>
<groupId>org.gaul</groupId>
<artifactId>modernizer-maven-plugin</artifactId>
- <version>2.7.0-SNAPSHOT</version>
+ <version>2.7.0</version>
<configuration>
<javaVersion>${targetJdk}</javaVersion>
<ignorePackages>
@@ -2204,6 +2183,38 @@ under the License.
<module>docker</module>
</modules>
</profile>
+
+ <profile>
+ <activation>
+ <os>
+ <family>Windows</family>
+ </os>
+ </activation>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>windows-connid-location</id>
+ <goals>
+ <goal>regex-property</goal>
+ </goals>
+ <configuration>
+ <name>syncope.connid.location</name>
+ <value>file://${project.build.directory}\bundles/</value>
+ <regex>\\</regex>
+ <replacement>/</replacement>
+ <failIfNoMatch>false</failIfNoMatch>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
<modules>
diff --git a/wa/starter/pom.xml b/wa/starter/pom.xml
index 9b1c7a3c60..e98faae7e4 100644
--- a/wa/starter/pom.xml
+++ b/wa/starter/pom.xml
@@ -383,7 +383,7 @@ under the License.
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-transports-http-jetty</artifactId>
+ <artifactId>cxf-rt-transports-http-netty-server</artifactId>
<version>${cxf.version}</version>
<scope>test</scope>
</dependency>
