diff --git a/parent-boot-2/pom.xml b/parent-boot-2/pom.xml
index 42081fa115..72aea5e81c 100644
--- a/parent-boot-2/pom.xml
+++ b/parent-boot-2/pom.xml
@@ -88,7 +88,7 @@
3.3.0
1.0.22.RELEASE
- 2.5.4
+ 2.6.1
1.9.1
3.4.0
diff --git a/persistence-modules/spring-data-mongodb-reactive/pom.xml b/persistence-modules/spring-data-mongodb-reactive/pom.xml
index 2220418ac3..e7ecc49c2d 100644
--- a/persistence-modules/spring-data-mongodb-reactive/pom.xml
+++ b/persistence-modules/spring-data-mongodb-reactive/pom.xml
@@ -123,7 +123,7 @@
- 5.2.2.RELEASE
+ 5.3.13
4.5.2
3.3.1.RELEASE
diff --git a/persistence-modules/spring-data-mongodb-reactive/src/main/resources/application.properties b/persistence-modules/spring-data-mongodb-reactive/src/main/resources/application.properties
new file mode 100644
index 0000000000..ac8c1cf2d2
--- /dev/null
+++ b/persistence-modules/spring-data-mongodb-reactive/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.mongodb.embedded.version=3.5.5
\ No newline at end of file
diff --git a/persistence-modules/spring-mybatis/pom.xml b/persistence-modules/spring-mybatis/pom.xml
index 4eda66e1a9..eb0ebd723d 100644
--- a/persistence-modules/spring-mybatis/pom.xml
+++ b/persistence-modules/spring-mybatis/pom.xml
@@ -78,11 +78,11 @@
- 5.3.8
+ 5.3.13
- 2.0.2
+ 2.0.6
3.5.2
- 2.1.0
+ 2.2.0
1.4.197
diff --git a/spring-boot-modules/spring-boot-environment/pom.xml b/spring-boot-modules/spring-boot-environment/pom.xml
index 2cda396a9b..d63b291ea4 100644
--- a/spring-boot-modules/spring-boot-environment/pom.xml
+++ b/spring-boot-modules/spring-boot-environment/pom.xml
@@ -140,7 +140,7 @@
18.0
3.1.7
4.5.8
- 2020.0.0
+ 2021.0.0
\ No newline at end of file
diff --git a/spring-boot-modules/spring-boot-mvc/src/main/resources/application.properties b/spring-boot-modules/spring-boot-mvc/src/main/resources/application.properties
index 7f399bb11d..a24a95c8e7 100644
--- a/spring-boot-modules/spring-boot-mvc/src/main/resources/application.properties
+++ b/spring-boot-modules/spring-boot-mvc/src/main/resources/application.properties
@@ -1 +1,2 @@
-spring.thymeleaf.view-names=thymeleaf/*
\ No newline at end of file
+spring.thymeleaf.view-names=thymeleaf/*
+spring.mvc.pathmatch.matching-strategy=ant_path_matcher
\ 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 8cbaccdac5..3c7e13036e 100644
--- a/spring-boot-modules/spring-boot-properties/pom.xml
+++ b/spring-boot-modules/spring-boot-properties/pom.xml
@@ -122,7 +122,7 @@
- 2020.0.3
+ 2021.0.0
1.10
20.0
@
diff --git a/spring-boot-modules/spring-boot-springdoc/pom.xml b/spring-boot-modules/spring-boot-springdoc/pom.xml
index 10bd9a7534..b766aac3d4 100644
--- a/spring-boot-modules/spring-boot-springdoc/pom.xml
+++ b/spring-boot-modules/spring-boot-springdoc/pom.xml
@@ -40,7 +40,6 @@
org.hibernate
hibernate-core
- ${hibernate.version}
@@ -207,10 +206,9 @@
- 5.2.10.Final
1.5.2
1.5.6
- 1.4.0
+ 1.6.0
${project.build.directory}/generated-snippets
diff --git a/spring-boot-modules/spring-boot-springdoc/src/main/resources/application.properties b/spring-boot-modules/spring-boot-springdoc/src/main/resources/application.properties
index 0eecfbb1c4..9e83617bad 100644
--- a/spring-boot-modules/spring-boot-springdoc/src/main/resources/application.properties
+++ b/spring-boot-modules/spring-boot-springdoc/src/main/resources/application.properties
@@ -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
-######################################
\ No newline at end of file
+######################################
+
+spring.mvc.pathmatch.matching-strategy=ant_path_matcher
\ No newline at end of file
diff --git a/spring-cloud-bus/pom.xml b/spring-cloud-bus/pom.xml
index 88bb766047..2eab7d52a9 100644
--- a/spring-cloud-bus/pom.xml
+++ b/spring-cloud-bus/pom.xml
@@ -34,7 +34,7 @@
- 2020.0.3
+ 2021.0.0
\ No newline at end of file
diff --git a/spring-cloud/pom.xml b/spring-cloud/pom.xml
index 65b623febd..1b6b18cd6b 100644
--- a/spring-cloud/pom.xml
+++ b/spring-cloud/pom.xml
@@ -79,7 +79,7 @@
- 2020.0.3
+ 2021.0.0
2.2.3.RELEASE
2.2.3.RELEASE
1.4.7.RELEASE
diff --git a/spring-cloud/spring-cloud-config/pom.xml b/spring-cloud/spring-cloud-config/pom.xml
index 4eda3dda0a..db26d67358 100644
--- a/spring-cloud/spring-cloud-config/pom.xml
+++ b/spring-cloud/spring-cloud-config/pom.xml
@@ -34,7 +34,7 @@
- 2020.0.3
+ 2021.0.0
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-kubernetes/pom.xml b/spring-cloud/spring-cloud-kubernetes/pom.xml
index d8894eb36f..837e2aabfb 100644
--- a/spring-cloud/spring-cloud-kubernetes/pom.xml
+++ b/spring-cloud/spring-cloud-kubernetes/pom.xml
@@ -38,7 +38,7 @@
- 2020.0.3
+ 2021.0.0
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-ribbon-client/pom.xml b/spring-cloud/spring-cloud-ribbon-client/pom.xml
index 2c2bce4bcd..666a6fa9fc 100644
--- a/spring-cloud/spring-cloud-ribbon-client/pom.xml
+++ b/spring-cloud/spring-cloud-ribbon-client/pom.xml
@@ -47,7 +47,7 @@
- 2020.0.3
+ 2021.0.0
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-ribbon-client/src/main/resources/application.yml b/spring-cloud/spring-cloud-ribbon-client/src/main/resources/application.yml
index 189a923c6c..b14f3fac1b 100644
--- a/spring-cloud/spring-cloud-ribbon-client/src/main/resources/application.yml
+++ b/spring-cloud/spring-cloud-ribbon-client/src/main/resources/application.yml
@@ -2,6 +2,9 @@ spring:
application:
name: spring-cloud-ribbon
+ main:
+ allow-circular-references: true
+
server:
port: 8888
diff --git a/spring-cloud/spring-cloud-security/pom.xml b/spring-cloud/spring-cloud-security/pom.xml
index d9072af91b..362a70eaeb 100644
--- a/spring-cloud/spring-cloud-security/pom.xml
+++ b/spring-cloud/spring-cloud-security/pom.xml
@@ -34,7 +34,7 @@
- 2020.0.3
+ 2021.0.0
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-task/pom.xml b/spring-cloud/spring-cloud-task/pom.xml
index 0cfc62bdbb..2047ce0e21 100644
--- a/spring-cloud/spring-cloud-task/pom.xml
+++ b/spring-cloud/spring-cloud-task/pom.xml
@@ -48,8 +48,8 @@
- 2020.0.3
- 2.3.3
+ 2021.0.0
+ 2.4.0
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/java/com/baeldung/SpringContextTest.java b/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/java/com/baeldung/SpringContextTest.java
index 32224bf91b..e1a4255579 100644
--- a/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/java/com/baeldung/SpringContextTest.java
+++ b/spring-cloud/spring-cloud-task/springcloudtaskbatch/src/test/java/com/baeldung/SpringContextTest.java
@@ -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
diff --git a/spring-cloud/spring-cloud-zookeeper/pom.xml b/spring-cloud/spring-cloud-zookeeper/pom.xml
index 79eabf74f0..3fb899ec47 100644
--- a/spring-cloud/spring-cloud-zookeeper/pom.xml
+++ b/spring-cloud/spring-cloud-zookeeper/pom.xml
@@ -18,8 +18,4 @@
HelloWorld
-
- 5.2.7.RELEASE
-
-
\ No newline at end of file
diff --git a/spring-cloud/spring-cloud-zuul/pom.xml b/spring-cloud/spring-cloud-zuul/pom.xml
index 0590774bef..668f6e6c2a 100644
--- a/spring-cloud/spring-cloud-zuul/pom.xml
+++ b/spring-cloud/spring-cloud-zuul/pom.xml
@@ -35,7 +35,7 @@
org.springframework.cloud
spring-cloud-dependencies
- ${spring-cloud.version}
+ ${spring-cloud-dependencies.version}
pom
import
@@ -81,7 +81,7 @@
- 2020.0.3
+ 2021.0.0
2.2.7.RELEASE
diff --git a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml b/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml
index d2b28643fa..e09fcd3711 100644
--- a/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml
+++ b/spring-cloud/spring-cloud-zuul/spring-zuul-rate-limiting/pom.xml
@@ -42,7 +42,6 @@
2.2.0.RELEASE
- 2.4.7
\ No newline at end of file
diff --git a/spring-jenkins-pipeline/src/test/resources/application.properties b/spring-jenkins-pipeline/src/test/resources/application.properties
index 4ee830556a..f97ea98811 100644
--- a/spring-jenkins-pipeline/src/test/resources/application.properties
+++ b/spring-jenkins-pipeline/src/test/resources/application.properties
@@ -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
diff --git a/spring-kafka/pom.xml b/spring-kafka/pom.xml
index 2801afffd7..22ef0297b5 100644
--- a/spring-kafka/pom.xml
+++ b/spring-kafka/pom.xml
@@ -70,6 +70,7 @@
2.7.8
2.7.1
1.15.3
+ 2.5.4
\ No newline at end of file
diff --git a/spring-quartz/pom.xml b/spring-quartz/pom.xml
index 53b6962a60..e8919bfadb 100644
--- a/spring-quartz/pom.xml
+++ b/spring-quartz/pom.xml
@@ -54,8 +54,8 @@
- 2.3.0
- 0.9.5.2
+ 2.3.2
+ 0.9.5.5
\ No newline at end of file
diff --git a/spring-quartz/src/main/resources/application.properties b/spring-quartz/src/main/resources/application.properties
index 557349af2e..ffe90aadd5 100644
--- a/spring-quartz/src/main/resources/application.properties
+++ b/spring-quartz/src/main/resources/application.properties
@@ -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
diff --git a/spring-quartz/src/main/resources/quartz.properties b/spring-quartz/src/main/resources/quartz.properties
index 662bb83eb0..8cecd7d3d3 100644
--- a/spring-quartz/src/main/resources/quartz.properties
+++ b/spring-quartz/src/main/resources/quartz.properties
@@ -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
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/PasswordEncoderConfig.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/PasswordEncoderConfig.java
new file mode 100644
index 0000000000..5df32d6392
--- /dev/null
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/PasswordEncoderConfig.java
@@ -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();
+ }
+}
diff --git a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/WebSecurityConfig.java b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/WebSecurityConfig.java
index 15af160135..c0abd3cec1 100644
--- a/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/WebSecurityConfig.java
+++ b/spring-security-modules/spring-security-core/src/main/java/com/baeldung/app/config/WebSecurityConfig.java
@@ -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");
}
+
}
diff --git a/spring-security-modules/spring-security-web-boot-2/src/main/java/com/baeldung/jdbcauthentication/h2/config/PasswordEncoderConfig.java b/spring-security-modules/spring-security-web-boot-2/src/main/java/com/baeldung/jdbcauthentication/h2/config/PasswordEncoderConfig.java
new file mode 100644
index 0000000000..4c21b315fb
--- /dev/null
+++ b/spring-security-modules/spring-security-web-boot-2/src/main/java/com/baeldung/jdbcauthentication/h2/config/PasswordEncoderConfig.java
@@ -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();
+ }
+}
diff --git a/spring-security-modules/spring-security-web-boot-2/src/main/java/com/baeldung/jdbcauthentication/h2/config/SecurityConfiguration.java b/spring-security-modules/spring-security-web-boot-2/src/main/java/com/baeldung/jdbcauthentication/h2/config/SecurityConfiguration.java
index 50dc5b6958..49804e8458 100644
--- a/spring-security-modules/spring-security-web-boot-2/src/main/java/com/baeldung/jdbcauthentication/h2/config/SecurityConfiguration.java
+++ b/spring-security-modules/spring-security-web-boot-2/src/main/java/com/baeldung/jdbcauthentication/h2/config/SecurityConfiguration.java
@@ -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();
- }
}
\ No newline at end of file
diff --git a/spring-security-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties b/spring-security-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties
index 4ee830556a..f97ea98811 100644
--- a/spring-security-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties
+++ b/spring-security-modules/spring-session/spring-session-mongodb/src/test/resources/application.properties
@@ -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
diff --git a/spring-web-modules/spring-mvc-basics-5/src/main/resources/application.properties b/spring-web-modules/spring-mvc-basics-5/src/main/resources/application.properties
index 935f91554b..c6d55580a3 100644
--- a/spring-web-modules/spring-mvc-basics-5/src/main/resources/application.properties
+++ b/spring-web-modules/spring-mvc-basics-5/src/main/resources/application.properties
@@ -1 +1,3 @@
server.servlet.context-path=/spring-mvc-basics
+
+spring.mvc.pathmatch.matching-strategy=ant-path-matcher
diff --git a/spring-web-modules/spring-mvc-basics/src/main/resources/application.properties b/spring-web-modules/spring-mvc-basics/src/main/resources/application.properties
index b8a9be0b40..d25df689e3 100644
--- a/spring-web-modules/spring-mvc-basics/src/main/resources/application.properties
+++ b/spring-web-modules/spring-mvc-basics/src/main/resources/application.properties
@@ -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
\ No newline at end of file
diff --git a/spring-web-modules/spring-resttemplate/pom.xml b/spring-web-modules/spring-resttemplate/pom.xml
index 5cac186fad..93902bc81c 100644
--- a/spring-web-modules/spring-resttemplate/pom.xml
+++ b/spring-web-modules/spring-resttemplate/pom.xml
@@ -108,11 +108,6 @@
${com.squareup.okhttp3.version}
-
- org.mockito
- mockito-core
- test
-
org.springframework
spring-test