- Update versions

- Added database for authentication-service
MichiBaum · Dec 10, 2023 · 87e17f8 · 87e17f8
1 parent 8340e11
commit 87e17f8
Show file tree

Hide file tree

Showing 14 changed files with 56 additions and 37 deletions.
diff --git a/.env b/.env
@@ -1,2 +1,5 @@
 USERMANAGEMENT_DB_PASSWORD=PleaseChangeMe
-USERMANAGEMENT_DB=usermanagement
+USERMANAGEMENT_DB=usermanagement
+
+AUTHENTICATION_DB_PASSWORD=PleaseChangeMe
+AUTHENTICATION_DB=authentication
diff --git a/admin-service/pom.xml b/admin-service/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>com.michibaum</groupId>
 		<artifactId>microservice</artifactId>
-		<version>1.0.0-TEST-3</version>
+		<version>1.0.0-TEST-4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/authentication-library/pom.xml b/authentication-library/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>microservice</artifactId>
         <groupId>com.michibaum</groupId>
-        <version>1.0.0-TEST-3</version>
+        <version>1.0.0-TEST-4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -28,7 +28,7 @@
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
-            <version>3.18.3</version>
+            <version>4.4.0</version>
         </dependency>
     </dependencies>
 

diff --git a/authentication-service/pom.xml b/authentication-service/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>microservice</artifactId>
         <groupId>com.michibaum</groupId>
-        <version>1.0.0-TEST-3</version>
+        <version>1.0.0-TEST-4</version>
     </parent>
 
     <artifactId>authentication-service</artifactId>
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
-            <version>3.18.3</version>
+            <version>4.4.0</version>
         </dependency>
 
         <dependency>
@@ -75,12 +75,12 @@
         <dependency>
             <groupId>com.michibaum</groupId>
             <artifactId>authentication-library</artifactId>
-            <version>1.0.0-TEST-3</version>
+            <version>1.0.0-TEST-4</version>
         </dependency>
         <dependency>
             <groupId>com.michibaum</groupId>
             <artifactId>usermanagement-library</artifactId>
-            <version>1.0.0-TEST-3</version>
+            <version>1.0.0-TEST-4</version>
         </dependency>
 
     </dependencies>

diff --git a/authentication-service/src/main/resources/application.yml b/authentication-service/src/main/resources/application.yml
@@ -15,6 +15,15 @@ spring:
           include-description: true
   main:
     allow-bean-definition-overriding: true
+  datasource:
+    username: root
+    password: ${DATABASE_PASSWORD}
+    driver-class-name: com.mysql.jdbc.Driver
+    url: jdbc:mysql://authentication-db:3306/${DATABASE}
+  jpa:
+    hibernate:
+#      TODO Change to validate
+      dll-auto: update
 
 eureka:
   client:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,15 +3,15 @@ version: '3.7'
 services:
 
   registry-service:
-    image: 70131370/registry-service:1.0.0-TEST-3
+    image: 70131370/registry-service:1.0.0-TEST-4
     restart: always
     expose:
       - "8761"
     networks:
       - microservice-network
 
   admin-service:
-    image: 70131370/admin-service:1.0.0-TEST-3
+    image: 70131370/admin-service:1.0.0-TEST-4
     restart: always
     depends_on:
       - registry-service
@@ -21,7 +21,7 @@ services:
       - microservice-network
 
   javadoc-service:
-    image: 70131370/javadoc-service:1.0.0-TEST-3
+    image: 70131370/javadoc-service:1.0.0-TEST-4
     restart: always
     depends_on:
       - registry-service
@@ -31,7 +31,7 @@ services:
       - microservice-network
 
   authentication-service:
-    image: 70131370/authentication-service:1.0.0-TEST-3
+    image: 70131370/authentication-service:1.0.0-TEST-4
     restart: always
     depends_on:
       - registry-service
@@ -40,8 +40,19 @@ services:
     networks:
       - microservice-network
 
+  authentication-db:
+    image: mysql:8.0
+    restart: always
+    environment:
+      MYSQL_ROOT_PASSWORD: ${AUTHENTICATION_DB_PASSWORD}
+      MYSQL_DATABASE: ${AUTHENTICATION_DB}
+    expose:
+      - "3306"
+    volumes:
+      - /data/authentication-db:/var/lib/mysql
+
   usermanagement-service:
-    image: 70131370/usermanagement-service:1.0.0-TEST-3
+    image: 70131370/usermanagement-service:1.0.0-TEST-4
     restart: always
     depends_on:
       - registry-service
@@ -66,7 +77,7 @@ services:
       - /data/usermanagement-db:/var/lib/mysql
 
   gateway-service:
-    image: 70131370/gateway-service:1.0.0-TEST-3
+    image: 70131370/gateway-service:1.0.0-TEST-4
     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-3</version>
+		<version>1.0.0-TEST-4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>com.michibaum</groupId>
 			<artifactId>permission-library</artifactId>
-			<version>1.0.0-TEST-3</version>
+			<version>1.0.0-TEST-4</version>
 		</dependency>
 
 	</dependencies>

diff --git a/javadoc-service/pom.xml b/javadoc-service/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>microservice</artifactId>
 		<groupId>com.michibaum</groupId>
-		<version>1.0.0-TEST-3</version>
+		<version>1.0.0-TEST-4</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/permission-library/pom.xml b/permission-library/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>microservice</artifactId>
         <groupId>com.michibaum</groupId>
-        <version>1.0.0-TEST-3</version>
+        <version>1.0.0-TEST-4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
@@ -4,22 +4,21 @@
 
     <groupId>com.michibaum</groupId>
     <artifactId>microservice</artifactId>
-    <version>1.0.0-TEST-3</version>
+    <version>1.0.0-TEST-4</version>
     <packaging>pom</packaging>
     <name>microservice</name>
 
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.0.3</version>
+        <version>3.2.0</version>
         <relativePath /> <!-- lookup parent from repository -->
     </parent>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <spring-cloud.version>2022.0.1</spring-cloud.version>
-        <spring-cloud-gcp.version>4.1.0</spring-cloud-gcp.version>
-        <spring-boot-admin.version>3.0.0</spring-boot-admin.version>
+        <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>
@@ -67,13 +66,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>com.google.cloud</groupId>
-                <artifactId>spring-cloud-gcp-dependencies</artifactId>
-                <version>${spring-cloud-gcp.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>de.codecentric</groupId>
                 <artifactId>spring-boot-admin-dependencies</artifactId>
@@ -162,14 +154,14 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>3.0.0-M7</version>
+                <version>3.0.1</version>
                 <configuration>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.5.0</version>
+                <version>3.6.3</version>
                 <configuration>
                     <outputDirectory>${basedir}/javadoc/src/main/resources</outputDirectory>
                     <reportOutputDirectory>${basedir}/javadoc/src/main/resources</reportOutputDirectory>

diff --git a/registry-service/pom.xml b/registry-service/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>microservice</artifactId>
         <groupId>com.michibaum</groupId>
-        <version>1.0.0-TEST-3</version>
+        <version>1.0.0-TEST-4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/usermanagement-library/pom.xml b/usermanagement-library/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>microservice</artifactId>
         <groupId>com.michibaum</groupId>
-        <version>1.0.0-TEST-3</version>
+        <version>1.0.0-TEST-4</version>
     </parent>
 
     <artifactId>usermanagement-library</artifactId>

diff --git a/usermanagement-service/pom.xml b/usermanagement-service/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>microservice</artifactId>
         <groupId>com.michibaum</groupId>
-        <version>1.0.0-TEST-3</version>
+        <version>1.0.0-TEST-4</version>
     </parent>
 
     <artifactId>usermanagement-service</artifactId>
@@ -69,13 +69,13 @@
         <dependency>
             <groupId>com.michibaum</groupId>
             <artifactId>usermanagement-library</artifactId>
-            <version>1.0.0-TEST-3</version>
+            <version>1.0.0-TEST-4</version>
         </dependency>
 
         <dependency>
             <groupId>com.michibaum</groupId>
             <artifactId>authentication-library</artifactId>
-            <version>1.0.0-TEST-3</version>
+            <version>1.0.0-TEST-4</version>
         </dependency>
 
     </dependencies>

diff --git a/usermanagement-service/src/main/resources/application.yml b/usermanagement-service/src/main/resources/application.yml
@@ -20,6 +20,10 @@ spring:
     password: ${DATABASE_PASSWORD}
     driver-class-name: com.mysql.jdbc.Driver
     url: jdbc:mysql://usermanagement-db:3306/${DATABASE}
+  jpa:
+    hibernate:
+#      TODO Change to validate
+      dll-auto: update
 
 eureka:
   client: