Skip to content

Commit

Permalink
GEODE-7294: Update dependencies for v1.11
Browse files Browse the repository at this point in the history 
Update as many dependencies as we can for v1.11. Since
so many updates are included, please review the change
set to see them all. Not *all* dependencies have been
advanced; only the ones that seemed safest to do easily.
  • Loading branch information
@metatype
metatype committed Oct 15, 2019
1 parent f622a47 commit 77fdec5
Show file tree
Hide file tree
Showing 14 changed files with 224 additions and 224 deletions.
142 changes: 71 additions & 71 deletions boms/geode-all-bom/src/test/resources/expected-pom.xml
View file

Large diffs are not rendered by default.

90 changes: 45 additions & 45 deletions buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,39 +35,39 @@ class DependencyConstraints implements Plugin<Project> {
// Some of these are referenced below as well
deps.put("antlr.version", "2.7.7")
deps.put("commons-io.version", "2.6")
deps.put("commons-lang3.version", "3.8.1")
deps.put("commons-lang3.version", "3.9")
deps.put("commons-validator.version", "1.6")
deps.put("fastutil.version", "8.2.2")
deps.put("fastutil.version", "8.3.0")
deps.put("javax.transaction-api.version", "1.3")
deps.put("jgroups.version", "3.6.14.Final")
deps.put("log4j.version", "2.12.0")
deps.put("micrometer.version", "1.2.0")
deps.put("shiro.version", "1.4.0")
deps.put("slf4j-api.version", "1.7.25")
deps.put("log4j.version", "2.12.1")
deps.put("micrometer.version", "1.2.1")
deps.put("shiro.version", "1.4.1")
deps.put("slf4j-api.version", "1.7.28")

// These version numbers are used in testing various versions of tomcat and are consumed explicitly
// in will be called explicitly in the relevant extensions module, and respective configurations
// in geode-assembly.gradle. Moreover, dependencyManagement does not seem to play nicely when
// specifying @zip in a dependency, the manner in which we consume them in custom configurations.
// This would possibly be corrected if they were proper source sets.
deps.put("tomcat6.version", "6.0.37")
deps.put("tomcat7.version", "7.0.90")
deps.put("tomcat8.version", "8.5.34")
deps.put("tomcat7.version", "7.0.96")
deps.put("tomcat8.version", "8.5.46")
deps.put("tomcat9.version", "9.0.12")

// The jetty version is also hard-coded in geode-assembly:test
// at o.a.g.sessions.tests.GenericAppServerInstall.java
deps.put("jetty.version", "9.4.12.v20180830")
deps.put("jetty.version", "9.4.20.v20190813")

// These version numbers are consumed by protobuf configurations that are plugin-specific and not
// part of the typical Gradle dependency configurations.
deps.put("protoc.version", "3.6.1")
deps.put("protobuf-gradle-plugin.version", "0.8.6")
deps.put("protobuf-java.version", "3.6.1")
deps.put("protoc.version", "3.10.0")
deps.put("protobuf-gradle-plugin.version", "0.8.10")
deps.put("protobuf-java.version", "3.10.0")

// These versions are referenced in test.gradle, which is aggressively injected into all projects.
deps.put("junit.version", "4.12")
deps.put("cglib.version", "3.2.9")
deps.put("cglib.version", "3.3.0")
return deps
}

Expand All @@ -83,76 +83,76 @@ class DependencyConstraints implements Plugin<Project> {
project.dependencies {
constraints {
// informal, inter-group dependencySet
api('com.sun.xml.bind:jaxb-impl:2.3.1')
api('com.sun.xml.bind:jaxb-impl:2.3.2')
api('javax.xml.bind:jaxb-api:2.3.1')

api(group: 'antlr', name: 'antlr', version: get('antlr.version'))
api(group: 'cglib', name: 'cglib', version: get('cglib.version'))
api(group: 'com.carrotsearch.randomizedtesting', name: 'randomizedtesting-runner', version: '2.5.0')
api(group: 'com.carrotsearch.randomizedtesting', name: 'randomizedtesting-runner', version: '2.7.3')
api(group: 'com.fasterxml.jackson.module', name: 'jackson-module-scala_2.10', version: '2.10.0')
api(group: 'com.github.davidmoten', name: 'geo', version: '0.7.1')
api(group: 'com.github.stefanbirkner', name: 'system-rules', version: '1.19.0')
api(group: 'com.github.stephenc.findbugs', name: 'findbugs-annotations', version: '1.3.9-1')
api(group: 'com.google.guava', name: 'guava', version: '27.0-jre')
api(group: 'com.google.guava', name: 'guava', version: '28.1-jre')
api(group: 'com.google.protobuf', name: 'protobuf-gradle-plugin', version: get('protobuf-gradle-plugin.version'))
api(group: 'com.google.protobuf', name: 'protobuf-java', version: get('protobuf-java.version'))
api(group: 'com.healthmarketscience.rmiio', name: 'rmiio', version: '2.1.2')
api(group: 'com.mockrunner', name: 'mockrunner-servlet', version: '1.1.2')
api(group: 'com.mockrunner', name: 'mockrunner-servlet', version: '2.0.1')
api(group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0')
api(group: 'com.sun.istack', name: 'istack-commons-runtime', version: '2.2')
api(group: 'com.tngtech.archunit', name:'archunit-junit4', version: '0.10.2')
api(group: 'com.zaxxer', name: 'HikariCP', version: '3.2.0')
api(group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.3')
api(group: 'com.sun.istack', name: 'istack-commons-runtime', version: '3.0.9')
api(group: 'com.tngtech.archunit', name:'archunit-junit4', version: '0.11.0')
api(group: 'com.zaxxer', name: 'HikariCP', version: '3.4.1')
api(group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4')
api(group: 'commons-collections', name: 'commons-collections', version: '3.2.2')
api(group: 'commons-configuration', name: 'commons-configuration', version: '1.10')
api(group: 'commons-digester', name: 'commons-digester', version: '2.1')
api(group: 'commons-fileupload', name: 'commons-fileupload', version: '1.3.3')
api(group: 'commons-fileupload', name: 'commons-fileupload', version: '1.4')
api(group: 'commons-io', name: 'commons-io', version: get('commons-io.version'))
api(group: 'commons-logging', name: 'commons-logging', version: '1.2')
api(group: 'commons-modeler', name: 'commons-modeler', version: '2.0.1')
api(group: 'commons-validator', name: 'commons-validator', version: get('commons-validator.version'))
api(group: 'io.github.classgraph', name: 'classgraph', version: '4.0.6')
api(group: 'io.github.classgraph', name: 'classgraph', version: '4.8.47')
api(group: 'io.micrometer', name: 'micrometer-core', version: get('micrometer.version'))
api(group: 'io.netty', name: 'netty-all', version: '4.1.31.Final')
api(group: 'io.netty', name: 'netty-all', version: '4.1.42.Final')
api(group: 'it.unimi.dsi', name: 'fastutil', version: get('fastutil.version'))
api(group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2')
api(group: 'javax.annotation', name: 'jsr250-api', version: '1.0')
api(group: 'javax.ejb', name: 'ejb-api', version: '3.0')
api(group: 'javax.mail', name: 'javax.mail-api', version: '1.6.2')
api(group: 'javax.resource', name: 'javax.resource-api', version: '1.7.1')
api(group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0')
api(group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1')
api(group: 'junit', name: 'junit', version: get('junit.version'))
api(group: 'mx4j', name: 'mx4j-tools', version: '3.0.1')
api(group: 'mysql', name: 'mysql-connector-java', version: '5.1.46')
api(group: 'net.java.dev.jna', name: 'jna', version: '4.1.0')
api(group: 'net.openhft', name: 'compiler', version: '2.3.1')
api(group: 'net.openhft', name: 'compiler', version: '2.3.4')
api(group: 'net.sf.jopt-simple', name: 'jopt-simple', version: '5.0.4')
api(group: 'net.spy', name: 'spymemcached', version: '2.12.2')
api(group: 'org.apache.bcel', name: 'bcel', version: '6.2')
api(group: 'net.spy', name: 'spymemcached', version: '2.12.3')
api(group: 'org.apache.bcel', name: 'bcel', version: '6.4.0')
api(group: 'org.apache.commons', name: 'commons-lang3', version: get('commons-lang3.version'))
api(group: 'org.apache.derby', name: 'derby', version: '10.14.2.0')
api(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.6')
api(group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.10')
api(group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.10')
api(group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.12')
api(group: 'org.apache.shiro', name: 'shiro-core', version: get('shiro.version'))
api(group: 'org.assertj', name: 'assertj-core', version: '3.11.1')
api(group: 'org.awaitility', name: 'awaitility', version: '3.1.2')
api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.60')
api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.6.10')
api(group: 'org.assertj', name: 'assertj-core', version: '3.13.2')
api(group: 'org.awaitility', name: 'awaitility', version: '3.1.6')
api(group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.63')
api(group: 'org.codehaus.cargo', name: 'cargo-core-uberjar', version: '1.7.7')
api(group: 'org.eclipse.jetty', name: 'jetty-webapp', version: get('jetty.version'))
api(group: 'org.eclipse.jetty', name: 'jetty-server', version: get('jetty.version'))
api(group: 'org.eclipse.persistence', name: 'javax.persistence', version: '2.2.1')
api(group: 'org.fusesource.jansi', name: 'jansi', version: '1.17.1')
api(group: 'org.httpunit', name: 'httpunit', version: '1.7.3')
api(group: 'org.iq80.snappy', name: 'snappy', version: '0.4')
api(group: 'org.jgroups', name: 'jgroups', version: get('jgroups.version'))
api(group: 'org.mockito', name: 'mockito-core', version: '2.23.0')
api(group: 'org.mockito', name: 'mockito-core', version: '3.0.0')
api(group: 'org.mortbay.jetty', name: 'servlet-api', version: '3.0.20100224')
api(group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.21')
api(group: 'org.postgresql', name: 'postgresql', version: '42.2.2')
api(group: 'org.postgresql', name: 'postgresql', version: '42.2.8')
api(group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.0')
api(group: 'org.slf4j', name: 'slf4j-api', version: get('slf4j-api.version'))
api(group: 'io.swagger', name: 'swagger-annotations', version: '1.5.20')
api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '0.25.0.RELEASE')
api(group: 'io.swagger', name: 'swagger-annotations', version: '1.5.23')
api(group: 'org.springframework.hateoas', name: 'spring-hateoas', version: '0.25.2.RELEASE')
api(group: 'org.springframework.ldap', name: 'spring-ldap-core', version: '2.3.2.RELEASE')
api(group: 'org.springframework.shell', name: 'spring-shell', version: '1.2.0.RELEASE')
api(group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.0')
Expand All @@ -173,12 +173,12 @@ class DependencyConstraints implements Plugin<Project> {
entry('json-path')
}

dependencySet(group: 'com.palantir.docker.compose', version: '0.31.1') {
dependencySet(group: 'com.palantir.docker.compose', version: '1.3.0') {
entry('docker-compose-rule-core')
entry('docker-compose-rule-junit4')
}

dependencySet(group: 'com.pholser', version: '0.8.1') {
dependencySet(group: 'com.pholser', version: '0.9') {
entry('junit-quickcheck-core')
entry('junit-quickcheck-generators')
}
Expand All @@ -201,7 +201,7 @@ class DependencyConstraints implements Plugin<Project> {
entry('log4j-slf4j-impl')
}

dependencySet(group: 'org.apache.lucene', version: '6.6.2') {
dependencySet(group: 'org.apache.lucene', version: '6.6.6') {
entry('lucene-analyzers-common')
entry('lucene-analyzers-phonetic')
entry('lucene-core')
Expand All @@ -215,28 +215,28 @@ class DependencyConstraints implements Plugin<Project> {
entry('hamcrest-library')
}

dependencySet(group: 'org.powermock', version: '2.0.0-beta.5') {
dependencySet(group: 'org.powermock', version: '2.0.2') {
entry('powermock-api-mockito2')
entry('powermock-core')
entry('powermock-module-junit4')
}

dependencySet(group: 'org.seleniumhq.selenium', version: '3.13.0') {
dependencySet(group: 'org.seleniumhq.selenium', version: '3.141.59') {
entry('selenium-api')
entry('selenium-chrome-driver')
entry('selenium-remote-driver')
entry('selenium-support')
}

dependencySet(group: 'org.springframework.security', version: '4.2.8.RELEASE') {
dependencySet(group: 'org.springframework.security', version: '4.2.12.RELEASE') {
entry('spring-security-config')
entry('spring-security-core')
entry('spring-security-ldap')
entry('spring-security-test')
entry('spring-security-web')
}

dependencySet(group: 'org.springframework', version: '4.3.23.RELEASE') {
dependencySet(group: 'org.springframework', version: '4.3.25.RELEASE') {
entry('spring-aspects')
entry('spring-beans')
entry('spring-context')
Expand Down
4 changes: 2 additions & 2 deletions ...embly/geode-assembly-test/src/main/java/org/apache/geode/session/tests/TomcatInstall.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ public class TomcatInstall extends ContainerInstall {
*/
public enum TomcatVersion {
TOMCAT6(6, "tomcat-6.0.37.zip"),
TOMCAT7(7, "tomcat-7.0.90.zip"),
TOMCAT8(8, "tomcat-8.5.34.zip"),
TOMCAT7(7, "tomcat-7.0.96.zip"),
TOMCAT8(8, "tomcat-8.5.46.zip"),
TOMCAT9(9, "tomcat-9.0.12.zip");

private final int version;
Expand Down
2 changes: 1 addition & 1 deletion ...mbly/src/distributedTest/java/org/apache/geode/session/tests/GenericAppServerInstall.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* specific code outside of the {@link GenericAppServerVersion}.
*/
public class GenericAppServerInstall extends ContainerInstall {
private static final String JETTY_VERSION = "9.4.12.v20180830";
private static final String JETTY_VERSION = "9.4.20.v20190813";

/**
* Get the version number, download URL, and container name of a generic app server using
Expand Down
98 changes: 49 additions & 49 deletions geode-assembly/src/integrationTest/resources/assembly_content.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -934,21 +934,21 @@ javadoc/script.js
javadoc/serialized-form.html
javadoc/stylesheet.css
lib/HdrHistogram-2.1.11.jar
lib/HikariCP-3.2.0.jar
lib/HikariCP-3.4.1.jar
lib/LatencyUtils-2.0.3.jar
lib/antlr-2.7.7.jar
lib/classgraph-4.0.6.jar
lib/commons-beanutils-1.9.3.jar
lib/commons-codec-1.10.jar
lib/classgraph-4.8.47.jar
lib/commons-beanutils-1.9.4.jar
lib/commons-codec-1.11.jar
lib/commons-collections-3.2.2.jar
lib/commons-digester-2.1.jar
lib/commons-io-2.6.jar
lib/commons-lang3-3.8.1.jar
lib/commons-lang3-3.9.jar
lib/commons-logging-1.2.jar
lib/commons-math3-3.2.jar
lib/commons-modeler-2.0.1.jar
lib/commons-validator-1.6.jar
lib/fastutil-8.2.2.jar
lib/fastutil-8.3.0.jar
lib/findbugs-annotations-1.3.9-1.jar
lib/geo-0.7.1.jar
lib/geode-common-0.0.0.jar
Expand All @@ -973,9 +973,9 @@ lib/geode-unsafe-0.0.0.jar
lib/geode-wan-0.0.0.jar
lib/gfsh-dependencies.jar
lib/grumpy-core-0.2.2.jar
lib/httpclient-4.5.6.jar
lib/httpcore-4.4.10.jar
lib/istack-commons-runtime-2.2.jar
lib/httpclient-4.5.10.jar
lib/httpcore-4.4.12.jar
lib/istack-commons-runtime-3.0.9.jar
lib/jackson-annotations-2.10.0.jar
lib/jackson-core-2.10.0.jar
lib/jackson-databind-2.10.0.jar
Expand All @@ -984,59 +984,59 @@ lib/javax.activation-1.2.0.jar
lib/javax.activation-api-1.2.0.jar
lib/javax.mail-api-1.6.2.jar
lib/javax.resource-api-1.7.1.jar
lib/javax.servlet-api-3.1.0.jar
lib/javax.servlet-api-4.0.1.jar
lib/javax.transaction-api-1.3.jar
lib/jaxb-api-2.3.1.jar
lib/jaxb-impl-2.3.1.jar
lib/jetty-http-9.4.12.v20180830.jar
lib/jetty-io-9.4.12.v20180830.jar
lib/jetty-security-9.4.12.v20180830.jar
lib/jetty-server-9.4.12.v20180830.jar
lib/jetty-servlet-9.4.12.v20180830.jar
lib/jetty-util-9.4.12.v20180830.jar
lib/jetty-webapp-9.4.12.v20180830.jar
lib/jetty-xml-9.4.12.v20180830.jar
lib/jaxb-impl-2.3.2.jar
lib/jetty-http-9.4.20.v20190813.jar
lib/jetty-io-9.4.20.v20190813.jar
lib/jetty-security-9.4.20.v20190813.jar
lib/jetty-server-9.4.20.v20190813.jar
lib/jetty-servlet-9.4.20.v20190813.jar
lib/jetty-util-9.4.20.v20190813.jar
lib/jetty-webapp-9.4.20.v20190813.jar
lib/jetty-xml-9.4.20.v20190813.jar
lib/jgroups-3.6.14.Final.jar
lib/jline-2.12.jar
lib/jna-4.1.0.jar
lib/jopt-simple-5.0.4.jar
lib/log4j-api-2.12.0.jar
lib/log4j-core-2.12.0.jar
lib/log4j-jcl-2.12.0.jar
lib/log4j-jul-2.12.0.jar
lib/log4j-slf4j-impl-2.12.0.jar
lib/lucene-analyzers-common-6.6.2.jar
lib/lucene-analyzers-phonetic-6.6.2.jar
lib/lucene-core-6.6.2.jar
lib/lucene-queries-6.6.2.jar
lib/lucene-queryparser-6.6.2.jar
lib/micrometer-core-1.2.0.jar
lib/log4j-api-2.12.1.jar
lib/log4j-core-2.12.1.jar
lib/log4j-jcl-2.12.1.jar
lib/log4j-jul-2.12.1.jar
lib/log4j-slf4j-impl-2.12.1.jar
lib/lucene-analyzers-common-6.6.6.jar
lib/lucene-analyzers-phonetic-6.6.6.jar
lib/lucene-core-6.6.6.jar
lib/lucene-queries-6.6.6.jar
lib/lucene-queryparser-6.6.6.jar
lib/micrometer-core-1.2.1.jar
lib/mx4j-3.0.2.jar
lib/mx4j-remote-3.0.2.jar
lib/mx4j-tools-3.0.1.jar
lib/netty-all-4.1.31.Final.jar
lib/protobuf-java-3.6.1.jar
lib/netty-all-4.1.42.Final.jar
lib/protobuf-java-3.10.0.jar
lib/ra.jar
lib/rmiio-2.1.2.jar
lib/shiro-cache-1.4.0.jar
lib/shiro-config-core-1.4.0.jar
lib/shiro-config-ogdl-1.4.0.jar
lib/shiro-core-1.4.0.jar
lib/shiro-crypto-cipher-1.4.0.jar
lib/shiro-crypto-core-1.4.0.jar
lib/shiro-crypto-hash-1.4.0.jar
lib/shiro-event-1.4.0.jar
lib/shiro-lang-1.4.0.jar
lib/slf4j-api-1.7.25.jar
lib/shiro-cache-1.4.1.jar
lib/shiro-config-core-1.4.1.jar
lib/shiro-config-ogdl-1.4.1.jar
lib/shiro-core-1.4.1.jar
lib/shiro-crypto-cipher-1.4.1.jar
lib/shiro-crypto-core-1.4.1.jar
lib/shiro-crypto-hash-1.4.1.jar
lib/shiro-event-1.4.1.jar
lib/shiro-lang-1.4.1.jar
lib/slf4j-api-1.7.28.jar
lib/snappy-0.4.jar
lib/spring-aop-4.3.23.RELEASE.jar
lib/spring-beans-4.3.23.RELEASE.jar
lib/spring-context-4.3.23.RELEASE.jar
lib/spring-core-4.3.23.RELEASE.jar
lib/spring-expression-4.3.23.RELEASE.jar
lib/spring-aop-4.3.25.RELEASE.jar
lib/spring-beans-4.3.25.RELEASE.jar
lib/spring-context-4.3.25.RELEASE.jar
lib/spring-core-4.3.25.RELEASE.jar
lib/spring-expression-4.3.25.RELEASE.jar
lib/spring-shell-1.2.0.RELEASE.jar
lib/spring-web-4.3.23.RELEASE.jar
lib/swagger-annotations-1.5.20.jar
lib/spring-web-4.3.25.RELEASE.jar
lib/swagger-annotations-1.5.23.jar
tools/ClientProtocol/geode-protobuf-messages-definitions-0.0.0.zip
tools/Extensions/geode-web-0.0.0.war
tools/Extensions/geode-web-api-0.0.0.war
Expand Down
Loading

0 comments on commit 77fdec5

Please sign in to comment.