Merge pull request #93 from MichiBaum/develop

Revert "Update Spring Boot 3.3.6 -> 3.4.0"
MichiBaum · Dec 9, 2024 · c629acb · c629acb
2 parents 66d2f3b + 328b053
commit c629acb
Show file tree

Hide file tree

Showing 11 changed files with 41 additions and 5 deletions.
diff --git a/authentication-service/src/main/resources/application-dev.yml b/authentication-service/src/main/resources/application-dev.yml
@@ -15,6 +15,9 @@ spring:
   jpa:
     hibernate:
       ddl-auto: update
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MariaDBDialect
   boot:
     admin:
       client:

diff --git a/authentication-service/src/main/resources/application-prod.yml b/authentication-service/src/main/resources/application-prod.yml
@@ -10,6 +10,9 @@ spring:
   jpa:
     hibernate:
       ddl-auto: update
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MariaDBDialect
   boot:
     admin:
       client:

diff --git a/chess-service/src/main/resources/application-dev.yml b/chess-service/src/main/resources/application-dev.yml
@@ -15,6 +15,9 @@ spring:
   jpa:
     hibernate:
       ddl-auto: update
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MariaDBDialect
   boot:
     admin:
       client:

diff --git a/chess-service/src/main/resources/application-prod.yml b/chess-service/src/main/resources/application-prod.yml
@@ -10,6 +10,9 @@ spring:
   jpa:
     hibernate:
       ddl-auto: update
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MariaDBDialect
   boot:
     admin:
       client:

diff --git a/fitness-service/src/main/resources/application-dev.yml b/fitness-service/src/main/resources/application-dev.yml
@@ -19,6 +19,9 @@ spring:
   jpa:
     hibernate:
       ddl-auto: update
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MariaDBDialect
   boot:
     admin:
       client:

diff --git a/fitness-service/src/main/resources/application-prod.yml b/fitness-service/src/main/resources/application-prod.yml
@@ -15,6 +15,9 @@ spring:
   jpa:
     hibernate:
       ddl-auto: update
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MariaDBDialect
   boot:
     admin:
       client:

diff --git a/music-service/src/main/resources/application-dev.yml b/music-service/src/main/resources/application-dev.yml
@@ -19,6 +19,9 @@ spring:
   jpa:
     hibernate:
       ddl-auto: update
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MariaDBDialect
   boot:
     admin:
       client:

diff --git a/music-service/src/main/resources/application-prod.yml b/music-service/src/main/resources/application-prod.yml
@@ -15,6 +15,9 @@ spring:
   jpa:
     hibernate:
       ddl-auto: update
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MariaDBDialect
   boot:
     admin:
       client:

diff --git a/pom.xml b/pom.xml
@@ -12,10 +12,10 @@
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
         <!--
+        TODO Spring Boot [3.4.0] is not compatible with this Spring Cloud release train 2023.0.x
         https://github.com/spring-projects/spring-boot/wiki
-        https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-starter-parent
         -->
-        <version>3.4.0</version>
+        <version>3.3.6</version>
         <relativePath />
     </parent>
 
@@ -25,12 +25,13 @@
         https://github.com/spring-cloud/spring-cloud-release/wiki/Supported-Versions#supported-releases
         https://github.com/spring-cloud/spring-cloud-release/wiki/Spring-Cloud-2024.0-Release-Notes
         -->
-        <spring-cloud.version>2024.0.0</spring-cloud.version>
+        <spring-cloud.version>2023.0.4</spring-cloud.version>
 
         <!--
         https://mvnrepository.com/artifact/de.codecentric/spring-boot-admin-server
+        TODO 3.4.1
         -->
-        <spring-boot-admin.version>3.4.1</spring-boot-admin.version>
+        <spring-boot-admin.version>3.3.6</spring-boot-admin.version>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>21</maven.compiler.source>
@@ -40,8 +41,9 @@
         <!--
         https://stackoverflow.com/a/77179226/10258204
         https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib
+        TODO 2.1.0
         -->
-        <kotlin.version>2.1.0</kotlin.version>
+        <kotlin.version>2.0.21</kotlin.version>
 
         <!--
         https://mockk.io/
@@ -60,6 +62,10 @@
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-stdlib</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jetbrains.kotlin</groupId>
+            <artifactId>kotlin-stdlib-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-reflect</artifactId>

diff --git a/usermanagement-service/src/main/resources/application-dev.yml b/usermanagement-service/src/main/resources/application-dev.yml
@@ -15,6 +15,9 @@ spring:
   jpa:
     hibernate:
       ddl-auto: update
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MariaDBDialect
   boot:
     admin:
       client:

diff --git a/usermanagement-service/src/main/resources/application-prod.yml b/usermanagement-service/src/main/resources/application-prod.yml
@@ -10,6 +10,9 @@ spring:
   jpa:
     hibernate:
       ddl-auto: update
+    properties:
+      hibernate:
+        dialect: org.hibernate.dialect.MariaDBDialect
   boot:
     admin:
       client: