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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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/setup-maven@v4.5
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.
jar
+ file:${bundles.directory}/
${basedir}/../..
@@ -178,7 +179,7 @@ under the License.
maven-surefire-plugin
- file:${bundles.directory}/
+ ${syncope.connid.location}
true
classpath:core-test.properties
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.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 void save() throws ClassNotFoundException {
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.
1.76
9.35
- 3.2.0-M2
+ 3.2.0-M3
4.1.0-M1
4.0.0-SNAPSHOT
1.9.3
- 7.0.0.M2
+ 7.0.0
6.8.0
3.4.4
- 8.10.1
+ 8.10.2
3.3
1.10.0
@@ -438,7 +438,7 @@ under the License.
2.2.224
2.2.16
- 5.6.1
+ 5.7.2
1.3.8
1.4.1-1
@@ -491,7 +491,7 @@ under the License.
6.2023.7
4.0.4
- 15
+ 16
8.0
11
@@ -958,22 +958,12 @@ under the License.
org.bouncycastle
bcprov-jdk15on
-
- org.projectlombok
- lombok
-
org.pac4j
pac4j-oidc
${pac4j.version}
-
-
- org.projectlombok
- lombok
-
-
@@ -1255,17 +1245,6 @@ under the License.
true
-
-
- projectlombok.org
- https://projectlombok.org/edge-releases
-
- false
-
-
- true
-
-
repository.spring.milestone
https://repo.spring.io/milestone
@@ -1665,7 +1644,7 @@ under the License.
org.gaul
modernizer-maven-plugin
- 2.7.0-SNAPSHOT
+ 2.7.0
${targetJdk}
@@ -2204,6 +2183,38 @@ under the License.
docker
+
+
+
+
+ Windows
+
+
+
+
+
+
+ org.codehaus.mojo
+ build-helper-maven-plugin
+
+
+ windows-connid-location
+
+ regex-property
+
+
+ syncope.connid.location
+ file://${project.build.directory}\bundles/
+ \\
+ /
+ false
+
+
+
+
+
+
+
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.
org.apache.cxf
- cxf-rt-transports-http-jetty
+ cxf-rt-transports-http-netty-server
${cxf.version}
test