Explorar el Código

Consolidate to one module

Joe Grandja hace 5 años
padre
commit
e16f15cce3
Se han modificado 33 ficheros con 5 adiciones y 74 borrados
  1. 0 21
      config/spring-security-config2.gradle
  2. 0 14
      core/spring-security-core2.gradle
  3. 0 15
      crypto/spring-security-crypto2.gradle
  4. 0 18
      jose/spring-security-oauth2-jose2.gradle
  5. 5 4
      oauth2-authorization-server/spring-security-oauth2-authorization-server.gradle
  6. 0 0
      oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java
  7. 0 0
      oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerSecurity.java
  8. 0 0
      oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationServerConfigurer.java
  9. 0 0
      oauth2-authorization-server/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion2.java
  10. 0 0
      oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/KeyGeneratorUtils.java
  11. 0 0
      oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/KeyManager.java
  12. 0 0
      oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/ManagedKey.java
  13. 0 0
      oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/StaticKeyGeneratingKeyManager.java
  14. 0 0
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jose/JoseHeader.java
  15. 0 0
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jose/JoseHeaderNames.java
  16. 0 0
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoder.java
  17. 0 0
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jwt/JwtClaimsSet.java
  18. 0 0
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jwt/JwtEncoder.java
  19. 0 0
      oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jwt/JwtEncodingException.java
  20. 0 0
      oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationCodeGrantTests.java
  21. 0 0
      oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ClientCredentialsGrantTests.java
  22. 0 0
      oauth2-authorization-server/src/test/java/org/springframework/security/config/test/SpringTestContext.java
  23. 0 0
      oauth2-authorization-server/src/test/java/org/springframework/security/config/test/SpringTestRule.java
  24. 0 0
      oauth2-authorization-server/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java
  25. 0 0
      oauth2-authorization-server/src/test/java/org/springframework/security/config/util/InMemoryXmlWebApplicationContext.java
  26. 0 0
      oauth2-authorization-server/src/test/java/org/springframework/security/crypto/keys/ManagedKeyTests.java
  27. 0 0
      oauth2-authorization-server/src/test/java/org/springframework/security/crypto/keys/TestManagedKeys.java
  28. 0 0
      oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jose/JoseHeaderTests.java
  29. 0 0
      oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jose/TestJoseHeaders.java
  30. 0 0
      oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoderTests.java
  31. 0 0
      oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimsSetTests.java
  32. 0 0
      oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jwt/TestJwtClaimsSets.java
  33. 0 2
      samples/boot/oauth2-integration/authorizationserver/spring-security-samples-boot-oauth2-integrated-authorizationserver.gradle

+ 0 - 21
config/spring-security-config2.gradle

@@ -1,21 +0,0 @@
-apply plugin: 'io.spring.convention.spring-module'
-
-dependencies {
-	compile project(':spring-security-oauth2-authorization-server')
-	compile 'org.springframework.security:spring-security-core'
-	compile 'org.springframework.security:spring-security-config'
-	compile springCoreDependency
-
-	testCompile project(path: ':spring-security-oauth2-authorization-server', configuration: 'tests')
-	testCompile 'org.springframework.security:spring-security-test'
-	testCompile 'junit:junit'
-	testCompile 'org.assertj:assertj-core'
-	testCompile 'org.mockito:mockito-core'
-	testCompile 'com.jayway.jsonpath:json-path'
-
-	provided 'javax.servlet:javax.servlet-api'
-}
-
-jacoco {
-	toolVersion = '0.8.5'
-}

+ 0 - 14
core/spring-security-core2.gradle

@@ -1,14 +0,0 @@
-apply plugin: 'io.spring.convention.spring-module'
-
-dependencies {
-	compile 'org.springframework.security:spring-security-core'
-	compile springCoreDependency
-
-	testCompile 'junit:junit'
-	testCompile 'org.assertj:assertj-core'
-	testCompile 'org.mockito:mockito-core'
-}
-
-jacoco {
-	toolVersion = '0.8.5'
-}

+ 0 - 15
crypto/spring-security-crypto2.gradle

@@ -1,15 +0,0 @@
-apply plugin: 'io.spring.convention.spring-module'
-
-dependencies {
-	compile project(':spring-security-core2')
-	compile 'org.springframework.security:spring-security-core'
-	compile springCoreDependency
-
-	testCompile 'junit:junit'
-	testCompile 'org.assertj:assertj-core'
-	testCompile 'org.mockito:mockito-core'
-}
-
-jacoco {
-	toolVersion = '0.8.5'
-}

+ 0 - 18
jose/spring-security-oauth2-jose2.gradle

@@ -1,18 +0,0 @@
-apply plugin: 'io.spring.convention.spring-module'
-
-dependencies {
-	compile project(':spring-security-crypto2')
-	compile 'org.springframework.security:spring-security-oauth2-core'
-	compile 'org.springframework.security:spring-security-oauth2-jose'
-	compile springCoreDependency
-	compile 'com.nimbusds:nimbus-jose-jwt'
-
-	testCompile project(path: ':spring-security-crypto2', configuration: 'tests')
-	testCompile 'junit:junit'
-	testCompile 'org.assertj:assertj-core'
-	testCompile 'org.mockito:mockito-core'
-}
-
-jacoco {
-	toolVersion = '0.8.5'
-}

+ 5 - 4
oauth2-authorization-server/spring-security-oauth2-authorization-server.gradle

@@ -1,19 +1,20 @@
 apply plugin: 'io.spring.convention.spring-module'
 
 dependencies {
-	compile project(':spring-security-core2')
-	compile project(':spring-security-oauth2-jose2')
-	compile 'org.springframework.security:spring-security-core'
+	compile 'org.springframework.security:spring-security-config'
 	compile 'org.springframework.security:spring-security-web'
 	compile 'org.springframework.security:spring-security-oauth2-core'
+	compile 'org.springframework.security:spring-security-oauth2-jose'
 	compile springCoreDependency
+	compile 'com.nimbusds:nimbus-jose-jwt'
 	compile 'com.fasterxml.jackson.core:jackson-databind'
 
-	testCompile project(path: ':spring-security-crypto2', configuration: 'tests')
+	testCompile 'org.springframework.security:spring-security-test'
 	testCompile 'org.springframework:spring-webmvc'
 	testCompile 'junit:junit'
 	testCompile 'org.assertj:assertj-core'
 	testCompile 'org.mockito:mockito-core'
+	testCompile 'com.jayway.jsonpath:json-path'
 
 	provided 'javax.servlet:javax.servlet-api'
 }

+ 0 - 0
config/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java → oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java


+ 0 - 0
config/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerSecurity.java → oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerSecurity.java


+ 0 - 0
config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationServerConfigurer.java → oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationServerConfigurer.java


+ 0 - 0
core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion2.java → oauth2-authorization-server/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion2.java


+ 0 - 0
crypto/src/main/java/org/springframework/security/crypto/keys/KeyGeneratorUtils.java → oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/KeyGeneratorUtils.java


+ 0 - 0
crypto/src/main/java/org/springframework/security/crypto/keys/KeyManager.java → oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/KeyManager.java


+ 0 - 0
crypto/src/main/java/org/springframework/security/crypto/keys/ManagedKey.java → oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/ManagedKey.java


+ 0 - 0
crypto/src/main/java/org/springframework/security/crypto/keys/StaticKeyGeneratingKeyManager.java → oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/StaticKeyGeneratingKeyManager.java


+ 0 - 0
jose/src/main/java/org/springframework/security/oauth2/jose/JoseHeader.java → oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jose/JoseHeader.java


+ 0 - 0
jose/src/main/java/org/springframework/security/oauth2/jose/JoseHeaderNames.java → oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jose/JoseHeaderNames.java


+ 0 - 0
jose/src/main/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoder.java → oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoder.java


+ 0 - 0
jose/src/main/java/org/springframework/security/oauth2/jwt/JwtClaimsSet.java → oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jwt/JwtClaimsSet.java


+ 0 - 0
jose/src/main/java/org/springframework/security/oauth2/jwt/JwtEncoder.java → oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jwt/JwtEncoder.java


+ 0 - 0
jose/src/main/java/org/springframework/security/oauth2/jwt/JwtEncodingException.java → oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jwt/JwtEncodingException.java


+ 0 - 0
config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationCodeGrantTests.java → oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationCodeGrantTests.java


+ 0 - 0
config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ClientCredentialsGrantTests.java → oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ClientCredentialsGrantTests.java


+ 0 - 0
config/src/test/java/org/springframework/security/config/test/SpringTestContext.java → oauth2-authorization-server/src/test/java/org/springframework/security/config/test/SpringTestContext.java


+ 0 - 0
config/src/test/java/org/springframework/security/config/test/SpringTestRule.java → oauth2-authorization-server/src/test/java/org/springframework/security/config/test/SpringTestRule.java


+ 0 - 0
config/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java → oauth2-authorization-server/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java


+ 0 - 0
config/src/test/java/org/springframework/security/config/util/InMemoryXmlWebApplicationContext.java → oauth2-authorization-server/src/test/java/org/springframework/security/config/util/InMemoryXmlWebApplicationContext.java


+ 0 - 0
crypto/src/test/java/org/springframework/security/crypto/keys/ManagedKeyTests.java → oauth2-authorization-server/src/test/java/org/springframework/security/crypto/keys/ManagedKeyTests.java


+ 0 - 0
crypto/src/test/java/org/springframework/security/crypto/keys/TestManagedKeys.java → oauth2-authorization-server/src/test/java/org/springframework/security/crypto/keys/TestManagedKeys.java


+ 0 - 0
jose/src/test/java/org/springframework/security/oauth2/jose/JoseHeaderTests.java → oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jose/JoseHeaderTests.java


+ 0 - 0
jose/src/test/java/org/springframework/security/oauth2/jose/TestJoseHeaders.java → oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jose/TestJoseHeaders.java


+ 0 - 0
jose/src/test/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoderTests.java → oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoderTests.java


+ 0 - 0
jose/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimsSetTests.java → oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimsSetTests.java


+ 0 - 0
jose/src/test/java/org/springframework/security/oauth2/jwt/TestJwtClaimsSets.java → oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jwt/TestJwtClaimsSets.java


+ 0 - 2
samples/boot/oauth2-integration/authorizationserver/spring-security-samples-boot-oauth2-integrated-authorizationserver.gradle

@@ -4,6 +4,4 @@ dependencies {
 	compile 'org.springframework.boot:spring-boot-starter-web'
 	compile 'org.springframework.boot:spring-boot-starter-security'
 	compile project(':spring-security-oauth2-authorization-server')
-	compile project(':spring-security-config2')
-	compile project(':spring-security-crypto2')
 }