update to spring boot 2

Doha2012 · Doha2012 · commit 21604d2c524e · 2018-05-26T18:37:55.000+02:00
diff --git a/angularjs/spring-security-oauth-ui-implicit/src/main/java/org/baeldung/config/UiApplication.java b/angularjs/spring-security-oauth-ui-implicit/src/main/java/org/baeldung/config/UiApplication.java
@@ -2,7 +2,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
 public class UiApplication extends SpringBootServletInitializer {
diff --git a/angularjs/spring-security-oauth-ui-password/pom.xml b/angularjs/spring-security-oauth-ui-password/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-zuul</artifactId>
-            <version>1.2.5.RELEASE</version>
+            <version>${zuul.version}</version>
         </dependency>
     
     
@@ -61,18 +61,11 @@
         </dependency>
 
         <dependency>
-            <groupId>com.jayway.restassured</groupId>
+            <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
-            <version>${rest-assured.version}</version>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <artifactId>commons-logging</artifactId>
-                    <groupId>commons-logging</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
-        
+
         <dependency>
 		    <groupId>commons-io</groupId>
 		    <artifactId>commons-io</artifactId>
diff --git a/angularjs/spring-security-oauth-ui-password/src/main/java/org/baeldung/config/UiApplication.java b/angularjs/spring-security-oauth-ui-password/src/main/java/org/baeldung/config/UiApplication.java
@@ -2,7 +2,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 import org.springframework.cloud.netflix.zuul.EnableZuulProxy;
 
 @EnableZuulProxy
diff --git a/angularjs/spring-security-oauth-ui-password/src/test/java/org/baeldung/live/AuthorizationLiveTest.java b/angularjs/spring-security-oauth-ui-password/src/test/java/org/baeldung/live/AuthorizationLiveTest.java
@@ -2,15 +2,16 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
 import org.springframework.http.MediaType;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.response.Response;
+
 
 public class AuthorizationLiveTest {
 
diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.8.RELEASE</version>
+		<version>2.0.2.RELEASE</version>
 		<relativePath></relativePath>
 	</parent>
 
@@ -60,12 +60,15 @@
 	</build>
 
 	<properties>
+        <oauth.version>2.3.3.RELEASE</oauth.version>
+        <jwt.version>1.0.9.RELEASE</jwt.version>
+        <zuul.version>1.4.4.RELEASE</zuul.version>
+        
 		<!-- util -->
-		<commons-lang3.version>3.4</commons-lang3.version>
-		<commons-io.version>2.4</commons-io.version>
+		<commons-io.version>2.6</commons-io.version>
 
 		<!-- testing -->
-		<rest-assured.version>2.9.0</rest-assured.version>
+		<rest-assured.version>3.1.0</rest-assured.version>
 
 		<!-- Maven plugins -->
 		<maven-compiler-plugin.version>3.7.0</maven-compiler-plugin.version>
diff --git a/spring-security-oauth-resource/pom.xml b/spring-security-oauth-resource/pom.xml
@@ -43,17 +43,18 @@
 		<dependency>
 			<groupId>org.springframework.security.oauth</groupId>
 			<artifactId>spring-security-oauth2</artifactId>
+            <version>${oauth.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-jwt</artifactId>
+            <version>${jwt.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>${commons-lang3.version}</version>
 		</dependency>
 
 		<dependency>
diff --git a/spring-security-oauth-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java b/spring-security-oauth-resource/src/main/java/org/baeldung/config/ResourceServerApplication.java
@@ -2,7 +2,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
 public class ResourceServerApplication extends SpringBootServletInitializer {
diff --git a/spring-security-oauth-resource/src/main/resources/application.properties b/spring-security-oauth-resource/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-server.contextPath=/spring-security-oauth-resource
+server.servlet.context-path=/spring-security-oauth-resource
 server.port=8082
 logging.level.org=INFO
 #endpoints.cors.allowed-origins=*
diff --git a/spring-security-oauth-server/pom.xml b/spring-security-oauth-server/pom.xml
@@ -45,17 +45,18 @@
 		<dependency>
 			<groupId>org.springframework.security.oauth</groupId>
 			<artifactId>spring-security-oauth2</artifactId>
+            <version>${oauth.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework.security</groupId>
 			<artifactId>spring-security-jwt</artifactId>
+            <version>${jwt.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>${commons-lang3.version}</version>
 		</dependency>
 
 		<!-- test -->
@@ -73,18 +74,12 @@
 			<artifactId>spring-security-test</artifactId>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>com.jayway.restassured</groupId>
-			<artifactId>rest-assured</artifactId>
-			<version>${rest-assured.version}</version>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<artifactId>commons-logging</artifactId>
-					<groupId>commons-logging</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
+        
+        <dependency>
+            <groupId>io.rest-assured</groupId>
+            <artifactId>rest-assured</artifactId>
+            <scope>test</scope>
+        </dependency>
 
 		<dependency>
 			<groupId>com.fasterxml.jackson.datatype</groupId>
diff --git a/spring-security-oauth-server/src/main/java/org/baeldung/config/AuthorizationServerApplication.java b/spring-security-oauth-server/src/main/java/org/baeldung/config/AuthorizationServerApplication.java
@@ -2,7 +2,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.web.support.SpringBootServletInitializer;
+import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
 
 @SpringBootApplication
 public class AuthorizationServerApplication extends SpringBootServletInitializer {
diff --git a/spring-security-oauth-server/src/main/java/org/baeldung/config/OAuth2AuthorizationServerConfigJwt.java b/spring-security-oauth-server/src/main/java/org/baeldung/config/OAuth2AuthorizationServerConfigJwt.java
@@ -9,6 +9,7 @@
 import org.springframework.context.annotation.Primary;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer;
 import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter;
 import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer;
@@ -47,7 +48,7 @@ public void configure(final ClientDetailsServiceConfigurer clients) throws Excep
 
             .and()
             .withClient("fooClientIdPassword")
-            .secret("secret")
+            .secret(passwordEncoder().encode("secret"))
             .authorizedGrantTypes("password", "authorization_code", "refresh_token")
             .scopes("foo", "read", "write")
             .accessTokenValiditySeconds(3600)
@@ -57,7 +58,7 @@ public void configure(final ClientDetailsServiceConfigurer clients) throws Excep
 
             .and()
             .withClient("barClientIdPassword")
-            .secret("secret")
+            .secret(passwordEncoder().encode("secret"))
             .authorizedGrantTypes("password", "authorization_code", "refresh_token")
             .scopes("bar", "read", "write")
             .accessTokenValiditySeconds(3600)
@@ -103,4 +104,8 @@ public TokenEnhancer tokenEnhancer() {
         return new CustomTokenEnhancer();
     }
 
+    @Bean
+    public BCryptPasswordEncoder passwordEncoder() {
+            return new BCryptPasswordEncoder();
+    }
 }
diff --git a/spring-security-oauth-server/src/main/java/org/baeldung/config/WebSecurityConfig.java b/spring-security-oauth-server/src/main/java/org/baeldung/config/WebSecurityConfig.java
@@ -1,27 +1,27 @@
 package org.baeldung.config;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.security.SecurityProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.annotation.Order;
 import org.springframework.security.authentication.AuthenticationManager;
 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.crypto.bcrypt.BCryptPasswordEncoder;
 
 @Configuration
-@Order(SecurityProperties.ACCESS_OVERRIDE_ORDER)
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
-
+    @Autowired
+    private BCryptPasswordEncoder passwordEncoder;
+    
     @Autowired
     public void globalUserDetails(final AuthenticationManagerBuilder auth) throws Exception {
         // @formatter:off
 	auth.inMemoryAuthentication()
-	  .withUser("john").password("123").roles("USER").and()
-	  .withUser("tom").password("111").roles("ADMIN").and()
-	  .withUser("user1").password("pass").roles("USER").and()
-	  .withUser("admin").password("nimda").roles("ADMIN");
+	  .withUser("john").password(passwordEncoder.encode("123")).roles("USER").and()
+	  .withUser("tom").password(passwordEncoder.encode("111")).roles("ADMIN").and()
+	  .withUser("user1").password(passwordEncoder.encode("pass")).roles("USER").and()
+	  .withUser("admin").password(passwordEncoder.encode("nimda")).roles("ADMIN");
     }// @formatter:on
 
     @Override
diff --git a/spring-security-oauth-server/src/main/resources/application.properties b/spring-security-oauth-server/src/main/resources/application.properties
@@ -1,4 +1,6 @@
-server.contextPath=/spring-security-oauth-server
+server.servlet.context-path=/spring-security-oauth-server
 server.port=8081
 
-#spring.profiles.active=dev
+#spring.profiles.active=dev
+
+#logging.level.org.springframework=DEBUG
diff --git a/spring-security-oauth-server/src/test/java/org/baeldung/test/TokenRevocationLiveTest.java b/spring-security-oauth-server/src/test/java/org/baeldung/test/TokenRevocationLiveTest.java
@@ -3,14 +3,15 @@
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertThat;
+import io.restassured.RestAssured;
+import io.restassured.response.Response;
 
 import java.util.HashMap;
 import java.util.Map;
 
 import org.junit.Test;
 
-import com.jayway.restassured.RestAssured;
-import com.jayway.restassured.response.Response;
+
 
 public class TokenRevocationLiveTest {
 
@@ -32,7 +33,9 @@ private Response obtainAccessToken(String clientId, String username, String pass
         params.put("client_id", clientId);
         params.put("username", username);
         params.put("password", password);
-        return RestAssured.given().auth().preemptive().basic(clientId, "secret").and().with().params(params).when().post("http://localhost:8081/spring-security-oauth-server/oauth/token");
+        return RestAssured.given()
+            .auth().preemptive().basic(clientId, "secret").and().with().params(params)
+            .when().post("http://localhost:8081/spring-security-oauth-server/oauth/token");
         // response.jsonPath().getString("refresh_token");
         // response.jsonPath().getString("access_token")
     }
