project upgrade

- upgrade to spring-boot 3.0.2;
- upgrade to springdoc-openapi 2.0.2;
- upgrade to spring-cloud 2022.0.1;
- upgrade to spring-vault 3.0.0;
- replace mysql.mysql-connector-java dependency to com.mysql.mysql-connector-j;
- upgrade to cassandra docker image 4.1.0;
- upgrade to mysql docker image 8.0.32;
- upgrade to vault docker image 1.12.3;
- upgrade to consul docker image 1.14.4.

Author: Ivan Franchin

docker/cassandra/Dockerfile

@@ -1,4 +1,4 @@
-FROM cassandra:4.0.6
+FROM cassandra:4.1.0
 
 RUN echo "authenticator: PasswordAuthenticator" >> /etc/cassandra/cassandra.yaml
 RUN echo "authorizer: org.apache.cassandra.auth.CassandraAuthorizer" >> /etc/cassandra/cassandra.yaml

init-environment.sh

@@ -2,10 +2,9 @@
 
 source scripts/my-functions.sh
 
-MYSQL_VERSION="8.0.31"
-CASSANDRA_VERSION="4.0.6"
-VAULT_VERSION="1.12.1"
-CONSUL_VERSION="1.13.3"
+MYSQL_VERSION="8.0.32"
+VAULT_VERSION="1.12.3"
+CONSUL_VERSION="1.14.4"
 
 echo
 echo "Starting environment"

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.5</version>
+        <version>3.0.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -20,7 +20,7 @@
         <java.version>17</java.version>
         <org.mapstruct.version>1.5.3.Final</org.mapstruct.version>
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
-        <springdoc-openapi.version>1.6.12</springdoc-openapi.version>
+        <springdoc-openapi.version>2.0.2</springdoc-openapi.version>
         <jib-maven-plugin.version>3.3.1</jib-maven-plugin.version>
         <docker-image.prefix>ivanfranchin</docker-image.prefix>
     </properties>
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
             <version>${springdoc-openapi.version}</version>
         </dependency>
         <dependency>

spring-cloud-vault-approle-cassandra/book-service/pom.xml

@@ -14,7 +14,7 @@
     <description>Demo project for Spring Boot</description>
 
     <properties>
-        <spring-cloud.version>2021.0.5</spring-cloud.version>
+        <spring-cloud.version>2022.0.1</spring-cloud.version>
     </properties>
 
     <dependencies>

spring-cloud-vault-approle-cassandra/book-service/src/main/java/com/ivanfranchin/bookservice/config/CassandraConfig.java

@@ -13,16 +13,16 @@
 @Configuration
 public class CassandraConfig {
 
-    @Value("${spring.data.cassandra.local-datacenter}")
+    @Value("${spring.cassandra.local-datacenter}")
     private String localDatacenter;
 
-    @Value("${spring.data.cassandra.contact-points}")
+    @Value("${spring.cassandra.contact-points}")
     private String contactPoints;
 
-    @Value("${spring.data.cassandra.port}")
+    @Value("${spring.cassandra.port}")
     private int port;
 
-    @Value("${spring.data.cassandra.keyspace-name}")
+    @Value("${spring.cassandra.keyspace-name}")
     private String keyspaceName;
 
     @Value("${spring.datasource.username}")

spring-cloud-vault-approle-cassandra/book-service/src/main/java/com/ivanfranchin/bookservice/config/SwaggerConfig.java

@@ -3,7 +3,7 @@
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
-import org.springdoc.core.GroupedOpenApi;
+import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-cloud-vault-approle-cassandra/book-service/src/main/java/com/ivanfranchin/bookservice/config/VaultLeaseConfig.java

@@ -1,5 +1,6 @@
 package com.ivanfranchin.bookservice.config;
 
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -9,8 +10,6 @@
 import org.springframework.vault.core.lease.event.SecretLeaseCreatedEvent;
 import org.springframework.vault.core.lease.event.SecretLeaseExpiredEvent;
 
-import javax.annotation.PostConstruct;
-
 @Slf4j
 @RequiredArgsConstructor
 @Configuration

spring-cloud-vault-approle-cassandra/book-service/src/main/java/com/ivanfranchin/bookservice/rest/BookController.java

@@ -5,6 +5,7 @@
 import com.ivanfranchin.bookservice.rest.dto.BookResponse;
 import com.ivanfranchin.bookservice.rest.dto.CreateBookRequest;
 import com.ivanfranchin.bookservice.service.BookService;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpStatus;
@@ -15,7 +16,6 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
 import java.util.List;
 
 @RequiredArgsConstructor

spring-cloud-vault-approle-cassandra/book-service/src/main/java/com/ivanfranchin/bookservice/rest/dto/CreateBookRequest.java

@@ -1,10 +1,9 @@
 package com.ivanfranchin.bookservice.rest.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-
 @Data
 public class CreateBookRequest {
 

spring-cloud-vault-approle-cassandra/book-service/src/main/resources/application.yml

@@ -1,13 +1,12 @@
 spring:
-  data:
-    cassandra:
-      keyspace-name: mycompany
-      contact-points: ${CASSANDRA_HOST:localhost}
-      local-datacenter: datacenter1
-      port: ${CASSANDRA_PORT:9042}
-      schema-action: CREATE_IF_NOT_EXISTS
-      request:
-        timeout: 10s
+  cassandra:
+    keyspace-name: mycompany
+    contact-points: ${CASSANDRA_HOST:localhost}
+    local-datacenter: datacenter1
+    port: ${CASSANDRA_PORT:9042}
+    schema-action: CREATE_IF_NOT_EXISTS
+    request:
+      timeout: 10s
   cloud:
     consul:
       host: ${CONSUL_HOST:localhost}

spring-cloud-vault-approle-mysql/student-service/pom.xml

@@ -14,7 +14,7 @@
     <description>Demo project for Spring Boot</description>
 
     <properties>
-        <spring-cloud.version>2021.0.5</spring-cloud.version>
+        <spring-cloud.version>2022.0.1</spring-cloud.version>
     </properties>
 
     <dependencies>
@@ -44,11 +44,10 @@
         </dependency>
 
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <scope>runtime</scope>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

spring-cloud-vault-approle-mysql/student-service/src/main/java/com/ivanfranchin/studentservice/config/SwaggerConfig.java

@@ -3,7 +3,7 @@
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
-import org.springdoc.core.GroupedOpenApi;
+import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-cloud-vault-approle-mysql/student-service/src/main/java/com/ivanfranchin/studentservice/config/VaultLeaseConfig.java

@@ -3,6 +3,7 @@
 import com.zaxxer.hikari.HikariConfigMXBean;
 import com.zaxxer.hikari.HikariDataSource;
 import com.zaxxer.hikari.HikariPoolMXBean;
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -13,8 +14,6 @@
 import org.springframework.vault.core.lease.event.SecretLeaseCreatedEvent;
 import org.springframework.vault.core.lease.event.SecretLeaseExpiredEvent;
 
-import javax.annotation.PostConstruct;
-
 @Slf4j
 @RequiredArgsConstructor
 @Configuration

spring-cloud-vault-approle-mysql/student-service/src/main/java/com/ivanfranchin/studentservice/model/Student.java

@@ -1,14 +1,13 @@
 package com.ivanfranchin.studentservice.model;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 @Data
 @Entity
 @Table(name = "students")

spring-cloud-vault-approle-mysql/student-service/src/main/java/com/ivanfranchin/studentservice/rest/StudentController.java

@@ -5,6 +5,7 @@
 import com.ivanfranchin.studentservice.rest.dto.CreateStudentRequest;
 import com.ivanfranchin.studentservice.rest.dto.StudentResponse;
 import com.ivanfranchin.studentservice.service.StudentService;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpStatus;
@@ -15,7 +16,6 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
 import java.util.List;
 
 @RequiredArgsConstructor

spring-cloud-vault-approle-mysql/student-service/src/main/java/com/ivanfranchin/studentservice/rest/dto/CreateStudentRequest.java

@@ -1,10 +1,9 @@
 package com.ivanfranchin.studentservice.rest.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import javax.validation.constraints.NotBlank;
-
 @Data
 public class CreateStudentRequest {
 

spring-vault-approle-multi-datasources-mysql/restaurant-service/pom.xml

@@ -14,7 +14,7 @@
     <description>Demo project for Spring Boot</description>
 
     <properties>
-        <spring-vault.version>2.3.2</spring-vault.version>
+        <spring-vault.version>3.0.0</spring-vault.version>
     </properties>
 
     <dependencies>
@@ -42,11 +42,10 @@
         </dependency>
 
         <dependency>
-            <groupId>mysql</groupId>
-            <artifactId>mysql-connector-java</artifactId>
+            <groupId>com.mysql</groupId>
+            <artifactId>mysql-connector-j</artifactId>
             <scope>runtime</scope>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

spring-vault-approle-multi-datasources-mysql/restaurant-service/src/main/java/com/ivanfranchin/restaurantservice/config/SwaggerConfig.java

@@ -3,7 +3,7 @@
 import io.swagger.v3.oas.models.Components;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
-import org.springdoc.core.GroupedOpenApi;
+import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

spring-vault-approle-multi-datasources-mysql/restaurant-service/src/main/java/com/ivanfranchin/restaurantservice/customer/config/CustomerDbConfig.java

@@ -2,6 +2,7 @@
 
 import com.ivanfranchin.restaurantservice.customer.model.Customer;
 import com.ivanfranchin.restaurantservice.customer.repository.CustomerRepository;
+import jakarta.persistence.EntityManagerFactory;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -18,7 +19,6 @@
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 import java.util.HashMap;
 import java.util.Map;
@@ -68,5 +68,4 @@ public PlatformTransactionManager transactionManager(
             @Qualifier("customerEntityManagerFactory") EntityManagerFactory entityManagerFactory) {
         return new JpaTransactionManager(entityManagerFactory);
     }
-
 }

spring-vault-approle-multi-datasources-mysql/restaurant-service/src/main/java/com/ivanfranchin/restaurantservice/customer/config/CustomerVaultLeaseConfig.java

@@ -3,6 +3,7 @@
 import com.zaxxer.hikari.HikariConfigMXBean;
 import com.zaxxer.hikari.HikariDataSource;
 import com.zaxxer.hikari.HikariPoolMXBean;
+import jakarta.annotation.PostConstruct;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -12,8 +13,6 @@
 import org.springframework.vault.core.lease.SecretLeaseContainer;
 import org.springframework.vault.core.lease.event.SecretLeaseCreatedEvent;
 
-import javax.annotation.PostConstruct;
-
 @Slf4j
 @RequiredArgsConstructor
 @Configuration

spring-vault-approle-multi-datasources-mysql/restaurant-service/src/main/java/com/ivanfranchin/restaurantservice/customer/model/Customer.java

@@ -1,14 +1,13 @@
 package com.ivanfranchin.restaurantservice.customer.model;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Data;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
 @Data
 @Entity
 @Table(name = "customers")

spring-vault-approle-multi-datasources-mysql/restaurant-service/src/main/java/com/ivanfranchin/restaurantservice/customer/rest/CustomerController.java

@@ -5,6 +5,7 @@
 import com.ivanfranchin.restaurantservice.customer.rest.dto.CreateCustomerRequest;
 import com.ivanfranchin.restaurantservice.customer.rest.dto.CustomerResponse;
 import com.ivanfranchin.restaurantservice.customer.service.CustomerService;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpStatus;
@@ -15,7 +16,6 @@
 import org.springframework.web.bind.annotation.ResponseStatus;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
 import java.util.List;
 
 @RequiredArgsConstructor

spring-vault-approle-multi-datasources-mysql/restaurant-service/src/main/java/com/ivanfranchin/restaurantservice/customer/rest/dto/CreateCustomerRequest.java

@@ -1,11 +1,10 @@
 package com.ivanfranchin.restaurantservice.customer.rest.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-
 @Data
 public class CreateCustomerRequest {
 

spring-vault-approle-multi-datasources-mysql/restaurant-service/src/main/java/com/ivanfranchin/restaurantservice/dish/config/DishDbConfig.java

@@ -2,6 +2,7 @@
 
 import com.ivanfranchin.restaurantservice.dish.model.Dish;
 import com.ivanfranchin.restaurantservice.dish.repository.DishRepository;
+import jakarta.persistence.EntityManagerFactory;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -17,7 +18,6 @@
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.annotation.EnableTransactionManagement;
 
-import javax.persistence.EntityManagerFactory;
 import javax.sql.DataSource;
 import java.util.HashMap;
 import java.util.Map;
@@ -64,5 +64,4 @@ public PlatformTransactionManager transactionManager(
             @Qualifier("dishEntityManagerFactory") EntityManagerFactory entityManagerFactory) {
         return new JpaTransactionManager(entityManagerFactory);
     }
-
 }