From acb28bdec3102f39cb94133d2740cef81df19580 Mon Sep 17 00:00:00 2001
From: anuragkumawat <anuragkumawat7@gmail.com>
Date: Tue, 20 Feb 2024 19:58:46 +0530
Subject: [PATCH] JAVA-31341 Fix spring-jooq and spring-mybatis module (#15897)

---
 persistence-modules/spring-jooq/pom.xml               |  2 +-
 persistence-modules/spring-mybatis/pom.xml            |  9 ---------
 spring-boot-modules/spring-boot-properties/pom.xml    | 10 ++++++++--
 spring-boot-modules/spring-boot-ssl-bundles/pom.xml   |  1 -
 .../SecureRestTemplateConfig.java                     |  2 +-
 .../springbootsslbundles/SecureServiceRestApi.java    |  3 ++-
 spring-jinq/pom.xml                                   |  2 --
 .../spring-reactive-exceptions/pom.xml                | 11 +++++++----
 spring-web-modules/spring-rest-http/pom.xml           |  7 +++++++
 9 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/persistence-modules/spring-jooq/pom.xml b/persistence-modules/spring-jooq/pom.xml
index 1387635afe..230397da9d 100644
--- a/persistence-modules/spring-jooq/pom.xml
+++ b/persistence-modules/spring-jooq/pom.xml
@@ -194,7 +194,7 @@
         <lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
         <sql-maven-plugin.version>1.5</sql-maven-plugin.version>
         <properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
-        <spring-boot.version>3.1.5</spring-boot.version>
+        <h2.version>2.2.224</h2.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-mybatis/pom.xml b/persistence-modules/spring-mybatis/pom.xml
index d179881710..f164f4b6f9 100644
--- a/persistence-modules/spring-mybatis/pom.xml
+++ b/persistence-modules/spring-mybatis/pom.xml
@@ -19,12 +19,10 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${org.springframework.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-beans</artifactId>
-            <version>${org.springframework.version}</version>
         </dependency>
         <!-- SpringBoot -->
         <dependency>
@@ -36,12 +34,10 @@
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
-            <version>${h2.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
-            <version>${org.springframework.version}</version>
         </dependency>
         <dependency>
             <groupId>org.mybatis</groupId>
@@ -61,7 +57,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${org.springframework.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -77,14 +72,10 @@
     </build>
 
     <properties>
-        <!-- Spring -->
-        <org.springframework.version>6.0.13</org.springframework.version>
-        <!-- persistence -->
         <spring-mybatis.version>3.0.3</spring-mybatis.version>
         <mybatis.version>3.5.2</mybatis.version>
         <mybatis-spring-boot-starter.version>3.0.3</mybatis-spring-boot-starter.version>
         <spring-boot.repackage.skip>true</spring-boot.repackage.skip>
-        <spring-boot.version>3.1.5</spring-boot.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-properties/pom.xml b/spring-boot-modules/spring-boot-properties/pom.xml
index 7614941f2d..fa3fc954b3 100644
--- a/spring-boot-modules/spring-boot-properties/pom.xml
+++ b/spring-boot-modules/spring-boot-properties/pom.xml
@@ -104,6 +104,13 @@
                     <useDefaultDelimiters>false</useDefaultDelimiters>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <parameters>true</parameters>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -142,12 +149,11 @@
     </profiles>
 
     <properties>
-        <spring-cloud.version>2022.0.4</spring-cloud.version>
+        <spring-cloud.version>2023.0.0</spring-cloud.version>
         <commons-configuration.version>1.10</commons-configuration.version>
         <resource.delimiter>@</resource.delimiter>
         <!-- <start-class>com.baeldung.buildproperties.Application</start-class> -->
         <start-class>com.baeldung.yaml.MyApplication</start-class>
-        <spring-boot.version>3.1.5</spring-boot.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-ssl-bundles/pom.xml b/spring-boot-modules/spring-boot-ssl-bundles/pom.xml
index 8edbd9c79e..1f4e58f21f 100644
--- a/spring-boot-modules/spring-boot-ssl-bundles/pom.xml
+++ b/spring-boot-modules/spring-boot-ssl-bundles/pom.xml
@@ -53,7 +53,6 @@
 
     <properties>
         <apache.client5.version>5.0.3</apache.client5.version>
-        <spring-boot.version>3.1.5</spring-boot.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureRestTemplateConfig.java b/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureRestTemplateConfig.java
index 48eda219dd..cae3b24d8c 100644
--- a/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureRestTemplateConfig.java
+++ b/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureRestTemplateConfig.java
@@ -27,7 +27,7 @@ public class SecureRestTemplateConfig {
         this.sslContext = sslBundle.createSslContext();
     }
 
-    @Bean
+    @Bean(name="secureRestTemplate")
     public RestTemplate secureRestTemplate() {
         final SSLConnectionSocketFactory sslSocketFactory = SSLConnectionSocketFactoryBuilder.create().setSslContext(this.sslContext).build();
         final HttpClientConnectionManager cm = PoolingHttpClientConnectionManagerBuilder.create().setSSLSocketFactory(sslSocketFactory).build();
diff --git a/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureServiceRestApi.java b/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureServiceRestApi.java
index 3ed919b957..d7b87c4c5a 100644
--- a/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureServiceRestApi.java
+++ b/spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureServiceRestApi.java
@@ -1,6 +1,7 @@
 package com.baeldung.springbootsslbundles;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -11,7 +12,7 @@ public class SecureServiceRestApi {
     private final RestTemplate restTemplate;
 
     @Autowired
-    public SecureServiceRestApi(RestTemplate restTemplate) {
+    public SecureServiceRestApi(@Qualifier("secureRestTemplate") RestTemplate restTemplate) {
         this.restTemplate = restTemplate;
     }
 
diff --git a/spring-jinq/pom.xml b/spring-jinq/pom.xml
index 4ba2028bc6..4695950153 100644
--- a/spring-jinq/pom.xml
+++ b/spring-jinq/pom.xml
@@ -38,7 +38,6 @@
         <dependency>
             <groupId>org.hibernate.orm</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>${hibernate-core.version}</version>
         </dependency>
         <!-- Testing -->
         <dependency>
@@ -65,7 +64,6 @@
     <properties>
         <jinq.version>2.0.1</jinq.version>
         <hibernate-core.version>6.4.2.Final</hibernate-core.version>
-        <spring-boot.version>3.1.5</spring-boot.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/spring-reactive-modules/spring-reactive-exceptions/pom.xml b/spring-reactive-modules/spring-reactive-exceptions/pom.xml
index e9208c8b20..1f24f9cd1c 100644
--- a/spring-reactive-modules/spring-reactive-exceptions/pom.xml
+++ b/spring-reactive-modules/spring-reactive-exceptions/pom.xml
@@ -51,11 +51,14 @@
                     <layout>JAR</layout>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <parameters>true</parameters>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
-    <properties>
-        <spring-boot.version>3.1.5</spring-boot.version>
-    </properties>
-
 </project>
diff --git a/spring-web-modules/spring-rest-http/pom.xml b/spring-web-modules/spring-rest-http/pom.xml
index 8d3ea82c44..f93e4274e9 100644
--- a/spring-web-modules/spring-rest-http/pom.xml
+++ b/spring-web-modules/spring-rest-http/pom.xml
@@ -71,6 +71,13 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <parameters>true</parameters>
+                </configuration>
+            </plugin>
         </plugins>
     </build>