From 19dd6a5726a603989ba367639dd4b79e70e78a59 Mon Sep 17 00:00:00 2001 From: John Blum Date: Wed, 26 Jul 2017 16:28:47 -0700 Subject: [PATCH] Prepare the 2.0.0.M1 release. Upgrade to Spring Framework 5.0.0.RC3. --- gradle.properties | 4 +- gradle/dependency-management.gradle | 142 ++++++++++++++++++---------- gradle/dependency-management.tmpl | 118 +++++++++++++++++++++++ 3 files changed, 211 insertions(+), 53 deletions(-) create mode 100644 gradle/dependency-management.tmpl diff --git a/gradle.properties b/gradle.properties index 2b333be..57b0338 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,12 +4,12 @@ junitVersion=4.12 mockitoVersion=2.8.9 multithreadedtcVersion=1.01 pivotalGemFireVersion=9.1.0 -springVersion=5.0.0.RC2 +springVersion=5.0.0.RC3 springBootVersion=2.0.0.M2 springDataGemFireVersion=2.0.0.RC2 springDataGeodeVersion=2.0.0.RC2 springDataReleaseTrainVersion=Kay-RC2 -springIoVersion=Cairo-BUILD-SNAPSHOT +#springIoVersion=Cairo-BUILD-SNAPSHOT springSecurityVersion=5.0.0.M3 springSessionVersion=2.0.0.M3 springShellVersion=1.2.0.RELEASE diff --git a/gradle/dependency-management.gradle b/gradle/dependency-management.gradle index e51b488..c47f576 100644 --- a/gradle/dependency-management.gradle +++ b/gradle/dependency-management.gradle @@ -1,36 +1,9 @@ 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" + mavenBom 'org.springframework:spring-framework-bom:5.0.0.RC3' + mavenBom 'org.springframework.data:spring-data-releasetrain:Kay-RC2' + mavenBom 'org.springframework.security:spring-security-bom:5.0.0.M3' } - 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' @@ -40,37 +13,81 @@ dependencyManagement { 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.jackson.datatype:jackson-datatype-jdk8:2.9.0.pr3' + dependency 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.9.0.pr3' + dependency 'com.fasterxml.jackson.module:jackson-module-parameter-names:2.9.0.pr3' dependency 'com.fasterxml:classmate:1.3.3' - dependency 'com.google.code.findbugs:jsr305:3.0.2' + dependency 'com.github.stephenc.findbugs:findbugs-annotations:1.3.9-1' dependency 'com.google.code.gson:gson:2.8.0' dependency 'com.google.guava:guava:20.0' - 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.vaadin.external.google:android-json:0.0.20131108.vaadin1' + dependency 'commons-beanutils:commons-beanutils:1.9.3' + dependency 'commons-cli:commons-cli:1.4' dependency 'commons-codec:commons-codec:1.10' dependency 'commons-collections:commons-collections:3.2.2' dependency 'commons-io:commons-io:2.5' + dependency 'commons-lang:commons-lang:2.6' + dependency 'edu.umd.cs.mtc:multithreadedtc:1.01' + dependency 'io.github.lukehutch:fast-classpath-scanner:2.0.11' + dependency 'io.pivotal.gemfire:geode-common:9.1.0' + dependency 'io.pivotal.gemfire:geode-core:9.1.0' + dependency 'io.pivotal.gemfire:geode-cq:9.1.0' + dependency 'io.pivotal.gemfire:geode-json:9.1.0' + dependency 'io.pivotal.gemfire:geode-lucene:9.1.0' + dependency 'io.pivotal.gemfire:geode-wan:9.1.0' + dependency 'it.unimi.dsi:fastutil:7.1.0' + dependency 'javax.resource:javax.resource-api:1.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.transaction:javax.transaction-api:1.2' dependency 'javax.validation:validation-api:1.1.0.Final' - dependency 'net.sourceforge.cssparser:cssparser:0.9.18' + dependency 'jline:jline:2.14.5' + dependency 'junit:junit:4.12' + dependency 'net.bytebuddy:byte-buddy-agent:1.6.14' + 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.minidev:accessors-smart:1.1' + dependency 'net.minidev:json-smart:2.2.1' + dependency 'net.sf.jopt-simple:jopt-simple:5.0.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 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.4.0' 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-compress:1.9' 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.geode:geode-common:1.2.0' + dependency 'org.apache.geode:geode-core:1.2.0' + dependency 'org.apache.geode:geode-cq:1.2.0' + dependency 'org.apache.geode:geode-json:1.2.0' + dependency 'org.apache.geode:geode-lucene:1.2.0' + dependency 'org.apache.geode:geode-wan:1.2.0' 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.logging.log4j:log4j-api:2.8.2' + dependency 'org.apache.logging.log4j:log4j-core:2.8.2' + dependency 'org.apache.lucene:lucene-analyzers-common:6.4.1' + dependency 'org.apache.lucene:lucene-core:6.4.1' + dependency 'org.apache.lucene:lucene-queries:6.4.1' + dependency 'org.apache.lucene:lucene-queryparser:6.4.1' + dependency 'org.apache.lucene:lucene-sandbox:6.4.1' + dependency 'org.apache.shiro:shiro-cache:1.4.0' + dependency 'org.apache.shiro:shiro-config-core:1.4.0' + dependency 'org.apache.shiro:shiro-config-ogdl:1.4.0' + dependency 'org.apache.shiro:shiro-core:1.4.0' + dependency 'org.apache.shiro:shiro-crypto-cipher:1.4.0' + dependency 'org.apache.shiro:shiro-crypto-core:1.4.0' + dependency 'org.apache.shiro:shiro-crypto-hash:1.4.0' + dependency 'org.apache.shiro:shiro-event:1.4.0' + dependency 'org.apache.shiro:shiro-lang:1.4.0' + dependency 'org.apache.shiro:shiro-spring:1.4.0' + dependency 'org.apache.shiro:shiro-web:1.4.0' 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' @@ -79,36 +96,59 @@ dependencyManagement { 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.apache.tomcat:tomcat-jdbc:8.5.14' - dependency 'org.apache.tomcat:tomcat-juli:8.5.14' dependency 'org.aspectj:aspectjweaver:1.8.10' - dependency "org.assertj:assertj-core:$assertjVersion" + dependency 'org.assertj:assertj-core:3.8.0' + dependency 'org.attoparser:attoparser:2.0.4.RELEASE' 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: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' - dependency 'org.eclipse.jetty:jetty-http:9.4.5.v20170502' - dependency 'org.eclipse.jetty:jetty-io:9.4.4.v20170414' - 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.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.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-util:9.4.5.v20170502' + dependency 'org.hamcrest:hamcrest-core:1.3' + dependency 'org.hamcrest:hamcrest-library:1.3' + dependency 'org.hibernate:hibernate-validator:5.4.1.Final' + dependency 'org.jboss.logging:jboss-logging:3.3.1.Final' + dependency 'org.jgroups:jgroups:3.6.10.Final' + dependency 'org.mockito:mockito-core:2.8.9' dependency 'org.objenesis:objenesis:2.5.1' dependency 'org.ow2.asm:asm:5.0.3' - dependency 'org.reactivestreams:reactive-streams:1.0.0' dependency 'org.seleniumhq.selenium:htmlunit-driver:2.26' dependency 'org.seleniumhq.selenium:selenium-api:3.4.0' - dependency 'org.seleniumhq.selenium:selenium-java: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.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:2.0.0.M2' + dependency 'org.springframework.boot:spring-boot-starter-json:2.0.0.M2' + dependency 'org.springframework.boot:spring-boot-starter-logging:2.0.0.M2' + dependency 'org.springframework.boot:spring-boot-starter-test:2.0.0.M2' + dependency 'org.springframework.boot:spring-boot-starter-thymeleaf:2.0.0.M2' + dependency 'org.springframework.boot:spring-boot-starter-tomcat:2.0.0.M2' + dependency 'org.springframework.boot:spring-boot-starter-web:2.0.0.M2' + dependency 'org.springframework.boot:spring-boot-starter:2.0.0.M2' + dependency 'org.springframework.boot:spring-boot-test-autoconfigure:2.0.0.M2' + dependency 'org.springframework.boot:spring-boot-test:2.0.0.M2' + dependency 'org.springframework.boot:spring-boot:2.0.0.M2' + dependency 'org.springframework.session:spring-session-core:2.0.0.M3' + dependency 'org.springframework.shell:spring-shell:1.2.0.RELEASE' + dependency 'org.thymeleaf.extras:thymeleaf-extras-java8time:3.0.0.RELEASE' + dependency 'org.thymeleaf:thymeleaf-spring5:3.0.6.M4' + dependency 'org.thymeleaf:thymeleaf:3.0.6.RELEASE' 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:jquery:1.9.0' + 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' diff --git a/gradle/dependency-management.tmpl b/gradle/dependency-management.tmpl new file mode 100644 index 0000000..e51b488 --- /dev/null +++ b/gradle/dependency-management.tmpl @@ -0,0 +1,118 @@ +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:3.2.4' + 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.google.code.findbugs:jsr305:3.0.2' + dependency 'com.google.code.gson:gson:2.8.0' + dependency 'com.google.guava:guava:20.0' + 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 'commons-codec:commons-codec:1.10' + dependency 'commons-collections:commons-collections:3.2.2' + dependency 'commons-io:commons-io:2.5' + 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 'net.sourceforge.cssparser:cssparser:0.9.18' + 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 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:1.4.0' + 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-compress:1.9' + 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.httpcomponents:httpclient:4.5.3' + dependency 'org.apache.httpcomponents:httpcore:4.4.6' + dependency 'org.apache.httpcomponents:httpmime:4.5.3' + 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.apache.tomcat:tomcat-jdbc:8.5.14' + dependency 'org.apache.tomcat:tomcat-juli:8.5.14' + 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.11' + dependency 'org.eclipse.jdt.core.compiler:ecj:4.6.1' + 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' + dependency 'org.eclipse.jetty:jetty-http:9.4.5.v20170502' + dependency 'org.eclipse.jetty:jetty-io:9.4.4.v20170414' + 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.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.objenesis:objenesis:2.5.1' + dependency 'org.ow2.asm:asm:5.0.3' + dependency 'org.reactivestreams:reactive-streams:1.0.0' + dependency 'org.seleniumhq.selenium:htmlunit-driver:2.26' + dependency 'org.seleniumhq.selenium:selenium-api:3.4.0' + dependency 'org.seleniumhq.selenium:selenium-java: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.4.0' + 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' + } +}