update boot version

insamniac · Mar 6, 2017 · 5292cb2 · 5292cb2
1 parent e02f2e3
commit 5292cb2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
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.4.2.RELEASE</version>
+		<version>1.5.1.RELEASE</version>
 		<relativePath></relativePath>
 	</parent>
 
@@ -72,7 +72,7 @@
 
 		<!-- marshalling -->
 
-		<jackson.version>2.8.1</jackson.version>
+		<jackson.version>2.8.7</jackson.version>
 
 		<!-- logging -->
 		<org.slf4j.version>1.7.12</org.slf4j.version>

diff --git a/spring-security-oauth-server/src/main/java/org/baeldung/mvc/config/WebSecurityConfig.java b/spring-security-oauth-server/src/main/java/org/baeldung/mvc/config/WebSecurityConfig.java
@@ -7,8 +7,11 @@
 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.core.annotation.Order;
+import org.springframework.boot.autoconfigure.security.SecurityProperties;
+
 @Configuration
+@Order(SecurityProperties.ACCESS_OVERRIDE_ORDER)
 public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Autowired

diff --git a/spring-security-oauth-ui-password/pom.xml b/spring-security-oauth-ui-password/pom.xml
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-zuul</artifactId>
-            <version>1.1.5.RELEASE</version>
+            <version>1.2.5.RELEASE</version>
         </dependency>
 
 
@@ -113,7 +113,7 @@
                     </container>
                     <configuration>
                         <properties>
-                            <cargo.servlet.port>8082</cargo.servlet.port>
+                            <cargo.servlet.port>8084</cargo.servlet.port>
                         </properties>
                     </configuration>
                 </configuration>