- java version 17 -> 21

- Kotlin version 1.7.20 -> 1.9.21
MichiBaum · Dec 22, 2023 · dd5d999 · dd5d999
1 parent 36500e3
commit dd5d999
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 45 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -11,11 +11,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
 
       - name: Generate Javadoc
         run: mvn javadoc:aggregate

diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
@@ -10,11 +10,11 @@ jobs:
       - uses: actions/checkout@v2
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v2
         with:
           distribution: 'zulu'
-          java-version: '17'
+          java-version: '21'
       - name: Maven clean install
         run: mvn clean install -DdockerHub.username=${{secrets.DOCKER_USERNAME}} -DdockerHub.password=${{secrets.DOCKER_PASSWORD}}
       - name: Build and analyze

diff --git a/admin-service/pom.xml b/admin-service/pom.xml
@@ -5,16 +5,16 @@
 	<parent>
 		<groupId>com.michibaum</groupId>
 		<artifactId>microservice</artifactId>
-		<version>1.0.0-TEST-5</version>
+		<version>1.0.0-TEST-6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>admin-service</artifactId>
 	<name>admin-service</name>
 
 	<properties>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
 	</properties>
 
 	<dependencies>

diff --git a/authentication-library/pom.xml b/authentication-library/pom.xml
@@ -7,16 +7,16 @@
     <parent>
         <artifactId>microservice</artifactId>
         <groupId>com.michibaum</groupId>
-        <version>1.0.0-TEST-5</version>
+        <version>1.0.0-TEST-6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>authentication-library</artifactId>
     <name>authentication-library</name>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <dependencies>

diff --git a/authentication-service/pom.xml b/authentication-service/pom.xml
@@ -7,15 +7,15 @@
     <parent>
         <artifactId>microservice</artifactId>
         <groupId>com.michibaum</groupId>
-        <version>1.0.0-TEST-5</version>
+        <version>1.0.0-TEST-6</version>
     </parent>
 
     <artifactId>authentication-service</artifactId>
     <name>authentication-service</name>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -79,12 +79,12 @@
         <dependency>
             <groupId>com.michibaum</groupId>
             <artifactId>authentication-library</artifactId>
-            <version>1.0.0-TEST-5</version>
+            <version>1.0.0-TEST-6</version>
         </dependency>
         <dependency>
             <groupId>com.michibaum</groupId>
             <artifactId>usermanagement-library</artifactId>
-            <version>1.0.0-TEST-5</version>
+            <version>1.0.0-TEST-6</version>
         </dependency>
 
     </dependencies>

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.7'
 services:
 
   registry-service:
-    image: 70131370/registry-service:1.0.0-TEST-5
+    image: 70131370/registry-service:1.0.0-TEST-6
     restart: always
     environment:
       spring_profiles_active: prod
@@ -13,7 +13,7 @@ services:
       - microservice-network
 
   admin-service:
-    image: 70131370/admin-service:1.0.0-TEST-5
+    image: 70131370/admin-service:1.0.0-TEST-6
     restart: always
     depends_on:
       - registry-service
@@ -25,7 +25,7 @@ services:
       - microservice-network
 
   javadoc-service:
-    image: 70131370/javadoc-service:1.0.0-TEST-5
+    image: 70131370/javadoc-service:1.0.0-TEST-6
     restart: always
     depends_on:
       - registry-service
@@ -37,7 +37,7 @@ services:
       - microservice-network
 
   authentication-service:
-    image: 70131370/authentication-service:1.0.0-TEST-5
+    image: 70131370/authentication-service:1.0.0-TEST-6
     restart: always
     depends_on:
       - registry-service
@@ -61,7 +61,7 @@ services:
       - /data/authentication-db:/var/lib/mysql
 
   usermanagement-service:
-    image: 70131370/usermanagement-service:1.0.0-TEST-5
+    image: 70131370/usermanagement-service:1.0.0-TEST-6
     restart: always
     depends_on:
       - registry-service
@@ -88,7 +88,7 @@ services:
       - /data/usermanagement-db:/var/lib/mysql
 
   gateway-service:
-    image: 70131370/gateway-service:1.0.0-TEST-5
+    image: 70131370/gateway-service:1.0.0-TEST-6
     restart: always
     depends_on:
       - registry-service

diff --git a/gateway-service/pom.xml b/gateway-service/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>microservice</artifactId>
 		<groupId>com.michibaum</groupId>
-		<version>1.0.0-TEST-5</version>
+		<version>1.0.0-TEST-6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>com.michibaum</groupId>
 			<artifactId>permission-library</artifactId>
-			<version>1.0.0-TEST-5</version>
+			<version>1.0.0-TEST-6</version>
 		</dependency>
 
 	</dependencies>

diff --git a/javadoc-service/pom.xml b/javadoc-service/pom.xml
@@ -5,16 +5,16 @@
 	<parent>
 		<artifactId>microservice</artifactId>
 		<groupId>com.michibaum</groupId>
-		<version>1.0.0-TEST-5</version>
+		<version>1.0.0-TEST-6</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>javadoc-service</artifactId>
 	<name>javadoc-service</name>
 
 	<properties>
-		<maven.compiler.source>17</maven.compiler.source>
-		<maven.compiler.target>17</maven.compiler.target>
+		<maven.compiler.source>21</maven.compiler.source>
+		<maven.compiler.target>21</maven.compiler.target>
 	</properties>
 
 	<dependencies>

diff --git a/permission-library/pom.xml b/permission-library/pom.xml
@@ -5,16 +5,16 @@
     <parent>
         <artifactId>microservice</artifactId>
         <groupId>com.michibaum</groupId>
-        <version>1.0.0-TEST-5</version>
+        <version>1.0.0-TEST-6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>permission-library</artifactId>
     <name>permission-library</name>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.michibaum</groupId>
     <artifactId>microservice</artifactId>
-    <version>1.0.0-TEST-5</version>
+    <version>1.0.0-TEST-6</version>
     <packaging>pom</packaging>
     <name>microservice</name>
 
@@ -19,10 +19,10 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring-cloud.version>2023.0.0</spring-cloud.version>
         <spring-boot-admin.version>3.1.8</spring-boot-admin.version>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <java.version>17</java.version>
-        <kotlin.version>1.7.20</kotlin.version>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <java.version>21</java.version>
+        <kotlin.version>1.9.21</kotlin.version>
 
         <!-- Docker Hub -->
         <dockerHub.url>https://registry.hub.docker.com</dockerHub.url>

diff --git a/registry-service/pom.xml b/registry-service/pom.xml
@@ -6,16 +6,16 @@
     <parent>
         <artifactId>microservice</artifactId>
         <groupId>com.michibaum</groupId>
-        <version>1.0.0-TEST-5</version>
+        <version>1.0.0-TEST-6</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>registry-service</artifactId>
     <name>registry-service</name>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <dependencies>

diff --git a/usermanagement-library/pom.xml b/usermanagement-library/pom.xml
@@ -7,15 +7,15 @@
     <parent>
         <artifactId>microservice</artifactId>
         <groupId>com.michibaum</groupId>
-        <version>1.0.0-TEST-5</version>
+        <version>1.0.0-TEST-6</version>
     </parent>
 
     <artifactId>usermanagement-library</artifactId>
     <name>usermanagement-library</name>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <dependencies>

diff --git a/usermanagement-service/pom.xml b/usermanagement-service/pom.xml
@@ -7,15 +7,15 @@
     <parent>
         <artifactId>microservice</artifactId>
         <groupId>com.michibaum</groupId>
-        <version>1.0.0-TEST-5</version>
+        <version>1.0.0-TEST-6</version>
     </parent>
 
     <artifactId>usermanagement-service</artifactId>
     <name>usermanagement-service</name>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
     </properties>
 
     <dependencies>
@@ -69,13 +69,13 @@
         <dependency>
             <groupId>com.michibaum</groupId>
             <artifactId>usermanagement-library</artifactId>
-            <version>1.0.0-TEST-5</version>
+            <version>1.0.0-TEST-6</version>
         </dependency>
 
         <dependency>
             <groupId>com.michibaum</groupId>
             <artifactId>authentication-library</artifactId>
-            <version>1.0.0-TEST-5</version>
+            <version>1.0.0-TEST-6</version>
         </dependency>
 
     </dependencies>