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

Merge pull request #11577 from kwoyke/JAVA-8794

Browse Source 
JAVA-8794: Upgrade Spring Boot to 2.6.1 in the parent-boot-2
This commit is contained in:
kwoyke 2021-12-15 12:15:13 +01:00 committed by GitHub
commit 411cbe613b
34 changed files with 88 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parent-boot-2/pom.xml
View File

@ -88,7 +88,7 @@
<rest-assured.version>3.3.0</rest-assured.version>
<!-- plugins -->
<thin.version>1.0.22.RELEASE</thin.version>
<spring-boot.version>2.5.4</spring-boot.version>
<spring-boot.version>2.6.1</spring-boot.version>
<aspectjweaver.version>1.9.1</aspectjweaver.version>
<!-- this property can be removed once we update Mockito version in the main pom.xml -->
<mockito.version>3.4.0</mockito.version>

2
persistence-modules/spring-data-mongodb-reactive/pom.xml
View File

@ -123,7 +123,7 @@
</build>
<properties>
<spring-tx.version>5.2.2.RELEASE</spring-tx.version>
<spring-tx.version>5.3.13</spring-tx.version>
<httpclient.version>4.5.2</httpclient.version>
<reactor-core.version>3.3.1.RELEASE</reactor-core.version>
</properties>

1
persistence-modules/spring-data-mongodb-reactive/src/main/resources/application.properties Normal file
View File

@ -0,0 +1 @@
spring.mongodb.embedded.version=3.5.5

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

@ -78,11 +78,11 @@
<properties>
<!-- Spring -->
<org.springframework.version>5.3.8</org.springframework.version>
<org.springframework.version>5.3.13</org.springframework.version>
<!-- persistence -->
<spring-mybatis.version>2.0.2</spring-mybatis.version>
<spring-mybatis.version>2.0.6</spring-mybatis.version>
<mybatis.version>3.5.2</mybatis.version>
<mybatis-spring-boot-starter.version>2.1.0</mybatis-spring-boot-starter.version>
<mybatis-spring-boot-starter.version>2.2.0</mybatis-spring-boot-starter.version>
<h2.version>1.4.197</h2.version>
</properties>

2
spring-boot-modules/spring-boot-environment/pom.xml
View File

@ -140,7 +140,7 @@
<guava.version>18.0</guava.version>
<subethasmtp.version>3.1.7</subethasmtp.version>
<httpclient.version>4.5.8</httpclient.version>
<spring.cloud-version>2020.0.0</spring.cloud-version>
<spring.cloud-version>2021.0.0</spring.cloud-version>
</properties>
</project>

3
spring-boot-modules/spring-boot-mvc/src/main/resources/application.properties
View File

@ -1 +1,2 @@
spring.thymeleaf.view-names=thymeleaf/*
spring.thymeleaf.view-names=thymeleaf/*
spring.mvc.pathmatch.matching-strategy=ant_path_matcher

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

@ -122,7 +122,7 @@
</profiles>
<properties>
<spring-cloud.version>2020.0.3</spring-cloud.version>
<spring-cloud.version>2021.0.0</spring-cloud.version>
<commons-configuration.version>1.10</commons-configuration.version>
<guava.version>20.0</guava.version>
<resource.delimiter>@</resource.delimiter>

4
spring-boot-modules/spring-boot-springdoc/pom.xml
View File

@ -40,7 +40,6 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId>
<version>${hibernate.version}</version>
</dependency>
<!-- SpringDoc -->
<dependency>
@ -207,10 +206,9 @@
</profiles>
<properties>
<hibernate.version>5.2.10.Final</hibernate.version>
<springdoc.version>1.5.2</springdoc.version>
<asciidoctor-plugin.version>1.5.6</asciidoctor-plugin.version>
<kotlin.version>1.4.0</kotlin.version>
<kotlin.version>1.6.0</kotlin.version>
<snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
</properties>

4
spring-boot-modules/spring-boot-springdoc/src/main/resources/application.properties
View File

@ -11,4 +11,6 @@ spring.datasource.url=jdbc:h2:mem:springdoc
## for com.baeldung.restdocopenapi ##
springdoc.version=@springdoc.version@
spring.jpa.hibernate.ddl-auto=none
######################################
######################################
spring.mvc.pathmatch.matching-strategy=ant_path_matcher

2
spring-cloud-bus/pom.xml
View File

@ -34,7 +34,7 @@
</dependencyManagement>
<properties>
<spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
<spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
</properties>
</project>

2
spring-cloud/pom.xml
View File

@ -79,7 +79,7 @@
</dependencyManagement>
<properties>
<spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
<spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
<spring-cloud-starter-config.version>2.2.3.RELEASE</spring-cloud-starter-config.version>
<spring-cloud-config-server.version>2.2.3.RELEASE</spring-cloud-config-server.version>
<spring-cloud-starter-eureka.version>1.4.7.RELEASE</spring-cloud-starter-eureka.version>

2
spring-cloud/spring-cloud-config/pom.xml
View File

@ -34,7 +34,7 @@
</dependencyManagement>
<properties>
<spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
<spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
</properties>
</project>

2
spring-cloud/spring-cloud-kubernetes/pom.xml
View File

@ -38,7 +38,7 @@
</modules>
<properties>
<spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
<spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
</properties>
</project>

2
spring-cloud/spring-cloud-ribbon-client/pom.xml
View File

@ -47,7 +47,7 @@
</dependencies>
<properties>
<spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
<spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
</properties>
</project>

3
spring-cloud/spring-cloud-ribbon-client/src/main/resources/application.yml
View File

@ -2,6 +2,9 @@ spring:
application:
name: spring-cloud-ribbon
main:
allow-circular-references: true
server:
port: 8888

2
spring-cloud/spring-cloud-security/pom.xml
View File

@ -34,7 +34,7 @@
</modules>
<properties>
<spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
<spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
</properties>
</project>

4
spring-cloud/spring-cloud-task/pom.xml
View File

@ -48,8 +48,8 @@
</dependencyManagement>
<properties>
<spring-cloud-dependencies.version>2020.0.3</spring-cloud-dependencies.version>
<spring-cloud-task.version>2.3.3</spring-cloud-task.version>
<spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
<spring-cloud-task.version>2.4.0</spring-cloud-task.version>
</properties>
</project>

4
spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/java/com/baeldung/SpringContextTest.java
View File

@ -3,7 +3,7 @@ package com.baeldung;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.test.context.ConfigFileApplicationContextInitializer;
import org.springframework.boot.test.context.ConfigDataApplicationContextInitializer;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
@ -12,7 +12,7 @@ import com.baeldung.task.TaskDemo;
@RunWith(SpringJUnit4ClassRunner.class)
@SpringBootApplication
@ContextConfiguration(classes = { JobConfiguration.class, TaskDemo.class }, initializers = { ConfigFileApplicationContextInitializer.class })
@ContextConfiguration(classes = { JobConfiguration.class, TaskDemo.class }, initializers = { ConfigDataApplicationContextInitializer.class })
public class SpringContextTest {
@Test

4
spring-cloud/spring-cloud-zookeeper/pom.xml
View File

@ -18,8 +18,4 @@
<module>HelloWorld</module>
</modules>
<properties>
<springframework.version>5.2.7.RELEASE</springframework.version>
</properties>
</project>

4
spring-cloud/spring-cloud-zuul/pom.xml
View File

@ -35,7 +35,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>${spring-cloud.version}</version>
<version>${spring-cloud-dependencies.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@ -81,7 +81,7 @@
</build>
<properties>
<spring-cloud.version>2020.0.3</spring-cloud.version>
<spring-cloud-dependencies.version>2021.0.0</spring-cloud-dependencies.version>
<spring-cloud-netflix-zuul.version>2.2.7.RELEASE</spring-cloud-netflix-zuul.version>
</properties>

1
spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml
View File

@ -42,7 +42,6 @@
<properties>
<rate.limit.version>2.2.0.RELEASE</rate.limit.version>
<spring-boot.version>2.4.7</spring-boot.version>
</properties>
</project>

2
spring-jenkins-pipeline/src/test/resources/application.properties
View File

@ -1,2 +1,4 @@
#To use a randomly allocated free port during tests to avoid port conflict across tests
spring.data.mongodb.port=0
spring.mongodb.embedded.version=3.5.5

1
spring-kafka/pom.xml
View File

@ -70,6 +70,7 @@
<spring-kafka.version>2.7.8</spring-kafka.version>
<kafka.streams.version>2.7.1</kafka.streams.version>
<testcontainers-kafka.version>1.15.3</testcontainers-kafka.version>
<spring-boot.version>2.5.4</spring-boot.version>
</properties>
</project>

4
spring-quartz/pom.xml
View File

@ -54,8 +54,8 @@
</build>
<properties>
<quartz.version>2.3.0</quartz.version>
<c3p0.version>0.9.5.2</c3p0.version>
<quartz.version>2.3.2</quartz.version>
<c3p0.version>0.9.5.5</c3p0.version>
</properties>
</project>

2
spring-quartz/src/main/resources/application.properties
View File

@ -2,7 +2,7 @@ using.spring.schedulerFactory=true
spring.quartz.job-store-type=jdbc
# Always create the Quartz database on startup
spring.quartz.jdbc.initialize-schema=always
spring.quartz.jdbc.initialize-schema=never
spring.datasource.jdbc-url=jdbc:h2:mem:spring-quartz;DB_CLOSE_ON_EXIT=FALSE
spring.datasource.driverClassName=org.h2.Driver

1
spring-quartz/src/main/resources/quartz.properties
View File

@ -20,3 +20,4 @@ org.quartz.dataSource.quartzDataSource.URL=jdbc:h2:mem:spring-quartz;INIT=RUNSCR
org.quartz.dataSource.quartzDataSource.driver=org.h2.Driver
org.quartz.dataSource.quartzDataSource.user=sa
org.quartz.dataSource.quartzDataSource.password=
org.quartz.jdbc.initialize-schema=never

15
spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/PasswordEncoderConfig.java Normal file
View File

@ -0,0 +1,15 @@
package com.baeldung.app.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
@Configuration
public class PasswordEncoderConfig {
@Bean
public PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
}

14
spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/WebSecurityConfig.java
View File

@ -22,15 +22,11 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
}
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
public void configureGlobal(AuthenticationManagerBuilder auth, PasswordEncoder passwordEncoder) throws Exception {
auth.inMemoryAuthentication()
.withUser("jim").password(passwordEncoder().encode("jim")).roles("USER", "ACTUATOR")
.and().withUser("pam").password(passwordEncoder().encode("pam")).roles("USER")
.and().withUser("michael").password(passwordEncoder().encode("michael")).roles("MANAGER");
}
@Bean
public PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
.withUser("jim").password(passwordEncoder.encode("jim")).roles("USER", "ACTUATOR")
.and().withUser("pam").password(passwordEncoder.encode("pam")).roles("USER")
.and().withUser("michael").password(passwordEncoder.encode("michael")).roles("MANAGER");
}
}

15
spring-security-modules/spring-security-web-boot-2/src/main/java/com/baeldung/jdbcauthentication/h2/config/PasswordEncoderConfig.java Normal file
View File

@ -0,0 +1,15 @@
package com.baeldung.jdbcauthentication.h2.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
@Configuration
public class PasswordEncoderConfig {
@Bean
public PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
}

28
spring-security-modules/spring-security-web-boot-2/src/main/java/com/baeldung/jdbcauthentication/h2/config/SecurityConfiguration.java
View File

@ -1,19 +1,18 @@
package com.baeldung.jdbcauthentication.h2.config;
import javax.sql.DataSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
import org.springframework.security.core.userdetails.User;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.crypto.password.PasswordEncoder;
import javax.sql.DataSource;
@Configuration
public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
@Override
protected void configure(HttpSecurity httpSecurity) throws Exception {
httpSecurity.authorizeRequests()
@ -32,20 +31,15 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
}
@Autowired
private DataSource dataSource;
@Autowired
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
public void configureGlobal(AuthenticationManagerBuilder auth,
DataSource dataSource,
PasswordEncoder passwordEncoder) throws Exception {
auth.jdbcAuthentication()
.dataSource(dataSource)
.withDefaultSchema()
.withUser(User.withUsername("user")
.password(passwordEncoder().encode("pass"))
.roles("USER"));
.dataSource(dataSource)
.withDefaultSchema()
.withUser(User.withUsername("user")
.password(passwordEncoder.encode("pass"))
.roles("USER"));
}
@Bean
public PasswordEncoder passwordEncoder() {
return new BCryptPasswordEncoder();
}
}

2
spring-security-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties
View File

@ -1,2 +1,4 @@
#To use a randomly allocated free port during tests to avoid port conflict across tests
spring.data.mongodb.port=0
spring.mongodb.embedded.version=3.5.5

2
spring-web-modules/spring-mvc-basics-5/src/main/resources/application.properties
View File

@ -1 +1,3 @@
server.servlet.context-path=/spring-mvc-basics
spring.mvc.pathmatch.matching-strategy=ant-path-matcher

3
spring-web-modules/spring-mvc-basics/src/main/resources/application.properties
View File

@ -1,7 +1,8 @@
server.servlet.context-path=/spring-mvc-basics
### Content Negotiation (already defined programatically)
spring.mvc.pathmatch.use-suffix-pattern=true
#spring.mvc.contentnegotiation.favor-path-extension=true
#spring.mvc.contentnegotiation.favor-parameter=true
#spring.mvc.contentnegotiation.parameter-name=mediaType
spring.mvc.pathmatch.use-suffix-pattern=true
spring.mvc.pathmatch.matching-strategy=ant-path-matcher

5
spring-web-modules/spring-resttemplate/pom.xml
View File

@ -108,11 +108,6 @@
<version>${com.squareup.okhttp3.version}</version>
</dependency>
<!-- test scoped -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>