From fb632624d234cd85d367a036606c032edd1d14f6 Mon Sep 17 00:00:00 2001 From: Rob Winch Date: Sun, 29 Oct 2017 14:16:01 -0500 Subject: [PATCH] Update dependency versions Fixes gh-4739 --- gradle.properties | 2 +- gradle/dependency-management.gradle | 24 +++++++++---------- .../spring-security-samples-xml-gae.gradle | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index 0d66f33fc4..55bccbad25 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -gaeVersion=1.9.57 +gaeVersion=1.9.58 springBootVersion=2.0.0.M5 version=5.0.0.BUILD-SNAPSHOT diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index f07b0db38c..890f5cd647 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,8 +1,8 @@ dependencyManagement { imports { - mavenBom 'io.projectreactor:reactor-bom:Bismuth-BUILD-SNAPSHOT' - mavenBom 'org.springframework.data:spring-data-releasetrain:Kay-BUILD-SNAPSHOT' + mavenBom 'io.projectreactor:reactor-bom:Bismuth-SR3' mavenBom 'org.springframework:spring-framework-bom:5.0.1.RELEASE' + mavenBom 'org.springframework.data:spring-data-releasetrain:Kay-SR1' } dependencies { dependency 'cglib:cglib-nodep:3.2.5' @@ -10,7 +10,7 @@ dependencyManagement { 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:2.10.0' + dependency 'org.mockito:mockito-core:2.11.0' dependency 'org.powermock:powermock-api-mockito2:2.0.0-beta.5' dependency 'org.powermock:powermock-api-support:2.0.0-beta.5' dependency 'org.powermock:powermock-core:2.0.0-beta.5' @@ -34,7 +34,7 @@ dependencyManagement { dependency 'com.codeborne:phantomjsdriver:1.4.0' dependency 'com.fasterxml.jackson.core:jackson-annotations:2.9.1' dependency 'com.fasterxml.jackson.core:jackson-core:2.9.1' - dependency 'com.fasterxml.jackson.core:jackson-databind:2.9.1' + dependency 'com.fasterxml.jackson.core:jackson-databind:2.9.2' 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' @@ -51,7 +51,7 @@ dependencyManagement { dependency 'com.squareup.okio:okio:1.13.0' dependency 'com.vaadin.external.google:android-json:0.0.20131108.vaadin1' dependency 'commons-cli:commons-cli:1.4' - dependency 'commons-codec:commons-codec:1.10' + dependency 'commons-codec:commons-codec:1.11' dependency 'commons-collections:commons-collections:3.2.2' dependency 'commons-httpclient:commons-httpclient:3.1' dependency 'commons-io:commons-io:2.5' @@ -75,7 +75,7 @@ dependencyManagement { 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.servlet:javax.servlet-api:4.0.0' dependency 'javax.validation:validation-api:2.0.0.Final' dependency 'junit:junit:4.12' dependency 'ldapsdk:ldapsdk:4.1' @@ -137,9 +137,9 @@ dependencyManagement { dependency 'org.apache.tomcat.embed:tomcat-embed-jasper:8.5.16' dependency 'org.apache.tomcat.embed:tomcat-embed-logging-log4j:8.0.33' dependency 'org.apache.tomcat.embed:tomcat-embed-websocket:8.5.16' - dependency 'org.aspectj:aspectjrt:1.8.11' - dependency 'org.aspectj:aspectjtools:1.8.11' - dependency 'org.aspectj:aspectjweaver:1.8.11' + dependency 'org.aspectj:aspectjrt:1.8.12' + dependency 'org.aspectj:aspectjtools:1.8.12' + dependency 'org.aspectj:aspectjweaver:1.8.12' dependency 'org.assertj:assertj-core:3.8.0' dependency 'org.attoparser:attoparser:2.0.4.RELEASE' dependency 'org.bouncycastle:bcpkix-jdk15on:1.58' @@ -158,7 +158,7 @@ dependencyManagement { 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.eclipse.persistence:javax.persistence:2.2.0' 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' @@ -167,8 +167,8 @@ dependencyManagement { 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.11.Final' - dependency 'org.hibernate:hibernate-validator:6.0.2.Final' + dependency 'org.hibernate:hibernate-entitymanager:5.2.12.Final' + dependency 'org.hibernate:hibernate-validator:6.0.4.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' diff --git a/samples/xml/gae/spring-security-samples-xml-gae.gradle b/samples/xml/gae/spring-security-samples-xml-gae.gradle index 5eecb2adf6..32a6f826f9 100644 --- a/samples/xml/gae/spring-security-samples-xml-gae.gradle +++ b/samples/xml/gae/spring-security-samples-xml-gae.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.3' + classpath 'com.google.cloud.tools:appengine-gradle-plugin:1.3.4' } }