diff --git a/build.gradle b/build.gradle index 24a4ee8da5..2be8b125cc 100644 --- a/build.gradle +++ b/build.gradle @@ -16,3 +16,5 @@ description = 'Spring Security' ext.snapshotBuild = version.contains("SNAPSHOT") ext.releaseBuild = version.contains("SNAPSHOT") ext.milestoneBuild = !(snapshotBuild || releaseBuild) + +dependencyManagementExport.projects = subprojects.findAll { !it.name.contains('-boot') } diff --git a/gradle.properties b/gradle.properties index ae2f413fac..ef55278ce9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,3 @@ springBootVersion=1.5.3.RELEASE version=5.0.0.BUILD-SNAPSHOT -springIoVersion=Cairo-BUILD-SNAPSHOT gaeVersion=1.9.23 diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle new file mode 100644 index 0000000000..3b5a39eb56 --- /dev/null +++ b/gradle/dependency-management.gradle @@ -0,0 +1,196 @@ +dependencyManagement { + dependencies { + dependency 'cglib:cglib-nodep:3.2.5' + dependency 'opensymphony:sitemesh:2.4.2' + dependency 'org.gebish:geb-spock:0.10.0' + dependency 'org.jasig.cas:cas-server-webapp:4.0.0' + dependency 'org.mockito:mockito-core:1.10.19' + dependency 'org.powermock:powermock-api-mockito:1.6.2' + dependency 'org.powermock:powermock-api-support:1.6.2' + dependency 'org.powermock:powermock-core:1.6.2' + dependency 'org.powermock:powermock-module-junit4-common:1.6.2' + dependency 'org.powermock:powermock-module-junit4:1.6.2' + dependency 'org.powermock:powermock-reflect:1.6.2' + 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' + } + project.configurations.matching { it.name == 'springIoTestRuntime' }.all { + springIoTestRuntime { + dependencies { + dependency 'org.mockito:mockito-core:1.10.19' + } + } + } +} + +dependencyManagement { + imports { + mavenBom 'org.springframework:spring-framework-bom:5.0.0.RC1' + mavenBom 'org.springframework.data:spring-data-releasetrain:Kay-BUILD-SNAPSHOT' + } + dependencies { + dependency 'antlr:antlr:2.7.7' + dependency 'aopalliance:aopalliance:1.0' + dependency 'asm:asm:3.1' + dependency 'bouncycastle:bcprov-jdk15:140' + dependency 'cglib:cglib-nodep:3.2.5' + 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.9.0.pr3' + dependency 'com.fasterxml.jackson.core:jackson-core:2.9.0.pr3' + dependency 'com.fasterxml.jackson.core:jackson-databind:2.9.0.pr3' + dependency 'com.fasterxml:classmate:1.3.3' + dependency 'com.github.stephenc.jcip:jcip-annotations:1.0-1' + dependency 'com.google.appengine:appengine-api-1.0-sdk:1.9.23' + dependency 'com.google.appengine:appengine-api-labs:1.9.23' + dependency 'com.google.appengine:appengine-api-stubs:1.9.23' + dependency 'com.google.appengine:appengine-testing:1.9.23' + dependency 'com.google.code.gson:gson:2.8.0' + 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:4.34.1' + dependency 'com.nimbusds:oauth2-oidc-sdk:5.21' + dependency 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1' + dependency 'commons-cli:commons-cli:1.3.1' + dependency 'commons-codec:commons-codec:1.10' + dependency 'commons-collections:commons-collections:3.2.2' + dependency 'commons-httpclient:commons-httpclient:3.1' + dependency 'commons-io:commons-io:2.5' + dependency 'commons-lang:commons-lang:2.6' + dependency 'commons-logging:commons-logging:1.2' + dependency 'dom4j:dom4j:1.6.1' + 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.1' + dependency 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.2-b02' + dependency 'javax.servlet:javax.servlet-api:3.1.0' + dependency 'javax.validation:validation-api:1.1.0.Final' + dependency 'junit:junit:4.12' + dependency 'ldapsdk:ldapsdk:4.1' + dependency 'net.bytebuddy:byte-buddy:1.6.12' + dependency 'net.java.dev.jna:jna-platform:4.1.0' + dependency 'net.java.dev.jna:jna:4.2.2' + dependency 'net.jcip:jcip-annotations:1.0' + dependency 'net.minidev:json-smart:1.3.1' + dependency 'net.sf.ehcache:ehcache:2.10.4' + dependency 'net.sourceforge.cssparser:cssparser:0.9.22' + dependency 'net.sourceforge.htmlunit:htmlunit-core-js:2.26' + dependency 'net.sourceforge.htmlunit:htmlunit:2.26' + dependency 'net.sourceforge.htmlunit:neko-htmlunit:2.25' + dependency 'net.sourceforge.nekohtml:nekohtml:1.9.22' + dependency 'nz.net.ultraq.thymeleaf:thymeleaf-expression-processor:1.1.2' + dependency 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:2.0.4' + dependency 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:2.2.1' + dependency 'ognl:ognl:3.1.12' + dependency 'org.akhikhl.gretty:gretty-runner-tomcat8:1.4.2' + dependency 'org.akhikhl.gretty:gretty-runner-tomcat:1.4.2' + dependency 'org.akhikhl.gretty:gretty-runner:1.4.2' + dependency 'org.apache.commons:commons-collections4:4.1' + dependency 'org.apache.commons:commons-exec:1.3' + dependency 'org.apache.commons:commons-lang3:3.5' + 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.3' + dependency 'org.apache.httpcomponents:httpcore:4.4.6' + 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:8.5.14' + dependency 'org.apache.tomcat.embed:tomcat-embed-el:8.5.14' + dependency 'org.apache.tomcat.embed:tomcat-embed-jasper:8.5.14' + dependency 'org.apache.tomcat.embed:tomcat-embed-logging-log4j:8.0.33' + dependency 'org.apache.tomcat.embed:tomcat-embed-websocket:8.5.14' + dependency 'org.aspectj:aspectjrt:1.8.10' + dependency 'org.aspectj:aspectjtools:1.8.10' + dependency 'org.aspectj:aspectjweaver:1.8.10' + dependency 'org.assertj:assertj-core:3.6.2' + dependency 'org.attoparser:attoparser:2.0.3.RELEASE' + dependency 'org.bouncycastle:bcpkix-jdk15on:1.56' + dependency 'org.bouncycastle:bcprov-jdk15on:1.56' + dependency 'org.codehaus.groovy:groovy-all:2.4.11' + dependency 'org.codehaus.groovy:groovy-json:2.4.11' + dependency 'org.codehaus.groovy:groovy:2.4.11' + dependency 'org.eclipse.jdt.core.compiler:ecj:4.6.1' + dependency 'org.eclipse.jetty.websocket:websocket-api:9.4.5.v20170502' + dependency 'org.eclipse.jetty.websocket:websocket-client:9.4.5.v20170502' + dependency 'org.eclipse.jetty.websocket:websocket-common:9.4.5.v20170502' + dependency 'org.eclipse.jetty:jetty-client:9.4.5.v20170502' + dependency 'org.eclipse.jetty:jetty-http:9.4.5.v20170502' + dependency 'org.eclipse.jetty:jetty-io:9.4.5.v20170502' + dependency 'org.eclipse.jetty:jetty-security:9.4.5.v20170502' + dependency 'org.eclipse.jetty:jetty-server:9.4.5.v20170502' + dependency 'org.eclipse.jetty:jetty-servlet:9.4.5.v20170502' + dependency 'org.eclipse.jetty:jetty-util:9.4.5.v20170502' + dependency 'org.eclipse.persistence:javax.persistence:2.1.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.hamcrest:hamcrest-library: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.10.Final' + dependency 'org.hibernate:hibernate-entitymanager:5.2.10.Final' + dependency 'org.hibernate:hibernate-validator:5.4.1.Final' + dependency 'org.hsqldb:hsqldb:2.4.0' + dependency 'org.jasig.cas.client:cas-client-core:3.4.1' + dependency 'org.javassist:javassist:3.21.0-GA' + 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.objenesis:objenesis:2.5.1' + dependency 'org.openid4java:openid4java-nodeps:0.9.6' + dependency 'org.seleniumhq.selenium:htmlunit-driver:2.26' + dependency 'org.seleniumhq.selenium:selenium-api:3.3.1' + dependency 'org.seleniumhq.selenium:selenium-remote-driver:3.3.1' + dependency 'org.seleniumhq.selenium:selenium-support:3.3.1' + dependency 'org.skyscreamer:jsonassert:1.5.0' + dependency 'org.slf4j:jcl-over-slf4j:1.7.25' + dependency 'org.slf4j:jul-to-slf4j:1.7.25' + dependency 'org.slf4j:log4j-over-slf4j:1.7.25' + dependency 'org.slf4j:slf4j-api:1.7.25' + dependency 'org.slf4j:slf4j-nop:1.7.12' + dependency 'org.sonatype.sisu.inject:cglib:2.2.1-v20090111' + dependency 'org.springframework.ldap:spring-ldap-core:2.3.1.RELEASE' + dependency 'org.thymeleaf:thymeleaf-spring5:3.0.5.M3' + dependency 'org.thymeleaf:thymeleaf:3.0.5.RELEASE' + dependency 'org.unbescape:unbescape:1.1.4.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' + } +} + diff --git a/gradle/dependency-management.properties b/gradle/dependency-management.properties deleted file mode 100644 index 85a1b6d3c2..0000000000 --- a/gradle/dependency-management.properties +++ /dev/null @@ -1,14 +0,0 @@ -cglib\:cglib-nodep=3.2.5 -opensymphony\:sitemesh=2.4.2 -org.gebish\:geb-spock=0.10.0 -org.jasig.cas\:cas-server-webapp=4.0.0 -org.mockito\:mockito-core=1.10.19 -org.powermock\:powermock-api-mockito=1.6.2 -org.powermock\:powermock-api-support=1.6.2 -org.powermock\:powermock-core=1.6.2 -org.powermock\:powermock-module-junit4-common=1.6.2 -org.powermock\:powermock-module-junit4=1.6.2 -org.powermock\:powermock-reflect=1.6.2 -org.python\:jython=2.5.0 -org.spockframework\:spock-core=1.0-groovy-2.4 -org.spockframework\:spock-spring=1.0-groovy-2.4 diff --git a/gradle/springio-dependency-management.properties b/gradle/springio-dependency-management.properties deleted file mode 100644 index 1fae01c03b..0000000000 --- a/gradle/springio-dependency-management.properties +++ /dev/null @@ -1 +0,0 @@ -org.mockito\:mockito-core=1.10.19 diff --git a/samples/boot/gradle/dependency-management.gradle b/samples/boot/gradle/dependency-management.gradle new file mode 100644 index 0000000000..3b92f239de --- /dev/null +++ b/samples/boot/gradle/dependency-management.gradle @@ -0,0 +1,96 @@ +dependencyManagement { + dependencies { + dependency 'aopalliance:aopalliance:1.0' + dependency 'ch.qos.logback:logback-classic:1.1.11' + dependency 'ch.qos.logback:logback-core:1.1.11' + dependency 'com.fasterxml.jackson.core:jackson-annotations:2.8.0' + dependency 'com.fasterxml.jackson.core:jackson-core:2.8.8' + dependency 'com.fasterxml.jackson.core:jackson-databind:2.8.7' + dependency 'com.fasterxml:classmate:1.3.3' + dependency 'com.github.stephenc.jcip:jcip-annotations:1.0-1' + dependency 'com.jayway.jsonpath:json-path:2.2.0' + dependency 'com.nimbusds:lang-tag:1.4.3' + dependency 'com.nimbusds:nimbus-jose-jwt:4.34.1' + dependency 'com.nimbusds:oauth2-oidc-sdk:5.21' + dependency 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1' + dependency 'commons-codec:commons-codec:1.10' + dependency 'commons-io:commons-io:2.5' + dependency 'javax.activation:activation:1.1.1' + dependency 'javax.mail:mail:1.4.7' + dependency 'javax.validation:validation-api:1.1.0.Final' + dependency 'junit:junit:4.12' + dependency 'net.minidev:accessors-smart:1.1' + dependency 'net.minidev:json-smart:2.2.1' + dependency 'net.sourceforge.cssparser:cssparser:0.9.18' + dependency 'net.sourceforge.htmlunit:htmlunit-core-js:2.17' + dependency 'net.sourceforge.htmlunit:htmlunit:2.21' + dependency 'net.sourceforge.htmlunit:neko-htmlunit:2.21' + dependency 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.4.0' + dependency 'ognl:ognl:3.0.8' + dependency 'org.apache.commons:commons-collections4:4.1' + dependency 'org.apache.commons:commons-lang3:3.5' + dependency 'org.apache.httpcomponents:httpclient:4.5.3' + dependency 'org.apache.httpcomponents:httpcore:4.4.6' + dependency 'org.apache.httpcomponents:httpmime:4.5.3' + dependency 'org.apache.tomcat.embed:tomcat-embed-core:8.5.14' + dependency 'org.apache.tomcat.embed:tomcat-embed-el:8.5.14' + dependency 'org.apache.tomcat.embed:tomcat-embed-websocket:8.5.14' + dependency 'org.assertj:assertj-core:2.6.0' + dependency 'org.bouncycastle:bcpkix-jdk15on:1.56' + dependency 'org.bouncycastle:bcprov-jdk15on:1.56' + dependency 'org.codehaus.groovy:groovy:2.4.10' + dependency 'org.eclipse.jetty.websocket:websocket-api:9.4.4.v20170414' + dependency 'org.eclipse.jetty.websocket:websocket-client:9.4.4.v20170414' + dependency 'org.eclipse.jetty.websocket:websocket-common:9.4.4.v20170414' + dependency 'org.eclipse.jetty:jetty-client:9.4.4.v20170414' + dependency 'org.eclipse.jetty:jetty-http:9.4.4.v20170414' + dependency 'org.eclipse.jetty:jetty-io:9.4.4.v20170414' + dependency 'org.eclipse.jetty:jetty-util:9.4.4.v20170414' + dependency 'org.hamcrest:hamcrest-core:1.3' + dependency 'org.hamcrest:hamcrest-library:1.3' + dependency 'org.hibernate:hibernate-validator:5.3.5.Final' + dependency 'org.javassist:javassist:3.21.0-GA' + dependency 'org.jboss.logging:jboss-logging:3.3.1.Final' + dependency 'org.mockito:mockito-core:1.10.19' + dependency 'org.objenesis:objenesis:2.5.1' + dependency 'org.ow2.asm:asm:5.0.3' + dependency 'org.skyscreamer:jsonassert:1.4.0' + dependency 'org.slf4j:jcl-over-slf4j:1.7.25' + dependency 'org.slf4j:jul-to-slf4j:1.7.25' + dependency 'org.slf4j:log4j-over-slf4j:1.7.25' + dependency 'org.slf4j:slf4j-api:1.7.25' + dependency 'org.springframework.boot:spring-boot-autoconfigure:1.5.3.RELEASE' + dependency 'org.springframework.boot:spring-boot-starter-logging:1.5.3.RELEASE' + dependency 'org.springframework.boot:spring-boot-starter-security:1.5.3.RELEASE' + dependency 'org.springframework.boot:spring-boot-starter-test:1.5.3.RELEASE' + dependency 'org.springframework.boot:spring-boot-starter-thymeleaf:1.5.3.RELEASE' + dependency 'org.springframework.boot:spring-boot-starter-tomcat:1.5.3.RELEASE' + dependency 'org.springframework.boot:spring-boot-starter-web:1.5.3.RELEASE' + dependency 'org.springframework.boot:spring-boot-starter:1.5.3.RELEASE' + dependency 'org.springframework.boot:spring-boot-test-autoconfigure:1.5.3.RELEASE' + dependency 'org.springframework.boot:spring-boot-test:1.5.3.RELEASE' + dependency 'org.springframework.boot:spring-boot:1.5.3.RELEASE' + dependency 'org.springframework.security:spring-security-config:5.0.0.BUILD-SNAPSHOT' + dependency 'org.springframework.security:spring-security-web:5.0.0.BUILD-SNAPSHOT' + dependency 'org.springframework:spring-aop:4.3.8.RELEASE' + dependency 'org.springframework:spring-beans:4.3.8.RELEASE' + dependency 'org.springframework:spring-context:4.3.8.RELEASE' + dependency 'org.springframework:spring-core:4.3.8.RELEASE' + dependency 'org.springframework:spring-expression:4.3.8.RELEASE' + dependency 'org.springframework:spring-test:4.3.8.RELEASE' + dependency 'org.springframework:spring-web:4.3.8.RELEASE' + dependency 'org.springframework:spring-webmvc:4.3.8.RELEASE' + dependency 'org.thymeleaf.extras:thymeleaf-extras-springsecurity4:2.1.3.RELEASE' + dependency 'org.thymeleaf:thymeleaf-spring4:2.1.5.RELEASE' + dependency 'org.thymeleaf:thymeleaf:2.1.5.RELEASE' + dependency 'org.unbescape:unbescape:1.1.0.RELEASE' + dependency 'org.w3c.css:sac:1.3' + dependency 'org.yaml:snakeyaml:1.17' + 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' + } +} + +