Completing JDK 21 upgrade

apache · Sep 21, 2023 · a4a066d · a4a066d
1 parent bf9f478
commit a4a066d
Show file tree

Hide file tree

Showing 20 changed files with 35 additions and 33 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>
@@ -206,6 +207,18 @@ under the License.
   </build>
 
   <profiles>
+    <profile>
+      <activation>
+        <os>
+          <family>Windows</family>
+        </os>
+      </activation>
+
+      <properties>
+        <syncope.connid.location>file://${bundles.directory}/</syncope.connid.location>
+      </properties>
+    </profile>
+
     <profile>
       <id>sqlgen</id>
 

diff --git a/pom.xml b/pom.xml
@@ -1255,17 +1255,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>