Merge branch 'develop'

Signed-off-by: Jennifer Hamon <[email protected]>

Author: Abhi Hiremagalur

Diff for: .gitignore

@@ -4,3 +4,4 @@
 **/target
 **/.gradle
 **/classes
+**/out

Diff for: authcode/build.gradle

@@ -13,13 +13,13 @@ apply plugin: 'idea'
 apply plugin: 'org.springframework.boot'
 
 repositories {
-    maven { url "https://repo.spring.io/libs-release-local" }
     mavenCentral()
 }
 
 dependencies {
     compile 'org.springframework.boot:spring-boot-starter-thymeleaf'
     compile 'org.springframework.cloud:spring-cloud-starter-oauth2'
     compile 'org.springframework.cloud:spring-cloud-cloudfoundry-connector'
-    compile 'io.pivotal.spring.cloud:spring-cloud-sso-connector:2.0.0.RELEASE'
+    compile 'io.pivotal.spring.cloud:spring-cloud-sso-connector:2.1.1.RELEASE'
+    compile 'org.springframework.security.oauth:spring-security-oauth2:2.2.0.RELEASE'
 }

Diff for: authcode/src/main/java/org/cloudfoundry/identity/samples/authcode/Application.java

@@ -7,12 +7,9 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.oauth2.client.EnableOAuth2Sso;
 import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.oauth2.client.OAuth2ClientContext;
@@ -40,9 +37,7 @@
 
 import static org.springframework.web.bind.annotation.RequestMethod.GET;
 
-@Configuration
-@EnableAutoConfiguration
-@ComponentScan
+@SpringBootApplication
 @Controller
 @EnableOAuth2Sso
 public class Application {

Diff for: resource-server/build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("org.springframework.boot:spring-boot-gradle-plugin:1.5.5.RELEASE")
+        classpath('org.springframework.boot:spring-boot-gradle-plugin:1.5.5.RELEASE')
     }
 }
 
@@ -13,10 +13,11 @@ apply plugin: 'idea'
 apply plugin: 'org.springframework.boot'
 
 repositories {
-    maven { url "https://repo.spring.io/libs-release-local" }
     mavenCentral()
 }
 
 dependencies {
     compile 'org.springframework.cloud:spring-cloud-starter-oauth2:1.2.1.RELEASE'
+    compile 'io.pivotal.spring.cloud:spring-cloud-sso-connector:2.1.1.RELEASE'
+    compile 'org.springframework.security.oauth:spring-security-oauth2:2.2.0.RELEASE'
 }

Diff for: resource-server/src/main/java/org/cloudfoundry/identity/samples/resource/server/Application.java

@@ -1,10 +1,8 @@
 package org.cloudfoundry.identity.samples.resource.server;
 
-import java.io.IOException;
 import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.context.annotation.Configuration;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
 import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.method.configuration.GlobalMethodSecurityConfiguration;
@@ -18,17 +16,15 @@
 import org.springframework.security.oauth2.provider.authentication.TokenExtractor;
 import org.springframework.security.oauth2.provider.expression.OAuth2MethodSecurityExpressionHandler;
 import org.springframework.security.web.authentication.preauth.AbstractPreAuthenticatedProcessingFilter;
-import org.springframework.context.annotation.Bean;
 import org.springframework.web.filter.OncePerRequestFilter;
 
 import javax.servlet.FilterChain;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 
-@Configuration
-@EnableAutoConfiguration
-@ComponentScan
+@SpringBootApplication
 @EnableResourceServer
 @EnableGlobalMethodSecurity(prePostEnabled = true, proxyTargetClass = true)
 public class Application {

Diff for: resource-server/src/main/resources/application.yml

@@ -12,12 +12,6 @@ security:
   basic:
     enabled: false
   require_ssl: false
-  oauth2:
-    resource:
-      preferTokenInfo: false
-      userInfoUri: ${AUTH_SERVER}/userinfo
-      jwt:
-        keyUri: ${AUTH_SERVER}/token_key
 
 logging.level:
-  org.springframework.security: DEBUG
+  org.springframework.security: DEBUG