From 37011720c9bd8ce6313222a8385e61a190b7b65d Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Tue, 20 Jun 2017 16:16:49 -0500 Subject: [PATCH] Update to latest Spring IO Cairo SNAPSHOT Fixes gh-4407 --- .../core/SpringSecurityCoreVersion.java | 2 +- gradle.properties | 3 +- gradle/dependency-management.gradle | 190 ------------------ 3 files changed, 3 insertions(+), 192 deletions(-) diff --git a/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java b/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java index c05d2da188..ce66e62aad 100644 --- a/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java +++ b/core/src/main/java/org/springframework/security/core/SpringSecurityCoreVersion.java @@ -40,7 +40,7 @@ public class SpringSecurityCoreVersion { */ public static final long SERIAL_VERSION_UID = 500L; - static final String MIN_SPRING_VERSION = "5.0.0.RC2"; + static final String MIN_SPRING_VERSION = "5.0.0.BUILD-SNAPSHOT"; static { performVersionChecks(); diff --git a/gradle.properties b/gradle.properties index cbb3d75d55..3898f0c240 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,4 @@ gaeVersion=1.9.23 -springBootVersion=2.0.0.M1 +springBootVersion=2.0.0.M2 +springIoVersion=Cairo-BUILD-SNAPSHOT version=5.0.0.BUILD-SNAPSHOT diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index b4ac03351a..8e6e0e2a2b 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -25,193 +25,3 @@ dependencyManagement { } } -dependencyManagement { - imports { - mavenBom 'org.springframework:spring-framework-bom:5.0.0.RC2' - mavenBom 'org.springframework.data:spring-data-releasetrain:Kay-M4' - } -} - -dependencyManagement { - dependencies { - dependency 'antlr:antlr:2.7.7' - dependency 'aopalliance:aopalliance:1.0' - dependency 'asm:asm:3.1' - dependency 'bouncycastle:bcprov-jdk15:140' - 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.1' - 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.squareup.okhttp3:okhttp:3.7.0' - dependency 'com.squareup.okio:okio:1.12.0' - 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 'io.netty:netty-buffer:4.1.12.Final' - dependency 'io.netty:netty-codec-http:4.1.12.Final' - dependency 'io.netty:netty-codec-socks:4.1.12.Final' - dependency 'io.netty:netty-codec:4.1.12.Final' - dependency 'io.netty:netty-common:4.1.12.Final' - dependency 'io.netty:netty-handler-proxy:4.1.12.Final' - dependency 'io.netty:netty-handler:4.1.12.Final' - dependency 'io.netty:netty-resolver:4.1.12.Final' - dependency 'io.netty:netty-transport-native-epoll:4.1.12.Final' - dependency 'io.netty:netty-transport-native-unix-common:4.1.12.Final' - dependency 'io.netty:netty-transport:4.1.12.Final' - dependency 'io.projectreactor.ipc:reactor-ipc:0.6.2.RELEASE' - dependency 'io.projectreactor.ipc:reactor-netty:0.6.4.RELEASE' - dependency 'io.projectreactor:reactor-core:3.1.0.M2' - dependency 'io.projectreactor:reactor-test:3.1.0.M2' - 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.14' - dependency 'net.java.dev.jna:jna-platform:4.1.0' - dependency 'net.java.dev.jna:jna:4.4.0' - 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.23' - dependency 'net.sourceforge.htmlunit:htmlunit-core-js:2.27' - dependency 'net.sourceforge.htmlunit:htmlunit:2.27' - dependency 'net.sourceforge.htmlunit:neko-htmlunit:2.27' - dependency 'net.sourceforge.nekohtml:nekohtml:1.9.22' - dependency 'nz.net.ultraq.thymeleaf:thymeleaf-expression-processor:1.1.1' - dependency 'nz.net.ultraq.thymeleaf:thymeleaf-expression-processor:1.1.3' - dependency 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:2.0.4' - dependency 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:2.2.2' - 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.15' - dependency 'org.apache.tomcat.embed:tomcat-embed-el:8.5.15' - dependency 'org.apache.tomcat.embed:tomcat-embed-jasper:8.5.15' - dependency 'org.apache.tomcat.embed:tomcat-embed-logging-log4j:8.0.33' - dependency 'org.apache.tomcat.embed:tomcat-embed-websocket:8.5.15' - 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.8.0' - dependency 'org.attoparser:attoparser:2.0.4.RELEASE' - dependency 'org.bouncycastle:bcpkix-jdk15on:1.56' - dependency 'org.bouncycastle:bcprov-jdk15on:1.50' - 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:ecj:3.12.3' - dependency 'org.eclipse.jetty.websocket:websocket-api:9.4.6.v20170531' - dependency 'org.eclipse.jetty.websocket:websocket-client:9.4.6.v20170531' - dependency 'org.eclipse.jetty.websocket:websocket-common:9.4.6.v20170531' - dependency 'org.eclipse.jetty:jetty-client:9.4.6.v20170531' - dependency 'org.eclipse.jetty:jetty-http:9.4.6.v20170531' - dependency 'org.eclipse.jetty:jetty-io:9.4.6.v20170531' - dependency 'org.eclipse.jetty:jetty-security:9.4.6.v20170531' - dependency 'org.eclipse.jetty:jetty-server:9.4.6.v20170531' - dependency 'org.eclipse.jetty:jetty-servlet:9.4.6.v20170531' - dependency 'org.eclipse.jetty:jetty-util:9.4.6.v20170531' - 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.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.reactivestreams:reactive-streams:1.0.0' - dependency 'org.seleniumhq.selenium:htmlunit-driver:2.27' - dependency 'org.seleniumhq.selenium:selenium-api:3.4.0' - dependency 'org.seleniumhq.selenium:selenium-remote-driver:3.4.0' - dependency 'org.seleniumhq.selenium:selenium-support:3.4.0' - 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.6.M4' - dependency 'org.thymeleaf:thymeleaf:3.0.6.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' - } -}