Completing JDK 21 upgrade (#520)

apache · Sep 22, 2023 · 5ac7a16 · 5ac7a16
1 parent 5e47509
commit 5ac7a16
Show file tree

Hide file tree

Showing 26 changed files with 70 additions and 59 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/...nce-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/ConnInstanceTest.java b/...nce-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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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>