From 06d74439462bfb47f48f8c4858e95cd4542dc3cf Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Fri, 13 Dec 2019 14:52:42 -0600 Subject: [PATCH] Use Gradle platform and constraints This was largely generated from the following script wget https://github.com/spring-gradle-plugins/spring-build-conventions/blob/bd9f8eb541529a91d02debe4f4d07056f8b2b8d7/src/main/groovy/io/spring/gradle/convention/DependencySetPlugin.groovy ./dsp.gradle cat gradle/dependency-management.gradle | grep 'management "' | cut -d ':' -f 2 | xargs -I{} sh -c "rg {} -l -g '*.gradle' -g '\!dependency-management.gradle' > /dev/null || echo {}" | xargs -I{} sed -iE '/.*{}.*/d' gradle/dependency-management.gradle rm ./dps.gradle Fixes gh-7787 --- config/spring-security-config.gradle | 1 - core/spring-security-core.gradle | 4 +- gradle/dependency-management.gradle | 317 +++++++++------------------ 3 files changed, 109 insertions(+), 213 deletions(-) diff --git a/config/spring-security-config.gradle b/config/spring-security-config.gradle index f584bf8027..4acc4b332b 100644 --- a/config/spring-security-config.gradle +++ b/config/spring-security-config.gradle @@ -74,7 +74,6 @@ dependencies { exclude group: 'org.aspectj', module: 'aspectjrt' } - testRuntime 'cglib:cglib-nodep' testRuntime 'org.hsqldb:hsqldb' } diff --git a/core/spring-security-core.gradle b/core/spring-security-core.gradle index e295352291..01babf6fc5 100644 --- a/core/spring-security-core.gradle +++ b/core/spring-security-core.gradle @@ -36,7 +36,7 @@ dependencies { task springVersion(type: versions.VersionsResourceTasks) { versionsFile = file("${buildDir}/versions/spring-security.versions") - versions = provider { project.dependencyManagement.managedVersions } + versions = provider { ["org.springframework:spring-core":"$springVersion"] } } tasks.processResources { @@ -52,6 +52,6 @@ tasks.sourcesJar.from {includeProject.sourceSets.main.java} configure(project.tasks.withType(Test)) { doFirst { systemProperties['springSecurityVersion'] = version - systemProperties['springVersion'] = project.dependencyManagement.managedVersions['org.springframework:spring-core'] + systemProperties['springVersion'] = springVersion } } diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 7116537c80..aa3b13c1c0 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,222 +1,119 @@ -if (!project.hasProperty('reactorVersion')) { - ext.reactorVersion = 'Dysprosium-SR1' +if (!project.hasProperty("reactorVersion")) { + ext.reactorVersion = "Dysprosium-SR1" } -if (!project.hasProperty('springVersion')) { - ext.springVersion = '5.2.1.RELEASE' +if (!project.hasProperty("springVersion")) { + ext.springVersion = "5.2.1.RELEASE" } -if (!project.hasProperty('springDataVersion')) { - ext.springDataVersion = 'Moore-SR1' +if (!project.hasProperty("springDataVersion")) { + ext.springDataVersion = "Moore-SR1" } +ext.rsocketVersion = "1.0.0-RC5" -ext.rsocketVersion = '1.0.0-RC5' - -dependencyManagement { - imports { - mavenBom "io.projectreactor:reactor-bom:${reactorVersion}" - mavenBom "org.springframework:spring-framework-bom:${springVersion}" - mavenBom "org.springframework.data:spring-data-releasetrain:${springDataVersion}" +// https://github.com/gradle/gradle/issues/7576#issuecomment-434637595 +configurations { + management { + canBeResolved false + canBeConsumed false } - dependencies { - dependency 'cglib:cglib-nodep:3.3.0' - dependency 'com.squareup.okhttp3:mockwebserver:3.14.2' - dependency 'opensymphony:sitemesh:2.4.2' - dependency 'org.gebish:geb-spock:0.10.0' - dependency 'org.jasig.cas:cas-server-webapp:4.2.7' - dependency 'org.powermock:powermock-api-mockito2:2.0.4' - dependency 'org.powermock:powermock-api-support:2.0.4' - dependency 'org.powermock:powermock-core:2.0.4' - dependency 'org.powermock:powermock-module-junit4-common:2.0.4' - dependency 'org.powermock:powermock-module-junit4:2.0.4' - dependency 'org.powermock:powermock-reflect:2.0.4' - dependency 'org.python:jython:2.5.0' - dependency 'org.spockframework:spock-core:1.0-groovy-2.4' - dependency 'org.spockframework:spock-spring:1.0-groovy-2.4' +} +configurations.all { + if (canBeResolved) { + extendsFrom(configurations.management) } } -dependencyManagement { - dependencies { - dependency 'antlr:antlr:2.7.7' - dependency 'asm:asm:3.1' - dependency 'ch.qos.logback:logback-classic:1.2.3' - dependency 'ch.qos.logback:logback-core:1.2.3' - dependency 'com.fasterxml.jackson.core:jackson-annotations:2.10.0' - dependency 'com.fasterxml.jackson.core:jackson-core:2.10.0' - dependency 'com.fasterxml.jackson.core:jackson-databind:2.10.0' - dependency 'com.fasterxml:classmate:1.3.4' - dependency 'com.github.stephenc.jcip:jcip-annotations:1.0-1' - dependency 'com.google.appengine:appengine-api-1.0-sdk:$gaeVersion' - dependency 'com.google.appengine:appengine-api-labs:$gaeVersion' - dependency 'com.google.appengine:appengine-api-stubs:$gaeVersion' - dependency 'com.google.appengine:appengine-testing:$gaeVersion' - dependency 'com.google.appengine:appengine:$gaeVersion' - dependency 'com.google.code.gson:gson:2.8.2' - dependency 'com.google.guava:guava:20.0' - dependency 'com.google.inject:guice:3.0' - dependency 'com.nimbusds:lang-tag:1.4.3' - dependency 'com.nimbusds:nimbus-jose-jwt:8.3' - dependency 'com.nimbusds:oauth2-oidc-sdk:6.14' - dependency 'com.squareup.okhttp3:okhttp:3.14.1' - dependency 'com.squareup.okio:okio:1.13.0' - dependency 'com.sun.xml.bind:jaxb-core:2.3.0.1' - dependency 'com.sun.xml.bind:jaxb-impl:2.3.2' - dependency 'com.unboundid:unboundid-ldapsdk:4.0.12' - dependency 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1' - dependency 'commons-cli:commons-cli:1.4' - dependency 'commons-codec:commons-codec:1.13' - dependency 'commons-collections:commons-collections:3.2.2' - dependency 'commons-httpclient:commons-httpclient:3.1' - dependency 'commons-io:commons-io:2.6' - dependency 'commons-lang:commons-lang:2.6' - dependency 'commons-logging:commons-logging:1.2' - dependency 'dom4j:dom4j:1.6.1' - dependency 'io.projectreactor.tools:blockhound:1.0.1.RELEASE' - dependency "io.rsocket:rsocket-core:${rsocketVersion}" - dependency "io.rsocket:rsocket-transport-netty:${rsocketVersion}" - dependency 'javax.activation:activation:1.1.1' - dependency 'javax.annotation:jsr250-api:1.0' - dependency 'javax.inject:javax.inject:1' - dependency 'javax.mail:mail:1.4.7' - dependency 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.2' - dependency 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.3' - dependency 'javax.servlet:javax.servlet-api:4.0.1' - dependency 'javax.validation:validation-api:2.0.1.Final' - dependency 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359' - dependency 'junit:junit:4.12' - dependency 'ldapsdk:ldapsdk:4.1' - dependency 'net.bytebuddy:byte-buddy-agent:1.9.10' - dependency 'net.bytebuddy:byte-buddy:1.9.10' - dependency 'net.jcip:jcip-annotations:1.0' - dependency 'net.minidev:accessors-smart:1.2' - dependency 'net.minidev:json-smart:2.3' - dependency 'net.sf.ehcache:ehcache:2.10.6' - dependency 'net.sourceforge.htmlunit:htmlunit:2.36.0' - dependency 'net.sourceforge.htmlunit:neko-htmlunit:2.34.0' - dependency 'net.sourceforge.nekohtml:nekohtml:1.9.22' - dependency 'nz.net.ultraq.thymeleaf:thymeleaf-expression-processor:1.1.3' - dependency 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:2.4.1' - dependency 'ognl:ognl:3.1.12' - dependency 'org.gretty:gretty-runner-jetty7:2.3.1' - dependency 'org.gretty:gretty-runner-jetty8:2.3.1' - dependency 'org.gretty:gretty-runner-jetty9:2.3.1' - dependency 'org.gretty:gretty-runner-jetty93:2.3.1' - dependency 'org.gretty:gretty-runner-jetty94:2.3.1' - dependency 'org.gretty:gretty-runner-tomcat7:2.3.1' - dependency 'org.gretty:gretty-runner-tomcat8:2.3.1' - dependency 'org.gretty:gretty-runner-tomcat85:2.3.1' - dependency 'org.gretty:gretty-runner-tomcat9:2.3.1' - dependency 'org.gretty:gretty-starter:2.3.1' - dependency 'org.apache.commons:commons-collections4:4.1' - dependency 'org.apache.commons:commons-exec:1.3' - dependency 'org.apache.commons:commons-lang3:3.7' - dependency 'org.apache.commons:commons-text:1.1' - dependency 'org.apache.directory.server:apacheds-bootstrap-extract:1.5.5' - dependency 'org.apache.directory.server:apacheds-bootstrap-partition:1.5.5' - dependency 'org.apache.directory.server:apacheds-core-avl:1.5.5' - dependency 'org.apache.directory.server:apacheds-core-constants:1.5.5' - dependency 'org.apache.directory.server:apacheds-core-entry:1.5.5' - dependency 'org.apache.directory.server:apacheds-core-jndi:1.5.5' - dependency 'org.apache.directory.server:apacheds-core-shared:1.5.5' - dependency 'org.apache.directory.server:apacheds-core:1.5.5' - dependency 'org.apache.directory.server:apacheds-jdbm-store:1.5.5' - dependency 'org.apache.directory.server:apacheds-jdbm:1.5.5' - dependency 'org.apache.directory.server:apacheds-kerberos-shared:1.5.5' - dependency 'org.apache.directory.server:apacheds-protocol-ldap:1.5.5' - dependency 'org.apache.directory.server:apacheds-protocol-shared:1.5.5' - dependency 'org.apache.directory.server:apacheds-schema-bootstrap:1.5.5' - dependency 'org.apache.directory.server:apacheds-schema-extras:1.5.5' - dependency 'org.apache.directory.server:apacheds-schema-registries:1.5.5' - dependency 'org.apache.directory.server:apacheds-server-jndi:1.5.5' - dependency 'org.apache.directory.server:apacheds-utils:1.5.5' - dependency 'org.apache.directory.server:apacheds-xdbm-base:1.5.5' - dependency 'org.apache.directory.server:apacheds-xdbm-search:1.5.5' - dependency 'org.apache.directory.server:apacheds-xdbm-tools:1.5.5' - dependency 'org.apache.directory.shared:shared-asn1-codec:0.9.15' - dependency 'org.apache.directory.shared:shared-asn1:0.9.15' - dependency 'org.apache.directory.shared:shared-cursor:0.9.15' - dependency 'org.apache.directory.shared:shared-ldap-constants:0.9.15' - dependency 'org.apache.directory.shared:shared-ldap:0.9.15' - dependency 'org.apache.httpcomponents:httpclient:4.5.10' - dependency 'org.apache.httpcomponents:httpcore:4.4.8' - dependency 'org.apache.httpcomponents:httpmime:4.5.3' - dependency 'org.apache.mina:mina-core:2.0.0-M6' - dependency 'org.apache.taglibs:taglibs-standard-impl:1.2.5' - dependency 'org.apache.taglibs:taglibs-standard-jstlel:1.2.5' - dependency 'org.apache.taglibs:taglibs-standard-spec:1.2.5' - dependency 'org.apache.tomcat.embed:tomcat-embed-core:9.0.24' - dependency 'org.apache.tomcat.embed:tomcat-embed-el:9.0.24' - dependency 'org.apache.tomcat.embed:tomcat-embed-jasper:9.0.24' - dependency 'org.apache.tomcat.embed:tomcat-embed-logging-log4j:9.0.24' - dependency 'org.apache.tomcat.embed:tomcat-embed-websocket:8.5.23' - dependency 'org.apache.tomcat:tomcat-annotations-api:9.0.24' - dependency "org.aspectj:aspectjrt:$aspectjVersion" - dependency "org.aspectj:aspectjtools:$aspectjVersion" - dependency "org.aspectj:aspectjweaver:$aspectjVersion" - dependency 'org.assertj:assertj-core:3.12.2' - dependency 'org.attoparser:attoparser:2.0.4.RELEASE' - dependency 'org.bouncycastle:bcpkix-jdk15on:1.64' - dependency 'org.bouncycastle:bcprov-jdk15on:1.64' - dependency 'org.codehaus.groovy:groovy-all:2.4.17' - dependency 'org.codehaus.groovy:groovy-json:2.4.17' - dependency 'org.codehaus.groovy:groovy:2.4.17' - dependency 'org.eclipse.jdt:ecj:3.12.3' - dependency 'org.eclipse.jetty.websocket:websocket-api:9.4.19.v20190610' - dependency 'org.eclipse.jetty.websocket:websocket-client:9.4.19.v20190610' - dependency 'org.eclipse.jetty.websocket:websocket-common:9.4.19.v20190610' - dependency 'org.eclipse.jetty:jetty-client:9.4.19.v20190610' - dependency 'org.eclipse.jetty:jetty-http:9.4.19.v20190610' - dependency 'org.eclipse.jetty:jetty-io:9.4.19.v20190610' - dependency 'org.eclipse.jetty:jetty-security:9.4.19.v20190610' - dependency 'org.eclipse.jetty:jetty-server:9.4.19.v20190610' - dependency 'org.eclipse.jetty:jetty-servlet:9.4.19.v20190610' - dependency 'org.eclipse.jetty:jetty-util:9.4.19.v20190610' - dependency 'org.eclipse.jetty:jetty-xml:9.4.19.v20190610' - dependency 'org.eclipse.persistence:javax.persistence:2.2.1' - dependency 'org.gebish:geb-ast:0.10.0' - dependency 'org.gebish:geb-core:0.10.0' - dependency 'org.gebish:geb-implicit-assertions:0.10.0' - dependency 'org.gebish:geb-waiting:0.10.0' - dependency 'org.hamcrest:hamcrest-core:1.3' - dependency 'org.hibernate.common:hibernate-commons-annotations:5.0.1.Final' - dependency 'org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Final' - dependency 'org.hibernate:hibernate-core:5.2.17.Final' - dependency 'org.hibernate:hibernate-entitymanager:5.4.8.Final' - dependency 'org.hibernate:hibernate-validator:6.1.0.Final' - dependency 'org.hsqldb:hsqldb:2.5.0' - dependency 'org.jasig.cas.client:cas-client-core:3.5.1' - dependency 'org.javassist:javassist:3.22.0-CR2' - dependency 'org.jboss.logging:jboss-logging:3.3.1.Final' - dependency 'org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final' - dependency 'org.jboss:jandex:2.0.3.Final' - dependency 'org.mockito:mockito-core:3.0.0' - dependency 'org.objenesis:objenesis:2.6' - dependency 'org.openid4java:openid4java-nodeps:0.9.6' - dependency 'org.opensaml:opensaml-core:3.4.3' - dependency 'org.opensaml:opensaml-saml-api:3.4.3' - dependency 'org.opensaml:opensaml-saml-impl:3.4.3' - dependency 'org.ow2.asm:asm:6.2.1' - dependency 'org.reactivestreams:reactive-streams:1.0.1' - dependency 'org.seleniumhq.selenium:htmlunit-driver:2.36.0' - dependency 'org.seleniumhq.selenium:selenium-java:3.141.59' - dependency 'org.seleniumhq.selenium:selenium-support:3.141.59' - dependency 'org.seleniumhq.selenium:selenium-api:3.141.59' - dependency 'org.skyscreamer:jsonassert:1.5.0' - dependency 'org.slf4j:jcl-over-slf4j:1.7.28' - dependency 'org.slf4j:jul-to-slf4j:1.7.28' - dependency 'org.slf4j:log4j-over-slf4j:1.7.28' - dependency 'org.slf4j:slf4j-api:1.7.28' - dependency 'org.slf4j:slf4j-nop:1.7.28' - dependency 'org.sonatype.sisu.inject:cglib:2.2.1-v20090111' - dependency 'org.springframework.ldap:spring-ldap-core:2.3.2.RELEASE' - dependency 'org.synchronoss.cloud:nio-multipart-parser:1.1.0' - dependency 'org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE' - dependency 'org.unbescape:unbescape:1.1.5.RELEASE' - dependency 'org.w3c.css:sac:1.3' - dependency 'xalan:serializer:2.7.2' - dependency 'xalan:xalan:2.7.2' - dependency 'xerces:xercesImpl:2.11.0' - dependency 'xml-apis:xml-apis:1.4.01' +dependencies { + management platform("org.springframework:spring-framework-bom:$springVersion") + management platform("io.projectreactor:reactor-bom:$reactorVersion") + management platform("org.springframework.data:spring-data-releasetrain:$springDataVersion") + constraints { + management "ch.qos.logback:logback-classic:1.2.3" + management "com.fasterxml.jackson.core:jackson-databind:2.10.0" + management "com.google.appengine:appengine-api-1.0-sdk:$gaeVersion" + management "com.google.appengine:appengine-api-labs:$gaeVersion" + management "com.google.appengine:appengine-api-stubs:$gaeVersion" + management "com.google.appengine:appengine-testing:$gaeVersion" + management "com.google.appengine:appengine:$gaeVersion" + management "com.google.inject:guice:3.0" + management "com.nimbusds:nimbus-jose-jwt:7.8.1" + management "com.nimbusds:oauth2-oidc-sdk:6.14" + management "com.squareup.okhttp3:mockwebserver:3.14.2" + management "com.squareup.okhttp3:okhttp:3.14.1" + management "com.sun.xml.bind:jaxb-core:2.3.0.1" + management "com.sun.xml.bind:jaxb-impl:2.3.2" + management "com.unboundid:unboundid-ldapsdk:4.0.12" + management "commons-codec:commons-codec:1.13" + management "commons-collections:commons-collections:3.2.2" + management "commons-httpclient:commons-httpclient:3.1" + management "commons-logging:commons-logging:1.2" + management "io.projectreactor.tools:blockhound:1.0.1.RELEASE" + management "io.rsocket:rsocket-core:${rsocketVersion}" + management "io.rsocket:rsocket-transport-netty:${rsocketVersion}" + management "javax.annotation:jsr250-api:1.0" + management "javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.2" + management "javax.servlet.jsp:javax.servlet.jsp-api:2.3.3" + management "javax.servlet:javax.servlet-api:4.0.1" + management "javax.validation:validation-api:2.0.1.Final" + management "javax.xml.bind:jaxb-api:2.4.0-b180830.0359" + management "junit:junit:4.12" + management "ldapsdk:ldapsdk:4.1" + management "net.sf.ehcache:ehcache:2.10.6" + management "net.sourceforge.htmlunit:htmlunit:2.36.0" + management "net.sourceforge.nekohtml:nekohtml:1.9.22" + management "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:2.4.1" + management "opensymphony:sitemesh:+" + management "org.apache.directory.server:apacheds-core-entry:1.5.5" + management "org.apache.directory.server:apacheds-core:1.5.5" + management "org.apache.directory.server:apacheds-protocol-ldap:1.5.5" + management "org.apache.directory.server:apacheds-protocol-shared:1.5.5" + management "org.apache.directory.server:apacheds-server-jndi:1.5.5" + management "org.apache.directory.shared:shared-ldap:0.9.15" + management "org.apache.httpcomponents:httpclient:4.5.10" + management "org.apache.taglibs:taglibs-standard-jstlel:1.2.5" + management "org.aspectj:aspectjrt:$aspectjVersion" + management "org.aspectj:aspectjtools:$aspectjVersion" + management "org.aspectj:aspectjweaver:$aspectjVersion" + management "org.assertj:assertj-core:3.12.2" + management "org.bouncycastle:bcpkix-jdk15on:1.64" + management "org.bouncycastle:bcprov-jdk15on:1.64" + management "org.codehaus.groovy:groovy-all:2.4.17" + management "org.codehaus.groovy:groovy:2.4.17" + management "org.eclipse.jetty:jetty-server:9.4.19.v20190610" + management "org.eclipse.jetty:jetty-servlet:9.4.19.v20190610" + management "org.eclipse.persistence:javax.persistence:2.2.1" + management "org.gebish:geb-spock:0.10.0" + management "org.hibernate:hibernate-entitymanager:5.4.8.Final" + management "org.hibernate:hibernate-validator:6.1.0.Final" + management "org.hsqldb:hsqldb:2.5.0" + management "org.jasig.cas.client:cas-client-core:3.5.1" + management "org.jasig.cas:cas-server-webapp:4.2.7" + management "org.javassist:javassist:3.22.0-CR2" + management "org.mockito:mockito-core:3.0.0" + management "org.openid4java:openid4java-nodeps:0.9.6" + management "org.opensaml:opensaml-core:3.4.3" + management "org.opensaml:opensaml-saml-api:3.4.3" + management "org.opensaml:opensaml-saml-impl:3.4.3" + management "org.powermock:powermock-api-mockito2:2.0.4" + management "org.powermock:powermock-api-support:2.0.4" + management "org.powermock:powermock-core:2.0.4" + management "org.powermock:powermock-module-junit4-common:2.0.4" + management "org.powermock:powermock-module-junit4:2.0.4" + management "org.powermock:powermock-reflect:2.0.4" + management "org.python:jython:2.5.0" + management "org.seleniumhq.selenium:htmlunit-driver:2.36.0" + management "org.seleniumhq.selenium:selenium-java:3.141.59" + management "org.seleniumhq.selenium:selenium-support:3.141.59" + management "org.skyscreamer:jsonassert:1.5.0" + management "org.slf4j:jcl-over-slf4j:1.7.28" + management "org.slf4j:log4j-over-slf4j:1.7.28" + management "org.slf4j:slf4j-api:1.7.28" + management "org.sonatype.sisu.inject:cglib:2.2.1-v20090111" + management "org.spockframework:spock-core:1.0-groovy-2.4" + management "org.spockframework:spock-spring:1.0-groovy-2.4" + management "org.springframework.ldap:spring-ldap-core:2.3.2.RELEASE" + management "org.synchronoss.cloud:nio-multipart-parser:1.1.0" + management "org.thymeleaf:thymeleaf-spring5:3.0.11.RELEASE" } }