Skip to content

Commit acb28bd

Browse files
authoredFeb 20, 2024
JAVA-31341 Fix spring-jooq and spring-mybatis module (#15897)
1 parent c77c0de commit acb28bd

File tree

9 files changed

+26
-21
lines changed

9 files changed

+26
-21
lines changed
 

‎persistence-modules/spring-jooq/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
<lifecycle-mapping.version>1.0.0</lifecycle-mapping.version>
195195
<sql-maven-plugin.version>1.5</sql-maven-plugin.version>
196196
<properties-maven-plugin.version>1.0.0</properties-maven-plugin.version>
197-
<spring-boot.version>3.1.5</spring-boot.version>
197+
<h2.version>2.2.224</h2.version>
198198
</properties>
199199

200200
</project>

‎persistence-modules/spring-mybatis/pom.xml

-9
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@
1919
<dependency>
2020
<groupId>org.springframework</groupId>
2121
<artifactId>spring-context</artifactId>
22-
<version>${org.springframework.version}</version>
2322
</dependency>
2423
<dependency>
2524
<groupId>org.springframework</groupId>
2625
<artifactId>spring-beans</artifactId>
27-
<version>${org.springframework.version}</version>
2826
</dependency>
2927
<!-- SpringBoot -->
3028
<dependency>
@@ -36,12 +34,10 @@
3634
<dependency>
3735
<groupId>com.h2database</groupId>
3836
<artifactId>h2</artifactId>
39-
<version>${h2.version}</version>
4037
</dependency>
4138
<dependency>
4239
<groupId>org.springframework</groupId>
4340
<artifactId>spring-jdbc</artifactId>
44-
<version>${org.springframework.version}</version>
4541
</dependency>
4642
<dependency>
4743
<groupId>org.mybatis</groupId>
@@ -61,7 +57,6 @@
6157
<dependency>
6258
<groupId>org.springframework</groupId>
6359
<artifactId>spring-test</artifactId>
64-
<version>${org.springframework.version}</version>
6560
<scope>test</scope>
6661
</dependency>
6762
</dependencies>
@@ -77,14 +72,10 @@
7772
</build>
7873

7974
<properties>
80-
<!-- Spring -->
81-
<org.springframework.version>6.0.13</org.springframework.version>
82-
<!-- persistence -->
8375
<spring-mybatis.version>3.0.3</spring-mybatis.version>
8476
<mybatis.version>3.5.2</mybatis.version>
8577
<mybatis-spring-boot-starter.version>3.0.3</mybatis-spring-boot-starter.version>
8678
<spring-boot.repackage.skip>true</spring-boot.repackage.skip>
87-
<spring-boot.version>3.1.5</spring-boot.version>
8879
</properties>
8980

9081
</project>

‎spring-boot-modules/spring-boot-properties/pom.xml

+8-2
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,13 @@
104104
<useDefaultDelimiters>false</useDefaultDelimiters>
105105
</configuration>
106106
</plugin>
107+
<plugin>
108+
<groupId>org.apache.maven.plugins</groupId>
109+
<artifactId>maven-compiler-plugin</artifactId>
110+
<configuration>
111+
<parameters>true</parameters>
112+
</configuration>
113+
</plugin>
107114
</plugins>
108115
</build>
109116

@@ -142,12 +149,11 @@
142149
</profiles>
143150

144151
<properties>
145-
<spring-cloud.version>2022.0.4</spring-cloud.version>
152+
<spring-cloud.version>2023.0.0</spring-cloud.version>
146153
<commons-configuration.version>1.10</commons-configuration.version>
147154
<resource.delimiter>@</resource.delimiter>
148155
<!-- <start-class>com.baeldung.buildproperties.Application</start-class> -->
149156
<start-class>com.baeldung.yaml.MyApplication</start-class>
150-
<spring-boot.version>3.1.5</spring-boot.version>
151157
</properties>
152158

153159
</project>

‎spring-boot-modules/spring-boot-ssl-bundles/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353

5454
<properties>
5555
<apache.client5.version>5.0.3</apache.client5.version>
56-
<spring-boot.version>3.1.5</spring-boot.version>
5756
</properties>
5857

5958
</project>

‎spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureRestTemplateConfig.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public SecureRestTemplateConfig(SslBundles sslBundles) throws NoSuchSslBundleExc
2727
this.sslContext = sslBundle.createSslContext();
2828
}
2929

30-
@Bean
30+
@Bean(name="secureRestTemplate")
3131
public RestTemplate secureRestTemplate() {
3232
final SSLConnectionSocketFactory sslSocketFactory = SSLConnectionSocketFactoryBuilder.create().setSslContext(this.sslContext).build();
3333
final HttpClientConnectionManager cm = PoolingHttpClientConnectionManagerBuilder.create().setSSLSocketFactory(sslSocketFactory).build();

‎spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureServiceRestApi.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.baeldung.springbootsslbundles;
22

33
import org.springframework.beans.factory.annotation.Autowired;
4+
import org.springframework.beans.factory.annotation.Qualifier;
45
import org.springframework.http.HttpMethod;
56
import org.springframework.http.ResponseEntity;
67
import org.springframework.stereotype.Service;
@@ -11,7 +12,7 @@ public class SecureServiceRestApi {
1112
private final RestTemplate restTemplate;
1213

1314
@Autowired
14-
public SecureServiceRestApi(RestTemplate restTemplate) {
15+
public SecureServiceRestApi(@Qualifier("secureRestTemplate") RestTemplate restTemplate) {
1516
this.restTemplate = restTemplate;
1617
}
1718

‎spring-jinq/pom.xml

-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<dependency>
3939
<groupId>org.hibernate.orm</groupId>
4040
<artifactId>hibernate-core</artifactId>
41-
<version>${hibernate-core.version}</version>
4241
</dependency>
4342
<!-- Testing -->
4443
<dependency>
@@ -65,7 +64,6 @@
6564
<properties>
6665
<jinq.version>2.0.1</jinq.version>
6766
<hibernate-core.version>6.4.2.Final</hibernate-core.version>
68-
<spring-boot.version>3.1.5</spring-boot.version>
6967
</properties>
7068

7169
</project>

‎spring-reactive-modules/spring-reactive-exceptions/pom.xml

+7-4
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,14 @@
5151
<layout>JAR</layout>
5252
</configuration>
5353
</plugin>
54+
<plugin>
55+
<groupId>org.apache.maven.plugins</groupId>
56+
<artifactId>maven-compiler-plugin</artifactId>
57+
<configuration>
58+
<parameters>true</parameters>
59+
</configuration>
60+
</plugin>
5461
</plugins>
5562
</build>
5663

57-
<properties>
58-
<spring-boot.version>3.1.5</spring-boot.version>
59-
</properties>
60-
6164
</project>

‎spring-web-modules/spring-rest-http/pom.xml

+7
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,13 @@
7171
<skip>true</skip>
7272
</configuration>
7373
</plugin>
74+
<plugin>
75+
<groupId>org.apache.maven.plugins</groupId>
76+
<artifactId>maven-compiler-plugin</artifactId>
77+
<configuration>
78+
<parameters>true</parameters>
79+
</configuration>
80+
</plugin>
7481
</plugins>
7582
</build>
7683

0 commit comments

Comments
 (0)
Please sign in to comment.