diff --git a/acl/spring-security-acl.gradle b/acl/spring-security-acl.gradle
index d4bb36b16b..27dc016aaf 100644
--- a/acl/spring-security-acl.gradle
+++ b/acl/spring-security-acl.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
+ management platform(project(":spring-security-dependencies"))
api project(':spring-security-core')
api 'org.springframework:spring-aop'
api 'org.springframework:spring-context'
diff --git a/aspects/spring-security-aspects.gradle b/aspects/spring-security-aspects.gradle
index 7512b1e097..d66ebe447c 100644
--- a/aspects/spring-security-aspects.gradle
+++ b/aspects/spring-security-aspects.gradle
@@ -2,6 +2,7 @@ apply plugin: 'io.spring.convention.spring-module'
apply plugin: 'io.freefair.aspectj'
dependencies {
+ management platform(project(":spring-security-dependencies"))
api "org.aspectj:aspectjrt"
api project(':spring-security-core')
api 'org.springframework:spring-beans'
diff --git a/buildSrc/.idea/compiler.xml b/buildSrc/.idea/compiler.xml
new file mode 100644
index 0000000000..61a9130cd9
--- /dev/null
+++ b/buildSrc/.idea/compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/buildSrc/.idea/gradle.xml b/buildSrc/.idea/gradle.xml
new file mode 100644
index 0000000000..5c59556b93
--- /dev/null
+++ b/buildSrc/.idea/gradle.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/buildSrc/.idea/jarRepositories.xml b/buildSrc/.idea/jarRepositories.xml
new file mode 100644
index 0000000000..36cc8fcb9d
--- /dev/null
+++ b/buildSrc/.idea/jarRepositories.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/buildSrc/.idea/misc.xml b/buildSrc/.idea/misc.xml
new file mode 100644
index 0000000000..3a9d81e2a8
--- /dev/null
+++ b/buildSrc/.idea/misc.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/buildSrc/.idea/uiDesigner.xml b/buildSrc/.idea/uiDesigner.xml
new file mode 100644
index 0000000000..e96534fb27
--- /dev/null
+++ b/buildSrc/.idea/uiDesigner.xml
@@ -0,0 +1,124 @@
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+ -
+
+
+
+
+ -
+
+
+ -
+
+
+
+
+
\ No newline at end of file
diff --git a/buildSrc/.idea/workspace.xml b/buildSrc/.idea/workspace.xml
new file mode 100644
index 0000000000..2ca122bc89
--- /dev/null
+++ b/buildSrc/.idea/workspace.xml
@@ -0,0 +1,206 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1617238749852
+
+
+ 1617238749852
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/buildSrc/gradle/wrapper/gradle-wrapper.jar b/buildSrc/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000..e708b1c023
Binary files /dev/null and b/buildSrc/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/buildSrc/gradle/wrapper/gradle-wrapper.properties b/buildSrc/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..2a563242c1
--- /dev/null
+++ b/buildSrc/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/cas/spring-security-cas.gradle b/cas/spring-security-cas.gradle
index 58539f0402..68e8838994 100644
--- a/cas/spring-security-cas.gradle
+++ b/cas/spring-security-cas.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
+ management platform(project(":spring-security-dependencies"))
api project(':spring-security-core')
api project(':spring-security-web')
api 'org.jasig.cas.client:cas-client-core'
diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle
index 1f07cc73c8..49d176c89b 100644
--- a/config/spring-security-config.gradle
+++ b/config/spring-security-config.gradle
@@ -9,6 +9,7 @@ repositories {
}
dependencies {
+ management platform(project(":spring-security-dependencies"))
// NB: Don't add other compile time dependencies to the config module as this breaks tooling
api project(':spring-security-core')
api 'org.springframework:spring-aop'
diff --git a/core/spring-security-core.gradle b/core/spring-security-core.gradle
index 541e699d6e..e85c287d66 100644
--- a/core/spring-security-core.gradle
+++ b/core/spring-security-core.gradle
@@ -10,6 +10,7 @@ configurations {
}
dependencies {
+ management platform(project(":spring-security-dependencies"))
api 'org.springframework:spring-aop'
api 'org.springframework:spring-beans'
api 'org.springframework:spring-context'
diff --git a/crypto/spring-security-crypto.gradle b/crypto/spring-security-crypto.gradle
index d4f73517ba..d69e1570c4 100644
--- a/crypto/spring-security-crypto.gradle
+++ b/crypto/spring-security-crypto.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
+ management platform(project(":spring-security-dependencies"))
optional 'org.springframework:spring-jcl'
optional 'org.bouncycastle:bcpkix-jdk15on'
}
diff --git a/data/spring-security-data.gradle b/data/spring-security-data.gradle
index 14c1a69a16..b86af30805 100644
--- a/data/spring-security-data.gradle
+++ b/data/spring-security-data.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
+ management platform(project(":spring-security-dependencies"))
api project(':spring-security-core')
api 'javax.xml.bind:jaxb-api'
api 'org.springframework.data:spring-data-commons'
diff --git a/docs/manual/spring-security-docs-manual.gradle b/docs/manual/spring-security-docs-manual.gradle
index fabd140198..a0a2ececd9 100644
--- a/docs/manual/spring-security-docs-manual.gradle
+++ b/docs/manual/spring-security-docs-manual.gradle
@@ -31,6 +31,7 @@ docsZip {
}
dependencies {
+ management platform(project(":spring-security-dependencies"))
testImplementation "com.unboundid:unboundid-ldapsdk"
testImplementation "org.apache.directory.server:apacheds-core"
testImplementation "org.springframework:spring-core"
diff --git a/itest/context/spring-security-itest-context.gradle b/itest/context/spring-security-itest-context.gradle
index 409fa0c4fe..4d48604b8d 100644
--- a/itest/context/spring-security-itest-context.gradle
+++ b/itest/context/spring-security-itest-context.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-test'
dependencies {
+ management platform(project(":spring-security-dependencies"))
implementation project(':spring-security-core')
implementation 'org.python:jython'
implementation 'org.springframework:spring-aop'
diff --git a/itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle b/itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle
index d07e919766..1d69e8d1b7 100644
--- a/itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle
+++ b/itest/ldap/embedded-ldap-apacheds-default/spring-security-itest-ldap-embedded-apacheds-default.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-test'
dependencies {
+ management platform(project(":spring-security-dependencies"))
implementation project(':spring-security-core')
implementation 'org.springframework:spring-beans'
implementation 'org.springframework:spring-context'
diff --git a/itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle b/itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle
index d07e919766..1d69e8d1b7 100644
--- a/itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle
+++ b/itest/ldap/embedded-ldap-mode-apacheds/spring-security-itest-ldap-embedded-mode-apacheds.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-test'
dependencies {
+ management platform(project(":spring-security-dependencies"))
implementation project(':spring-security-core')
implementation 'org.springframework:spring-beans'
implementation 'org.springframework:spring-context'
diff --git a/itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle b/itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle
index ecc9a0782e..dfa4a147f3 100644
--- a/itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle
+++ b/itest/ldap/embedded-ldap-mode-unboundid/spring-security-itest-ldap-embedded-mode-unboundid.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-test'
dependencies {
+ management platform(project(":spring-security-dependencies"))
implementation project(':spring-security-core')
implementation 'org.springframework:spring-beans'
implementation 'org.springframework:spring-context'
diff --git a/itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle b/itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle
index 1f178590ab..973950b47e 100644
--- a/itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle
+++ b/itest/ldap/embedded-ldap-none/spring-security-itest-ldap-embedded-none.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-test'
dependencies {
+ management platform(project(":spring-security-dependencies"))
implementation project(':spring-security-core')
implementation 'org.springframework:spring-beans'
implementation 'org.springframework:spring-context'
diff --git a/itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.gradle b/itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.gradle
index ecc9a0782e..dfa4a147f3 100644
--- a/itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.gradle
+++ b/itest/ldap/embedded-ldap-unboundid-default/spring-security-itest-ldap-embedded-unboundid-default.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-test'
dependencies {
+ management platform(project(":spring-security-dependencies"))
implementation project(':spring-security-core')
implementation 'org.springframework:spring-beans'
implementation 'org.springframework:spring-context'
diff --git a/itest/web/spring-security-itest-web.gradle b/itest/web/spring-security-itest-web.gradle
index 54dd7b30f5..6b0a9940f9 100644
--- a/itest/web/spring-security-itest-web.gradle
+++ b/itest/web/spring-security-itest-web.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-test'
dependencies {
+ management platform(project(":spring-security-dependencies"))
implementation 'org.springframework:spring-context'
implementation 'org.springframework:spring-web'
diff --git a/ldap/spring-security-ldap.gradle b/ldap/spring-security-ldap.gradle
index dafcda7ddd..c9aafc3f22 100644
--- a/ldap/spring-security-ldap.gradle
+++ b/ldap/spring-security-ldap.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
+ management platform(project(":spring-security-dependencies"))
api project(':spring-security-core')
api 'org.springframework:spring-beans'
api 'org.springframework:spring-context'
diff --git a/messaging/spring-security-messaging.gradle b/messaging/spring-security-messaging.gradle
index df6d8fea16..2028b397f8 100644
--- a/messaging/spring-security-messaging.gradle
+++ b/messaging/spring-security-messaging.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
+ management platform(project(":spring-security-dependencies"))
api project(':spring-security-core')
api 'org.springframework:spring-beans'
api 'org.springframework:spring-context'
diff --git a/oauth2/oauth2-client/spring-security-oauth2-client.gradle b/oauth2/oauth2-client/spring-security-oauth2-client.gradle
index 2036737056..b264379f98 100644
--- a/oauth2/oauth2-client/spring-security-oauth2-client.gradle
+++ b/oauth2/oauth2-client/spring-security-oauth2-client.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
+ management platform(project(":spring-security-dependencies"))
api project(':spring-security-core')
api project(':spring-security-oauth2-core')
api project(':spring-security-web')
diff --git a/oauth2/oauth2-core/spring-security-oauth2-core.gradle b/oauth2/oauth2-core/spring-security-oauth2-core.gradle
index 86342f56fe..8e9ff3076d 100644
--- a/oauth2/oauth2-core/spring-security-oauth2-core.gradle
+++ b/oauth2/oauth2-core/spring-security-oauth2-core.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
+ management platform(project(":spring-security-dependencies"))
api project(':spring-security-core')
api springCoreDependency
api 'org.springframework:spring-web'
diff --git a/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle b/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle
index 1b3fc659d8..43a4d5e187 100644
--- a/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle
+++ b/oauth2/oauth2-jose/spring-security-oauth2-jose.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
+ management platform(project(":spring-security-dependencies"))
api project(':spring-security-core')
api project(':spring-security-oauth2-core')
api springCoreDependency
diff --git a/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle b/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle
index 2e3a2b4c87..d01583380f 100644
--- a/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle
+++ b/oauth2/oauth2-resource-server/spring-security-oauth2-resource-server.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
+ management platform(project(":spring-security-dependencies"))
api project(':spring-security-core')
api project(':spring-security-oauth2-core')
api project(':spring-security-web')
diff --git a/openid/spring-security-openid.gradle b/openid/spring-security-openid.gradle
index 2442afead6..82dc1ac659 100644
--- a/openid/spring-security-openid.gradle
+++ b/openid/spring-security-openid.gradle
@@ -5,6 +5,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
+ management platform(project(":spring-security-dependencies"))
api project(':spring-security-core')
api project(':spring-security-web')
api('com.google.inject:guice') {
diff --git a/remoting/spring-security-remoting.gradle b/remoting/spring-security-remoting.gradle
index 7ed258ecc4..3b62b676fc 100644
--- a/remoting/spring-security-remoting.gradle
+++ b/remoting/spring-security-remoting.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
+ management platform(project(":spring-security-dependencies"))
api project(':spring-security-core')
api 'org.springframework:spring-aop'
api 'org.springframework:spring-beans'
diff --git a/rsocket/spring-security-rsocket.gradle b/rsocket/spring-security-rsocket.gradle
index 72339b470c..64ec4dcf87 100644
--- a/rsocket/spring-security-rsocket.gradle
+++ b/rsocket/spring-security-rsocket.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
+ management platform(project(":spring-security-dependencies"))
api project(':spring-security-core')
api 'io.rsocket:rsocket-core'
optional project(':spring-security-oauth2-resource-server')
diff --git a/saml2/saml2-service-provider/core/saml2-service-provider-core.gradle b/saml2/saml2-service-provider/core/saml2-service-provider-core.gradle
index f953138415..f4c4e3fe39 100644
--- a/saml2/saml2-service-provider/core/saml2-service-provider-core.gradle
+++ b/saml2/saml2-service-provider/core/saml2-service-provider-core.gradle
@@ -34,11 +34,7 @@ repositories {
}
dependencies {
- constraints {
- management("org.opensaml:opensaml-core:3.+")
- management("org.opensaml:opensaml-saml-api:3.+")
- management("org.opensaml:opensaml-saml-impl:3.+")
- }
+ management platform(project(":spring-security-dependencies"))
api project(':spring-security-core')
api project(':spring-security-web')
diff --git a/saml2/saml2-service-provider/opensaml3/saml2-service-provider-opensaml3.gradle b/saml2/saml2-service-provider/opensaml3/saml2-service-provider-opensaml3.gradle
index e4e99292ef..8239699223 100644
--- a/saml2/saml2-service-provider/opensaml3/saml2-service-provider-opensaml3.gradle
+++ b/saml2/saml2-service-provider/opensaml3/saml2-service-provider-opensaml3.gradle
@@ -34,12 +34,7 @@ repositories {
}
dependencies {
- constraints {
- management("org.opensaml:opensaml-core:3.+")
- management("org.opensaml:opensaml-saml-api:3.+")
- management("org.opensaml:opensaml-saml-impl:3.+")
- }
-
+ management platform(project(":spring-security-dependencies"))
api project(':saml2-service-provider-core')
api("org.opensaml:opensaml-core")
diff --git a/saml2/saml2-service-provider/opensaml4/saml2-service-provider-opensaml4.gradle b/saml2/saml2-service-provider/opensaml4/saml2-service-provider-opensaml4.gradle
index 00ec92b011..ecc1a42f72 100644
--- a/saml2/saml2-service-provider/opensaml4/saml2-service-provider-opensaml4.gradle
+++ b/saml2/saml2-service-provider/opensaml4/saml2-service-provider-opensaml4.gradle
@@ -39,6 +39,7 @@ repositories {
}
dependencies {
+ management platform(project(":spring-security-dependencies"))
constraints {
management("org.opensaml:opensaml-core:4.1.0")
management("org.opensaml:opensaml-saml-api:4.1.0")
diff --git a/saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle b/saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle
index ee978368fa..04dc1db11e 100644
--- a/saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle
+++ b/saml2/saml2-service-provider/spring-security-saml2-service-provider.gradle
@@ -36,6 +36,7 @@ configurations {
}
dependencies {
+ management platform(project(":spring-security-dependencies"))
core(project(path: ":saml2-service-provider-core", configuration: 'classesOnlyElements'))
opensaml3(project(path: ":saml2-service-provider-opensaml3", configuration: 'classesOnlyElements'))
opensaml4(project(path: ":saml2-service-provider-opensaml4", configuration: 'classesOnlyElements'))
diff --git a/taglibs/spring-security-taglibs.gradle b/taglibs/spring-security-taglibs.gradle
index 6711a2e94e..c272ff3c3c 100644
--- a/taglibs/spring-security-taglibs.gradle
+++ b/taglibs/spring-security-taglibs.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
+ management platform(project(":spring-security-dependencies"))
api project(':spring-security-acl')
api project(':spring-security-core')
api project(':spring-security-web')
diff --git a/test/spring-security-test.gradle b/test/spring-security-test.gradle
index 3051a2888d..ea756801ed 100644
--- a/test/spring-security-test.gradle
+++ b/test/spring-security-test.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
+ management platform(project(":spring-security-dependencies"))
api project(':spring-security-core')
api project(':spring-security-web')
api 'org.springframework:spring-core'
diff --git a/web/spring-security-web.gradle b/web/spring-security-web.gradle
index 396a0c5336..58c3409216 100644
--- a/web/spring-security-web.gradle
+++ b/web/spring-security-web.gradle
@@ -1,6 +1,7 @@
apply plugin: 'io.spring.convention.spring-module'
dependencies {
+ management platform(project(":spring-security-dependencies"))
api project(':spring-security-core')
api springCoreDependency
api 'org.springframework:spring-aop'