From 0923d63685d34e8724fc568815c11ad837f6a6e3 Mon Sep 17 00:00:00 2001 From: John Blum Date: Fri, 16 Jun 2017 09:02:52 -0700 Subject: [PATCH] Upgrade to Spring-Build-Conventions (Gradle) 0.0.2.RELEASE. Upgrade to Spring Framework 5.0.0.RC2. Upgrade to Spring Boot 2.0.0.M2. Set Spring Data GemFire version to 2.0.0.M4. Set Spring Data Geode version to 1.0.0.INCUBATING-RELEASE. Upgrade to Spring Data Release Train Kay M4. Upgrade to Spring Security 5.0.0.M2. Set Apache Geode version to 1.1.1. Clean up dependencies in gradle/dependency-management.gradle. --- build.gradle | 4 +- gradle.properties | 16 ++-- gradle/dependency-management.gradle | 112 ++++++++-------------------- 3 files changed, 41 insertions(+), 91 deletions(-) diff --git a/build.gradle b/build.gradle index f6c95db..500976e 100644 --- a/build.gradle +++ b/build.gradle @@ -1,10 +1,10 @@ buildscript { dependencies { - classpath 'io.spring.gradle:spring-build-conventions:0.0.2.BUILD-SNAPSHOT' + classpath 'io.spring.gradle:spring-build-conventions:0.0.2.RELEASE' classpath "org.springframework.boot:spring-boot-gradle-plugin:$springBootVersion" } repositories { - maven { url 'https://repo.spring.io/libs-snapshot' } + maven { url 'https://repo.spring.io/libs-release' } maven { url 'https://repo.spring.io/plugins-snapshot' } } } diff --git a/gradle.properties b/gradle.properties index 41f2b26..aae11d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,15 +1,17 @@ -apacheGeodeVersion=1.2.0-SNAPSHOT +#apacheGeodeVersion=1.2.0-SNAPSHOT +apacheGeodeVersion=1.1.1 assertjVersion=3.8.0 junitVersion=4.12 mockitoVersion=2.8.9 multithreadedtcVersion=1.01 pivotalGemFireVersion=9.0.4 -springVersion=5.0.0.RC1 -springBootVersion=2.0.0.M1 -springDataGemFireVersion=2.0.0.M3 -springDataGeodeVersion=2.0.0.BUILD-SNAPSHOT -springDataReleaseTrainVersion=Kay-M3 +springVersion=5.0.0.RC2 +springBootVersion=2.0.0.M2 +springDataGemFireVersion=2.0.0.M4 +#springDataGeodeVersion=2.0.0.BUILD-SNAPSHOT +springDataGeodeVersion=1.0.0.INCUBATING-RELEASE +springDataReleaseTrainVersion=Kay-M4 springIoVersion=Cairo-BUILD-SNAPSHOT -springSecurityVersion=5.0.0.M1 +springSecurityVersion=5.0.0.M2 springShellVersion=1.2.0.RELEASE version=2.0.0.BUILD-SNAPSHOT diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index 78524ad..e51b488 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,37 +1,44 @@ -dependencyManagement { - dependencies { - dependency 'com.maxmind.geoip2:geoip2:2.3.1' - dependency "edu.umd.cs.mtc:multithreadedtc:$multithreadedtcVersion" - dependency "org.springframework.shell:spring-shell:$springShellVersion" - dependency 'org.webjars:bootstrap:2.3.2' - dependency 'org.webjars:html5shiv:3.7.3' - dependency 'org.webjars:knockout:2.3.0' - dependency 'org.webjars:sockjs-client:0.3.4' - dependency 'org.webjars:stomp-websocket:2.3.0' - dependency 'org.webjars:webjars-taglib:0.3' - } -} - dependencyManagement { imports { mavenBom "org.springframework:spring-framework-bom:$springVersion" mavenBom "org.springframework.data:spring-data-releasetrain:$springDataReleaseTrainVersion" mavenBom "org.springframework.security:spring-security-bom:$springSecurityVersion" } + dependencies { + dependency "edu.umd.cs.mtc:multithreadedtc:$multithreadedtcVersion" + dependency "junit:junit:$junitVersion" + dependency "org.apache.geode:geode-core:$apacheGeodeVersion" + dependency "org.apache.geode:geode-cq:$apacheGeodeVersion" + dependency "org.apache.geode:geode-wan:$apacheGeodeVersion" + dependency 'org.hamcrest:hamcrest-core:1.3' + dependency 'org.hamcrest:hamcrest-library:1.3' + dependency "org.mockito:mockito-core:$mockitoVersion" + 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.shell:spring-shell:$springShellVersion" + dependency 'org.webjars:bootstrap:2.3.2' + dependency 'org.webjars:html5shiv:3.7.3' + dependency 'org.webjars:jquery:1.9.0' + dependency 'org.webjars:knockout:2.3.0' + dependency 'org.webjars:sockjs-client:0.3.4' + dependency 'org.webjars:stomp-websocket:2.3.0' + dependency 'org.webjars:webjars-locator:0.32-1' + dependency 'org.webjars:webjars-locator-core:0.32' + dependency 'org.webjars:webjars-taglib:0.3' + } +} + +dependencyManagement { dependencies { dependency 'antlr:antlr:2.7.7' dependency 'aopalliance:aopalliance:1.0' - dependency 'cglib:cglib-nodep:2.1_3' dependency 'cglib:cglib-nodep:3.2.4' - dependency 'ch.qos.logback:logback-classic:1.1.11' dependency 'ch.qos.logback:logback-classic:1.2.3' - dependency 'ch.qos.logback:logback-core:1.1.11' dependency 'ch.qos.logback:logback-core:1.2.3' - dependency 'com.fasterxml.jackson.core:jackson-annotations:2.8.0' dependency 'com.fasterxml.jackson.core:jackson-annotations:2.9.0.pr3' - dependency 'com.fasterxml.jackson.core:jackson-core:2.8.8' dependency 'com.fasterxml.jackson.core:jackson-core:2.9.0.pr3' - dependency 'com.fasterxml.jackson.core:jackson-databind:2.8.8' dependency 'com.fasterxml.jackson.core:jackson-databind:2.9.0.pr3' dependency 'com.fasterxml:classmate:1.3.3' dependency 'com.google.code.findbugs:jsr305:3.0.2' @@ -40,46 +47,20 @@ dependencyManagement { dependency 'com.google.http-client:google-http-client:1.20.0' dependency 'com.h2database:h2:1.4.195' dependency 'com.jayway.jsonpath:json-path:2.2.0' - dependency 'com.maxmind.db:maxmind-db:1.0.0' - dependency 'com.maxmind.geoip2:geoip2:2.3.1' - 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-io:commons-io:2.5' - dependency 'dom4j:dom4j:1.6.1' - dependency "edu.umd.cs.mtc:multithreadedtc:$multithreadedtcVersion" - dependency 'io.lettuce:lettuce-core:5.0.0.M2' - dependency 'io.netty:netty-buffer:4.1.10.Final' - dependency 'io.netty:netty-codec:4.1.10.Final' - dependency 'io.netty:netty-common:4.1.10.Final' - dependency 'io.netty:netty-handler:4.1.10.Final' - dependency 'io.netty:netty-resolver:4.1.10.Final' - dependency 'io.netty:netty-transport:4.1.10.Final' - dependency 'io.projectreactor:reactor-core:3.1.0.M1' - dependency 'io.reactivex:rxjava:1.3.0' 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.transaction:javax.transaction-api:1.2' dependency 'javax.validation:validation-api:1.1.0.Final' - dependency "junit:junit:$junitVersion" - dependency 'net.bytebuddy:byte-buddy-agent:1.6.11' - 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.minidev:accessors-smart:1.1' - dependency 'net.minidev:json-smart:2.2.1' dependency 'net.sourceforge.cssparser:cssparser:0.9.18' dependency 'net.sourceforge.cssparser:cssparser:0.9.22' - dependency 'net.sourceforge.htmlunit:htmlunit-core-js:2.17' dependency 'net.sourceforge.htmlunit:htmlunit-core-js:2.26' - dependency 'net.sourceforge.htmlunit:htmlunit:2.21' dependency 'net.sourceforge.htmlunit:htmlunit:2.26' - dependency 'net.sourceforge.htmlunit:neko-htmlunit:2.21' dependency 'net.sourceforge.htmlunit:neko-htmlunit:2.25' dependency 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.4.0' - dependency 'ognl:ognl:3.0.8' 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' @@ -87,10 +68,6 @@ dependencyManagement { dependency 'org.apache.commons:commons-exec:1.3' dependency 'org.apache.commons:commons-lang3:3.5' dependency 'org.apache.commons:commons-pool2:2.4.2' - dependency 'org.apache.derby:derby:10.13.1.1' - dependency "org.apache.geode:geode-core:$apacheGeodeVersion" - dependency "org.apache.geode:geode-cq:$apacheGeodeVersion" - dependency "org.apache.geode:geode-wan:$apacheGeodeVersion" dependency 'org.apache.httpcomponents:httpclient:4.5.3' dependency 'org.apache.httpcomponents:httpcore:4.4.6' dependency 'org.apache.httpcomponents:httpmime:4.5.3' @@ -107,15 +84,8 @@ dependencyManagement { dependency 'org.aspectj:aspectjweaver:1.8.10' dependency "org.assertj:assertj-core:$assertjVersion" dependency 'org.codehaus.groovy:groovy-json:2.4.11' - dependency 'org.codehaus.groovy:groovy:2.4.10' 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.4.v20170414' - dependency 'org.eclipse.jetty.websocket:websocket-api:9.4.5.v20170502' - dependency 'org.eclipse.jetty.websocket:websocket-client:9.4.4.v20170414' - dependency 'org.eclipse.jetty.websocket:websocket-client:9.4.5.v20170502' - dependency 'org.eclipse.jetty.websocket:websocket-common:9.4.4.v20170414' - dependency 'org.eclipse.jetty.websocket:websocket-common:9.4.5.v20170502' dependency 'org.eclipse.jetty:jetty-client:9.4.4.v20170414' dependency 'org.eclipse.jetty:jetty-client:9.4.5.v20170502' dependency 'org.eclipse.jetty:jetty-http:9.4.4.v20170414' @@ -124,18 +94,10 @@ dependencyManagement { dependency 'org.eclipse.jetty:jetty-io:9.4.5.v20170502' dependency 'org.eclipse.jetty:jetty-util:9.4.4.v20170414' dependency 'org.eclipse.jetty:jetty-util:9.4.5.v20170502' - 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.0.12.Final' - dependency 'org.hibernate:hibernate-entitymanager:5.0.12.Final' - dependency 'org.hibernate:hibernate-validator:5.3.5.Final' - dependency 'org.hsqldb:hsqldb:2.4.0' + 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.javassist:javassist:3.21.0-GA' - dependency 'org.jboss.logging:jboss-logging:3.3.1.Final' - dependency 'org.jboss:jandex:2.0.0.Final' - dependency "org.mockito:mockito-core:$mockitoVersion" dependency 'org.objenesis:objenesis:2.5.1' dependency 'org.ow2.asm:asm:5.0.3' dependency 'org.reactivestreams:reactive-streams:1.0.0' @@ -145,22 +107,8 @@ dependencyManagement { dependency 'org.seleniumhq.selenium:selenium-remote-driver:3.4.0' dependency 'org.seleniumhq.selenium:selenium-support:3.4.0' 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.unbescape:unbescape:1.1.0.RELEASE' dependency 'org.w3c.css:sac:1.3' - dependency 'org.webjars:bootstrap:2.3.2' - dependency 'org.webjars:html5shiv:3.7.3' - dependency 'org.webjars:jquery:1.9.0' - dependency 'org.webjars:knockout:2.3.0' - dependency 'org.webjars:sockjs-client:0.3.4' - dependency 'org.webjars:stomp-websocket:2.3.0' - dependency 'org.webjars:webjars-locator-core:0.30' - dependency 'org.webjars:webjars-locator-core:0.32' - dependency 'org.webjars:webjars-locator:0.32-1' - dependency 'org.webjars:webjars-taglib:0.3' dependency 'org.yaml:snakeyaml:1.17' dependency 'xalan:serializer:2.7.2' dependency 'xalan:xalan:2.7.2'