iSharkFly-Docs
/
java-tutorials
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JAVA-31341 Fix spring-jooq and spring-mybatis module (#15897)

This commit is contained in:
anuragkumawat 2024-02-20 19:58:46 +05:30 committed by GitHub
parent c77c0deea5
commit acb28bdec3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
persistence-modules/spring-jooq/pom.xml
View File

@ -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>

9
persistence-modules/spring-mybatis/pom.xml
View File

@ -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>

10
spring-boot-modules/spring-boot-properties/pom.xml
View File

@ -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>

1
spring-boot-modules/spring-boot-ssl-bundles/pom.xml
View File

@ -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>

2
spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureRestTemplateConfig.java
View File

@ -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();

3
spring-boot-modules/spring-boot-ssl-bundles/src/main/java/com/baeldung/springbootsslbundles/SecureServiceRestApi.java
View File

@ -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;
}

2
spring-jinq/pom.xml
View File

@ -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>

11
spring-reactive-modules/spring-reactive-exceptions/pom.xml
View File

@ -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>

7
spring-web-modules/spring-rest-http/pom.xml
View File

@ -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>