diff --git a/spring-5-reactive-client/pom.xml b/spring-5-reactive-client/pom.xml
index 1f2c961cf0..6e39743ed0 100644
--- a/spring-5-reactive-client/pom.xml
+++ b/spring-5-reactive-client/pom.xml
@@ -10,9 +10,9 @@
com.baeldung
- parent-boot-2.0-temp
+ parent-boot-2
0.0.1-SNAPSHOT
- ../parent-boot-2.0-temp
+ ../parent-boot-2
diff --git a/spring-5-reactive-security/pom.xml b/spring-5-reactive-security/pom.xml
index 93700b4262..3b64b9b3ac 100644
--- a/spring-5-reactive-security/pom.xml
+++ b/spring-5-reactive-security/pom.xml
@@ -12,9 +12,9 @@
com.baeldung
- parent-boot-2.0-temp
+ parent-boot-2
0.0.1-SNAPSHOT
- ../parent-boot-2.0-temp
+ ../parent-boot-2
diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/Spring5ReactiveApplication.java b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/Spring5ReactiveApplication.java
index f07ddfb0f7..03943d436d 100644
--- a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/Spring5ReactiveApplication.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/actuator/Spring5ReactiveApplication.java
@@ -1,9 +1,7 @@
package com.baeldung.reactive.actuator;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.Bean;
@SpringBootApplication
public class Spring5ReactiveApplication{
diff --git a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/security/SpringSecurity5Application.java b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/security/SpringSecurity5Application.java
index f2963c4fa5..325923f577 100644
--- a/spring-5-reactive-security/src/main/java/com/baeldung/reactive/security/SpringSecurity5Application.java
+++ b/spring-5-reactive-security/src/main/java/com/baeldung/reactive/security/SpringSecurity5Application.java
@@ -8,8 +8,9 @@ import org.springframework.http.server.reactive.HttpHandler;
import org.springframework.http.server.reactive.ReactorHttpHandlerAdapter;
import org.springframework.web.reactive.config.EnableWebFlux;
import org.springframework.web.server.adapter.WebHttpHandlerBuilder;
-import reactor.ipc.netty.NettyContext;
-import reactor.ipc.netty.http.server.HttpServer;
+
+import reactor.netty.DisposableServer;
+import reactor.netty.http.server.HttpServer;
@ComponentScan(basePackages = {"com.baeldung.reactive.security"})
@EnableWebFlux
@@ -18,17 +19,19 @@ public class SpringSecurity5Application {
public static void main(String[] args) {
try (AnnotationConfigApplicationContext context =
new AnnotationConfigApplicationContext(SpringSecurity5Application.class)) {
- context.getBean(NettyContext.class).onClose().block();
+ context.getBean(DisposableServer.class).onDispose().block();
}
}
@Bean
- public NettyContext nettyContext(ApplicationContext context) {
+ public DisposableServer disposableServer(ApplicationContext context) {
HttpHandler handler = WebHttpHandlerBuilder.applicationContext(context)
.build();
ReactorHttpHandlerAdapter adapter = new ReactorHttpHandlerAdapter(handler);
- HttpServer httpServer = HttpServer.create("localhost", 8080);
- return httpServer.newHandler(adapter).block();
+ HttpServer httpServer = HttpServer.create();
+ httpServer.host("localhost");
+ httpServer.port(8080);
+ return httpServer.handle(adapter).bindNow();
}
}
diff --git a/spring-5-security-oauth/pom.xml b/spring-5-security-oauth/pom.xml
index 142326757b..59150a153f 100644
--- a/spring-5-security-oauth/pom.xml
+++ b/spring-5-security-oauth/pom.xml
@@ -10,9 +10,9 @@
com.baeldung
- parent-boot-2.0-temp
+ parent-boot-2
0.0.1-SNAPSHOT
- ../parent-boot-2.0-temp
+ ../parent-boot-2
diff --git a/spring-5-security/pom.xml b/spring-5-security/pom.xml
index 916af7f629..c26e370381 100644
--- a/spring-5-security/pom.xml
+++ b/spring-5-security/pom.xml
@@ -10,9 +10,9 @@
com.baeldung
- parent-boot-2.0-temp
+ parent-boot-2
0.0.1-SNAPSHOT
- ../parent-boot-2.0-temp
+ ../parent-boot-2
@@ -31,7 +31,7 @@
org.thymeleaf.extras
- thymeleaf-extras-springsecurity4
+ thymeleaf-extras-springsecurity5
org.springframework
diff --git a/spring-5-security/src/main/resources/templatesextrafields/index.html b/spring-5-security/src/main/resources/templatesextrafields/index.html
index 37833ff0d2..1dd9c12d42 100644
--- a/spring-5-security/src/main/resources/templatesextrafields/index.html
+++ b/spring-5-security/src/main/resources/templatesextrafields/index.html
@@ -1,5 +1,5 @@
-
+
Spring Security with Extra Fields
diff --git a/spring-all/pom.xml b/spring-all/pom.xml
index faddab6ea6..2dc4915bab 100644
--- a/spring-all/pom.xml
+++ b/spring-all/pom.xml
@@ -7,10 +7,10 @@
war
- parent-boot-2.0-temp
+ parent-boot-2
com.baeldung
0.0.1-SNAPSHOT
- ../parent-boot-2.0-temp
+ ../parent-boot-2