From 7bb4367cf14923a46ef384c0ea03e09d1b7f8da1 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Wed, 13 Sep 2017 08:11:18 -0500 Subject: [PATCH] Prepare Versions for Release --- .../core/SpringSecurityCoreVersion.java | 2 +- gradle/dependency-management.gradle | 54 ++++--------------- 2 files changed, 11 insertions(+), 45 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 ce66e62aad..779438a110 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.BUILD-SNAPSHOT"; + static final String MIN_SPRING_VERSION = "5.0.0.RC4"; static { performVersionChecks(); diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 5cb7dbb1bb..6b8a2004e1 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,10 +1,8 @@ -ext.springVersion = '5.0.0.BUILD-SNAPSHOT' - dependencyManagement { imports { - mavenBom 'io.projectreactor:reactor-bom:Bismuth-BUILD-SNAPSHOT' - mavenBom "org.springframework:spring-framework-bom:${springVersion}" - mavenBom 'org.springframework.data:spring-data-releasetrain:Kay-BUILD-SNAPSHOT' + mavenBom 'io.projectreactor:reactor-bom:Bismuth-M4' + mavenBom 'org.springframework:spring-framework-bom:5.0.0.RC4' + mavenBom 'org.springframework.data:spring-data-releasetrain:Kay-RC3' } dependencies { dependency 'cglib:cglib-nodep:3.2.5' @@ -28,29 +26,6 @@ dependencyManagement { springIoTestRuntime { dependencies { dependency 'org.mockito:mockito-core:1.10.19' - dependency "org.springframework:spring-aop:${springVersion}" - dependency "org.springframework:spring-aspects:${springVersion}" - dependency "org.springframework:spring-beans:${springVersion}" - dependency "org.springframework:spring-context-support:${springVersion}" - dependency "org.springframework:spring-context:${springVersion}" - dependency "org.springframework:spring-core:${springVersion}" - dependency "org.springframework:spring-expression:${springVersion}" - dependency "org.springframework:spring-instrument:${springVersion}" - dependency "org.springframework:spring-jcl:${springVersion}" - dependency "org.springframework:spring-jdbc:${springVersion}" - dependency "org.springframework:spring-messaging:${springVersion}" - dependency "org.springframework:spring-orm:${springVersion}" - dependency "org.springframework:spring-test:${springVersion}" - dependency "org.springframework:spring-tx:${springVersion}" - dependency "org.springframework:spring-web:${springVersion}" - dependency "org.springframework:spring-webflux:${springVersion}" - dependency "org.springframework:spring-webmvc:${springVersion}" - dependency "org.springframework:spring-websocket:${springVersion}" - - dependency 'io.projectreactor.ipc:reactor-ipc:0.7.0.BUILD-SNAPSHOT' - dependency 'io.projectreactor.ipc:reactor-netty:0.7.0.BUILD-SNAPSHOT' - dependency 'io.projectreactor:reactor-core:3.1.0.BUILD-SNAPSHOT' - dependency 'io.projectreactor:reactor-test:3.1.0.BUILD-SNAPSHOT' } } } @@ -62,9 +37,9 @@ dependencyManagement { 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.codeborne:phantomjsdriver:1.4.0' dependency 'com.fasterxml.jackson.core:jackson-annotations:2.9.0.pr4' dependency 'com.fasterxml.jackson.core:jackson-core:2.9.0.pr4' dependency 'com.fasterxml.jackson.core:jackson-databind:2.9.0.pr4' @@ -80,7 +55,6 @@ dependencyManagement { 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:mockwebserver:3.7.0' dependency 'com.squareup.okhttp3:okhttp:3.8.1' dependency 'com.squareup.okio:okio:1.13.0' dependency 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1' @@ -124,12 +98,10 @@ dependencyManagement { 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 'opensymphony:sitemesh:2.4.2' 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' @@ -180,7 +152,6 @@ dependencyManagement { dependency 'org.assertj:assertj-core:3.8.0' dependency 'org.attoparser:attoparser:2.0.4.RELEASE' dependency 'org.bouncycastle:bcpkix-jdk15on:1.57' - dependency 'org.bouncycastle:bcprov-jdk15on:1.50' dependency 'org.bouncycastle:bcprov-jdk15on:1.57' dependency 'org.codehaus.groovy:groovy-all:2.5.0-beta-1' dependency 'org.codehaus.groovy:groovy-json:2.5.0-beta-1' @@ -200,7 +171,6 @@ dependencyManagement { 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-spock: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' @@ -214,20 +184,18 @@ dependencyManagement { 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:1.10.19' dependency 'org.objenesis:objenesis:2.6' dependency 'org.openid4java:openid4java-nodeps:0.9.6' - 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.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-chrome-driver:3.4.0' + dependency 'org.seleniumhq.selenium:selenium-edge-driver:3.4.0' + dependency 'org.seleniumhq.selenium:selenium-firefox-driver:3.4.0' + dependency 'org.seleniumhq.selenium:selenium-ie-driver:3.4.0' + dependency 'org.seleniumhq.selenium:selenium-opera-driver:3.4.0' dependency 'org.seleniumhq.selenium:selenium-remote-driver:3.4.0' + dependency 'org.seleniumhq.selenium:selenium-safari-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' @@ -236,8 +204,6 @@ dependencyManagement { 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.spockframework:spock-core:1.0-groovy-2.4' - dependency 'org.spockframework:spock-spring:1.0-groovy-2.4' 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'