Upgrade Spring Boot from 2.7.x to 3.5.7 and Spring Cloud to 2025.0.0

API-Gateway/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.14</version>
+        <version>3.5.7</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>org.training</groupId>
@@ -15,7 +15,7 @@
     <description>API Gateway</description>
     <properties>
         <java.version>17</java.version>
-        <spring-cloud.version>2021.0.8</spring-cloud.version>
+        <spring-cloud.version>2025.0.0</spring-cloud.version>
         <sonar.organization>samfert-codeium</sonar.organization>
     </properties>
     <dependencies>

API-Gateway/src/main/java/org/training/api/gateway/ApiGatewayApplication.java

@@ -2,10 +2,8 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
 @SpringBootApplication
-@EnableEurekaClient
 public class ApiGatewayApplication {
 
     public static void main(String[] args) {

API-Gateway/src/main/java/org/training/api/gateway/config/SecurityConfig.java

@@ -2,6 +2,7 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity;
 import org.springframework.security.config.web.server.ServerHttpSecurity;
 import org.springframework.security.web.server.SecurityWebFilterChain;
@@ -13,17 +14,13 @@ public class SecurityConfig {
     @Bean
     public SecurityWebFilterChain securityWebFilterChain(ServerHttpSecurity http) {
         http
-                .authorizeExchange()
-                //ALLOWING REGISTER API FOR DIRECT ACCESS
-                .pathMatchers("/api/users/register").permitAll()
-                //ALL OTHER APIS ARE AUTHENTICATED
-                .anyExchange().authenticated()
-                .and()
-                .csrf().disable()
-                .oauth2Login()
-                .and()
-                .oauth2ResourceServer()
-                .jwt();
+                .authorizeExchange(exchanges -> exchanges
+                        .pathMatchers("/api/users/register").permitAll()
+                        .anyExchange().authenticated()
+                )
+                .csrf(csrf -> csrf.disable())
+                .oauth2Login(Customizer.withDefaults())
+                .oauth2ResourceServer(oauth2 -> oauth2.jwt(Customizer.withDefaults()));
         return http.build();
     }
-}
+}

Account-Service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.15</version>
+        <version>3.5.7</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>org.training</groupId>
@@ -15,7 +15,7 @@
     <description>Account Service</description>
     <properties>
         <java.version>17</java.version>
-        <spring-cloud.version>2021.0.8</spring-cloud.version>
+        <spring-cloud.version>2025.0.0</spring-cloud.version>
         <sonar.organization>samfert-codeium</sonar.organization>
     </properties>
     <dependencies>

Account-Service/src/main/java/org/training/account/service/model/entity/Account.java

@@ -8,7 +8,7 @@
 import org.training.account.service.model.AccountStatus;
 import org.training.account.service.model.AccountType;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 

Fund-Transfer/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.14</version>
+        <version>3.5.7</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>org.training</groupId>
@@ -15,7 +15,7 @@
     <description>Fund Transfer</description>
     <properties>
         <java.version>17</java.version>
-        <spring-cloud.version>2021.0.8</spring-cloud.version>
+        <spring-cloud.version>2025.0.0</spring-cloud.version>
         <sonar.organization>samfert-codeium</sonar.organization>
     </properties>
     <dependencies>

Fund-Transfer/src/main/java/org/training/fundtransfer/model/entity/FundTransfer.java

@@ -8,7 +8,7 @@
 import org.training.fundtransfer.model.TransactionStatus;
 import org.training.fundtransfer.model.TransferType;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
@@ -39,4 +39,4 @@ public class FundTransfer {
 
     @CreationTimestamp
     private LocalDateTime transferredOn;
-}
+}

Sequence-Generator/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.15</version>
+        <version>3.5.7</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>org.training</groupId>
@@ -15,7 +15,7 @@
     <description>Sequence Generator</description>
     <properties>
         <java.version>17</java.version>
-        <spring-cloud.version>2021.0.8</spring-cloud.version>
+        <spring-cloud.version>2025.0.0</spring-cloud.version>
         <sonar.organization>samfert-codeium</sonar.organization>
     </properties>
     <dependencies>

Sequence-Generator/src/main/java/org/training/sequence/generator/model/entity/Sequence.java

@@ -5,10 +5,10 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 @Data

Service-Registry/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.14</version>
+        <version>3.5.7</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>org.training</groupId>
@@ -15,7 +15,7 @@
     <description>Service Registry</description>
     <properties>
         <java.version>17</java.version>
-        <spring-cloud.version>2021.0.8</spring-cloud.version>
+        <spring-cloud.version>2025.0.0</spring-cloud.version>
         <sonar.organization>samfert-codeium</sonar.organization>
     </properties>
     <dependencies>

Transaction-Service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.15</version>
+        <version>3.5.7</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>org.training</groupId>
@@ -15,7 +15,7 @@
     <description>Transaction Service</description>
     <properties>
         <java.version>17</java.version>
-        <spring-cloud.version>2021.0.8</spring-cloud.version>
+        <spring-cloud.version>2025.0.0</spring-cloud.version>
         <sonar.organization>samfert-codeium</sonar.organization>
     </properties>
     <dependencies>

Transaction-Service/src/main/java/org/training/transactions/TransactionServiceApplication.java

@@ -2,12 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication
 @EnableFeignClients
-@EnableEurekaClient
 public class TransactionServiceApplication {
 
     public static void main(String[] args) {

Transaction-Service/src/main/java/org/training/transactions/model/entity/Transaction.java

@@ -8,7 +8,7 @@
 import org.training.transactions.model.TransactionStatus;
 import org.training.transactions.model.TransactionType;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 

User-Service/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.14</version>
+        <version>3.5.7</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>org.training</groupId>
@@ -15,7 +15,7 @@
     <description>User Service</description>
     <properties>
         <java.version>17</java.version>
-        <spring-cloud.version>2021.0.8</spring-cloud.version>
+        <spring-cloud.version>2025.0.0</spring-cloud.version>
         <sonar.organization>samfert-codeium</sonar.organization>
     </properties>
     <dependencies>
@@ -38,12 +38,6 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.ws.rs</groupId>
-                    <artifactId>jsr311-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

User-Service/src/main/java/org/training/user/service/UserServiceApplication.java

@@ -2,12 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication
 @EnableFeignClients
-@EnableEurekaClient
 public class UserServiceApplication {
 
     public static void main(String[] args) {

User-Service/src/main/java/org/training/user/service/model/entity/User.java

@@ -7,7 +7,7 @@
 import org.hibernate.annotations.CreationTimestamp;
 import org.training.user.service.model.Status;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.time.LocalDate;
 
 @Entity
@@ -38,4 +38,4 @@ public class User {
     @OneToOne(cascade = CascadeType.ALL)
     @JoinColumn(name = "user_profile_id", referencedColumnName = "userProfileId")
     private UserProfile userProfile;
-}
+}

User-Service/src/main/java/org/training/user/service/model/entity/UserProfile.java

@@ -5,10 +5,10 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 @Data

User-Service/src/main/java/org/training/user/service/service/implementation/UserServiceImpl.java

@@ -27,7 +27,7 @@
 import org.training.user.service.service.UserService;
 import org.training.user.service.utils.FieldChecker;
 
-import javax.transaction.Transactional;
+import jakarta.transaction.Transactional;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;