From e16f15cce33d3feab15637198aa8b81d1e08a6c8 Mon Sep 17 00:00:00 2001 From: Joe Grandja Date: Wed, 19 Aug 2020 14:29:14 -0400 Subject: [PATCH] Consolidate to one module --- config/spring-security-config2.gradle | 21 ------------------- core/spring-security-core2.gradle | 14 ------------- crypto/spring-security-crypto2.gradle | 15 ------------- jose/spring-security-oauth2-jose2.gradle | 18 ---------------- ...ecurity-oauth2-authorization-server.gradle | 9 ++++---- ...Auth2AuthorizationServerConfiguration.java | 0 .../OAuth2AuthorizationServerSecurity.java | 0 .../OAuth2AuthorizationServerConfigurer.java | 0 .../core/SpringSecurityCoreVersion2.java | 0 .../crypto/keys/KeyGeneratorUtils.java | 0 .../security/crypto/keys/KeyManager.java | 0 .../security/crypto/keys/ManagedKey.java | 0 .../keys/StaticKeyGeneratingKeyManager.java | 0 .../security/oauth2/jose/JoseHeader.java | 0 .../security/oauth2/jose/JoseHeaderNames.java | 0 .../oauth2/jose/jws/NimbusJwsEncoder.java | 0 .../security/oauth2/jwt/JwtClaimsSet.java | 0 .../security/oauth2/jwt/JwtEncoder.java | 0 .../oauth2/jwt/JwtEncodingException.java | 0 .../OAuth2AuthorizationCodeGrantTests.java | 0 .../OAuth2ClientCredentialsGrantTests.java | 0 .../config/test/SpringTestContext.java | 0 .../security/config/test/SpringTestRule.java | 0 .../util/InMemoryXmlApplicationContext.java | 0 .../InMemoryXmlWebApplicationContext.java | 0 .../security/crypto/keys/ManagedKeyTests.java | 0 .../security/crypto/keys/TestManagedKeys.java | 0 .../security/oauth2/jose/JoseHeaderTests.java | 0 .../security/oauth2/jose/TestJoseHeaders.java | 0 .../jose/jws/NimbusJwsEncoderTests.java | 0 .../oauth2/jwt/JwtClaimsSetTests.java | 0 .../oauth2/jwt/TestJwtClaimsSets.java | 0 ...uth2-integrated-authorizationserver.gradle | 2 -- 33 files changed, 5 insertions(+), 74 deletions(-) delete mode 100644 config/spring-security-config2.gradle delete mode 100644 core/spring-security-core2.gradle delete mode 100644 crypto/spring-security-crypto2.gradle delete mode 100644 jose/spring-security-oauth2-jose2.gradle rename {config => oauth2-authorization-server}/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java (100%) rename {config => oauth2-authorization-server}/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerSecurity.java (100%) rename {config => oauth2-authorization-server}/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationServerConfigurer.java (100%) rename {core => oauth2-authorization-server}/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion2.java (100%) rename {crypto => oauth2-authorization-server}/src/main/java/org/springframework/security/crypto/keys/KeyGeneratorUtils.java (100%) rename {crypto => oauth2-authorization-server}/src/main/java/org/springframework/security/crypto/keys/KeyManager.java (100%) rename {crypto => oauth2-authorization-server}/src/main/java/org/springframework/security/crypto/keys/ManagedKey.java (100%) rename {crypto => oauth2-authorization-server}/src/main/java/org/springframework/security/crypto/keys/StaticKeyGeneratingKeyManager.java (100%) rename {jose => oauth2-authorization-server}/src/main/java/org/springframework/security/oauth2/jose/JoseHeader.java (100%) rename {jose => oauth2-authorization-server}/src/main/java/org/springframework/security/oauth2/jose/JoseHeaderNames.java (100%) rename {jose => oauth2-authorization-server}/src/main/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoder.java (100%) rename {jose => oauth2-authorization-server}/src/main/java/org/springframework/security/oauth2/jwt/JwtClaimsSet.java (100%) rename {jose => oauth2-authorization-server}/src/main/java/org/springframework/security/oauth2/jwt/JwtEncoder.java (100%) rename {jose => oauth2-authorization-server}/src/main/java/org/springframework/security/oauth2/jwt/JwtEncodingException.java (100%) rename {config => oauth2-authorization-server}/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationCodeGrantTests.java (100%) rename {config => oauth2-authorization-server}/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ClientCredentialsGrantTests.java (100%) rename {config => oauth2-authorization-server}/src/test/java/org/springframework/security/config/test/SpringTestContext.java (100%) rename {config => oauth2-authorization-server}/src/test/java/org/springframework/security/config/test/SpringTestRule.java (100%) rename {config => oauth2-authorization-server}/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java (100%) rename {config => oauth2-authorization-server}/src/test/java/org/springframework/security/config/util/InMemoryXmlWebApplicationContext.java (100%) rename {crypto => oauth2-authorization-server}/src/test/java/org/springframework/security/crypto/keys/ManagedKeyTests.java (100%) rename {crypto => oauth2-authorization-server}/src/test/java/org/springframework/security/crypto/keys/TestManagedKeys.java (100%) rename {jose => oauth2-authorization-server}/src/test/java/org/springframework/security/oauth2/jose/JoseHeaderTests.java (100%) rename {jose => oauth2-authorization-server}/src/test/java/org/springframework/security/oauth2/jose/TestJoseHeaders.java (100%) rename {jose => oauth2-authorization-server}/src/test/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoderTests.java (100%) rename {jose => oauth2-authorization-server}/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimsSetTests.java (100%) rename {jose => oauth2-authorization-server}/src/test/java/org/springframework/security/oauth2/jwt/TestJwtClaimsSets.java (100%) diff --git a/config/spring-security-config2.gradle b/config/spring-security-config2.gradle deleted file mode 100644 index 9d1f969..0000000 --- a/config/spring-security-config2.gradle +++ /dev/null @@ -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' -} diff --git a/core/spring-security-core2.gradle b/core/spring-security-core2.gradle deleted file mode 100644 index 4b9572c..0000000 --- a/core/spring-security-core2.gradle +++ /dev/null @@ -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' -} diff --git a/crypto/spring-security-crypto2.gradle b/crypto/spring-security-crypto2.gradle deleted file mode 100644 index 9194f61..0000000 --- a/crypto/spring-security-crypto2.gradle +++ /dev/null @@ -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' -} diff --git a/jose/spring-security-oauth2-jose2.gradle b/jose/spring-security-oauth2-jose2.gradle deleted file mode 100644 index ed224ce..0000000 --- a/jose/spring-security-oauth2-jose2.gradle +++ /dev/null @@ -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' -} diff --git a/oauth2-authorization-server/spring-security-oauth2-authorization-server.gradle b/oauth2-authorization-server/spring-security-oauth2-authorization-server.gradle index 8d230d8..1681282 100644 --- a/oauth2-authorization-server/spring-security-oauth2-authorization-server.gradle +++ b/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' } diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java b/oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java similarity index 100% rename from config/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java rename to oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerConfiguration.java diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerSecurity.java b/oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerSecurity.java similarity index 100% rename from config/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerSecurity.java rename to oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configuration/OAuth2AuthorizationServerSecurity.java diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationServerConfigurer.java b/oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationServerConfigurer.java similarity index 100% rename from config/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationServerConfigurer.java rename to oauth2-authorization-server/src/main/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationServerConfigurer.java diff --git a/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion2.java b/oauth2-authorization-server/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion2.java similarity index 100% rename from core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion2.java rename to oauth2-authorization-server/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion2.java diff --git a/crypto/src/main/java/org/springframework/security/crypto/keys/KeyGeneratorUtils.java b/oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/KeyGeneratorUtils.java similarity index 100% rename from crypto/src/main/java/org/springframework/security/crypto/keys/KeyGeneratorUtils.java rename to oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/KeyGeneratorUtils.java diff --git a/crypto/src/main/java/org/springframework/security/crypto/keys/KeyManager.java b/oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/KeyManager.java similarity index 100% rename from crypto/src/main/java/org/springframework/security/crypto/keys/KeyManager.java rename to oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/KeyManager.java diff --git a/crypto/src/main/java/org/springframework/security/crypto/keys/ManagedKey.java b/oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/ManagedKey.java similarity index 100% rename from crypto/src/main/java/org/springframework/security/crypto/keys/ManagedKey.java rename to oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/ManagedKey.java diff --git a/crypto/src/main/java/org/springframework/security/crypto/keys/StaticKeyGeneratingKeyManager.java b/oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/StaticKeyGeneratingKeyManager.java similarity index 100% rename from crypto/src/main/java/org/springframework/security/crypto/keys/StaticKeyGeneratingKeyManager.java rename to oauth2-authorization-server/src/main/java/org/springframework/security/crypto/keys/StaticKeyGeneratingKeyManager.java diff --git a/jose/src/main/java/org/springframework/security/oauth2/jose/JoseHeader.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jose/JoseHeader.java similarity index 100% rename from jose/src/main/java/org/springframework/security/oauth2/jose/JoseHeader.java rename to oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jose/JoseHeader.java diff --git a/jose/src/main/java/org/springframework/security/oauth2/jose/JoseHeaderNames.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jose/JoseHeaderNames.java similarity index 100% rename from jose/src/main/java/org/springframework/security/oauth2/jose/JoseHeaderNames.java rename to oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jose/JoseHeaderNames.java diff --git a/jose/src/main/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoder.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoder.java similarity index 100% rename from jose/src/main/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoder.java rename to oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoder.java diff --git a/jose/src/main/java/org/springframework/security/oauth2/jwt/JwtClaimsSet.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jwt/JwtClaimsSet.java similarity index 100% rename from jose/src/main/java/org/springframework/security/oauth2/jwt/JwtClaimsSet.java rename to oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jwt/JwtClaimsSet.java diff --git a/jose/src/main/java/org/springframework/security/oauth2/jwt/JwtEncoder.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jwt/JwtEncoder.java similarity index 100% rename from jose/src/main/java/org/springframework/security/oauth2/jwt/JwtEncoder.java rename to oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jwt/JwtEncoder.java diff --git a/jose/src/main/java/org/springframework/security/oauth2/jwt/JwtEncodingException.java b/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jwt/JwtEncodingException.java similarity index 100% rename from jose/src/main/java/org/springframework/security/oauth2/jwt/JwtEncodingException.java rename to oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/jwt/JwtEncodingException.java diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationCodeGrantTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationCodeGrantTests.java similarity index 100% rename from config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationCodeGrantTests.java rename to oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2AuthorizationCodeGrantTests.java diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ClientCredentialsGrantTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ClientCredentialsGrantTests.java similarity index 100% rename from config/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ClientCredentialsGrantTests.java rename to oauth2-authorization-server/src/test/java/org/springframework/security/config/annotation/web/configurers/oauth2/server/authorization/OAuth2ClientCredentialsGrantTests.java diff --git a/config/src/test/java/org/springframework/security/config/test/SpringTestContext.java b/oauth2-authorization-server/src/test/java/org/springframework/security/config/test/SpringTestContext.java similarity index 100% rename from config/src/test/java/org/springframework/security/config/test/SpringTestContext.java rename to oauth2-authorization-server/src/test/java/org/springframework/security/config/test/SpringTestContext.java diff --git a/config/src/test/java/org/springframework/security/config/test/SpringTestRule.java b/oauth2-authorization-server/src/test/java/org/springframework/security/config/test/SpringTestRule.java similarity index 100% rename from config/src/test/java/org/springframework/security/config/test/SpringTestRule.java rename to oauth2-authorization-server/src/test/java/org/springframework/security/config/test/SpringTestRule.java diff --git a/config/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java b/oauth2-authorization-server/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java similarity index 100% rename from config/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java rename to oauth2-authorization-server/src/test/java/org/springframework/security/config/util/InMemoryXmlApplicationContext.java diff --git a/config/src/test/java/org/springframework/security/config/util/InMemoryXmlWebApplicationContext.java b/oauth2-authorization-server/src/test/java/org/springframework/security/config/util/InMemoryXmlWebApplicationContext.java similarity index 100% rename from config/src/test/java/org/springframework/security/config/util/InMemoryXmlWebApplicationContext.java rename to oauth2-authorization-server/src/test/java/org/springframework/security/config/util/InMemoryXmlWebApplicationContext.java diff --git a/crypto/src/test/java/org/springframework/security/crypto/keys/ManagedKeyTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/crypto/keys/ManagedKeyTests.java similarity index 100% rename from crypto/src/test/java/org/springframework/security/crypto/keys/ManagedKeyTests.java rename to oauth2-authorization-server/src/test/java/org/springframework/security/crypto/keys/ManagedKeyTests.java diff --git a/crypto/src/test/java/org/springframework/security/crypto/keys/TestManagedKeys.java b/oauth2-authorization-server/src/test/java/org/springframework/security/crypto/keys/TestManagedKeys.java similarity index 100% rename from crypto/src/test/java/org/springframework/security/crypto/keys/TestManagedKeys.java rename to oauth2-authorization-server/src/test/java/org/springframework/security/crypto/keys/TestManagedKeys.java diff --git a/jose/src/test/java/org/springframework/security/oauth2/jose/JoseHeaderTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jose/JoseHeaderTests.java similarity index 100% rename from jose/src/test/java/org/springframework/security/oauth2/jose/JoseHeaderTests.java rename to oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jose/JoseHeaderTests.java diff --git a/jose/src/test/java/org/springframework/security/oauth2/jose/TestJoseHeaders.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jose/TestJoseHeaders.java similarity index 100% rename from jose/src/test/java/org/springframework/security/oauth2/jose/TestJoseHeaders.java rename to oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jose/TestJoseHeaders.java diff --git a/jose/src/test/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoderTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoderTests.java similarity index 100% rename from jose/src/test/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoderTests.java rename to oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jose/jws/NimbusJwsEncoderTests.java diff --git a/jose/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimsSetTests.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimsSetTests.java similarity index 100% rename from jose/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimsSetTests.java rename to oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jwt/JwtClaimsSetTests.java diff --git a/jose/src/test/java/org/springframework/security/oauth2/jwt/TestJwtClaimsSets.java b/oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jwt/TestJwtClaimsSets.java similarity index 100% rename from jose/src/test/java/org/springframework/security/oauth2/jwt/TestJwtClaimsSets.java rename to oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/jwt/TestJwtClaimsSets.java diff --git a/samples/boot/oauth2-integration/authorizationserver/spring-security-samples-boot-oauth2-integrated-authorizationserver.gradle b/samples/boot/oauth2-integration/authorizationserver/spring-security-samples-boot-oauth2-integrated-authorizationserver.gradle index 8ed91d3..b53da68 100644 --- a/samples/boot/oauth2-integration/authorizationserver/spring-security-samples-boot-oauth2-integrated-authorizationserver.gradle +++ b/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') }