This is an automated email from the ASF dual-hosted git repository. onichols pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push: new 77ef0b7 GEODE-8496: bump dependencies again (#5919) 77ef0b7 is described below commit 77ef0b71d8b98cdac5b6de35a68c20ccba22126e Author: Owen Nichols <34043438+onichols-pivo...@users.noreply.github.com> AuthorDate: Tue Jan 19 11:44:55 2021 -0800 GEODE-8496: bump dependencies again (#5919) * Bump spring from 5.3.1/5.3.2 to 5.3.3 * Bump spring-boot-starter from 2.4.1 to 2.4.2 * Bump mockito-core from 3.7.0 to 3.7.7 * Bump lettuce-core from 6.0.1.RELEASE to 6.0.2.RELEASE * Bump netty-all from 4.1.56.Final to 4.1.58.Final * Bump micrometer-core from 1.6.2 to 1.6.3 * Bump mysql-connector-java from 8.0.22 to 8.0.23 * Bump dependency-management from 1.0.10.RELEASE to 1.0.11.RELEASE * Bump sonarqube from 3.0 to 3.1 * Bump buildSrc's commons-lang3 from 3.3.2 to 3.11 * Bump maven-artifact from 3.3.3 to 3.6.3 * Bump docker-java from 3.0.14 to 3.2.7 * update image (cached dependencies) on changes to dependencies --- .../src/test/resources/expected-pom.xml | 36 +++++++++++----------- build.gradle | 4 +-- buildSrc/build.gradle | 6 ++-- .../gradle/plugins/DependencyConstraints.groovy | 17 +++++----- ci/pipelines/images/jinja.template.yml | 13 ++++++++ .../integrationTest/resources/assembly_content.txt | 14 ++++----- .../resources/dependency_classpath.txt | 8 ++--- geode-connectors/build.gradle | 2 +- .../cli/CreateDataSourceCommandDUnitTest.java | 2 +- .../cli/DeregisterDriverCommandDUnitTest.java | 2 +- .../internal/cli/ListDriversCommandDUnitTest.java | 4 +-- .../cli/RegisterDriverCommandDUnitTest.java | 2 +- 12 files changed, 60 insertions(+), 50 deletions(-) diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml index e1f5a2b..b7d881e 100644 --- a/boms/geode-all-bom/src/test/resources/expected-pom.xml +++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml @@ -238,13 +238,13 @@ <dependency> <groupId>io.micrometer</groupId> <artifactId>micrometer-core</artifactId> - <version>1.6.2</version> + <version>1.6.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>io.netty</groupId> <artifactId>netty-all</artifactId> - <version>4.1.56.Final</version> + <version>4.1.58.Final</version> <scope>compile</scope> </dependency> <dependency> @@ -472,7 +472,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>3.7.0</version> + <version>3.7.7</version> <scope>compile</scope> </dependency> <dependency> @@ -544,7 +544,7 @@ <dependency> <groupId>io.lettuce</groupId> <artifactId>lettuce-core</artifactId> - <version>6.0.1.RELEASE</version> + <version>6.0.2.RELEASE</version> <scope>compile</scope> </dependency> <dependency> @@ -790,85 +790,85 @@ <dependency> <groupId>org.springframework</groupId> <artifactId>spring-aspects</artifactId> - <version>5.3.2</version> + <version>5.3.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-beans</artifactId> - <version>5.3.2</version> + <version>5.3.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-context</artifactId> - <version>5.3.2</version> + <version>5.3.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-core</artifactId> - <version>5.3.2</version> + <version>5.3.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-expression</artifactId> - <version>5.3.2</version> + <version>5.3.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-oxm</artifactId> - <version>5.3.2</version> + <version>5.3.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-test</artifactId> - <version>5.3.1</version> + <version>5.3.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-tx</artifactId> - <version>5.3.2</version> + <version>5.3.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-web</artifactId> - <version>5.3.2</version> + <version>5.3.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> - <version>5.3.2</version> + <version>5.3.3</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter</artifactId> - <version>2.4.1</version> + <version>2.4.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-jetty</artifactId> - <version>2.4.1</version> + <version>2.4.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-web</artifactId> - <version>2.4.1</version> + <version>2.4.2</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-data-redis</artifactId> - <version>2.4.1</version> + <version>2.4.2</version> <scope>compile</scope> </dependency> <dependency> diff --git a/build.gradle b/build.gradle index 98a557e..9c47258 100755 --- a/build.gradle +++ b/build.gradle @@ -25,10 +25,10 @@ plugins { id "com.github.ben-manes.versions" version "0.36.0" apply false id "nebula.lint" version "16.17.0" apply false id "com.palantir.docker" version "0.22.1" apply false - id "io.spring.dependency-management" version "1.0.10.RELEASE" apply false + id "io.spring.dependency-management" version "1.0.11.RELEASE" apply false id "org.ajoberstar.grgit" version "4.1.0" apply false id "org.nosphere.apache.rat" version "0.6.0" apply false - id "org.sonarqube" version "3.0" apply false + id "org.sonarqube" version "3.1" apply false id "me.champeau.gradle.japicmp" apply false // Version defined in buildSrc/build.gradle id 'me.champeau.gradle.jmh' version '0.5.2' apply false } diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle index c096958..58f1eb7 100644 --- a/buildSrc/build.gradle +++ b/buildSrc/build.gradle @@ -32,10 +32,10 @@ dependencies { exclude group: 'org.apache.logging.log4j' } implementation(gradleApi()) - implementation('org.apache.commons:commons-lang3:3.3.2') - implementation('org.apache.maven:maven-artifact:3.3.3') + implementation('org.apache.commons:commons-lang3:3.11') + implementation('org.apache.maven:maven-artifact:3.6.3') implementation('com.google.guava:guava:30.1-jre') - implementation('com.github.docker-java:docker-java:3.0.14') + implementation('com.github.docker-java:docker-java:3.2.7') implementation('me.champeau.gradle:japicmp-gradle-plugin:0.2.9') implementation('junit:junit:4.13.1') diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy index 79f3fad..5b43518 100644 --- a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy +++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy @@ -41,7 +41,7 @@ class DependencyConstraints implements Plugin<Project> { deps.put("javax.transaction-api.version", "1.3") deps.put("jgroups.version", "3.6.14.Final") deps.put("log4j.version", "2.14.0") - deps.put("micrometer.version", "1.6.2") + deps.put("micrometer.version", "1.6.3") deps.put("shiro.version", "1.7.0") deps.put("slf4j-api.version", "1.7.30") @@ -119,7 +119,7 @@ class DependencyConstraints implements Plugin<Project> { // Careful when upgrading this dependency: see GEODE-7370 and GEODE-8150. api(group: 'io.github.classgraph', name: 'classgraph', version: '4.8.52') api(group: 'io.micrometer', name: 'micrometer-core', version: get('micrometer.version')) - api(group: 'io.netty', name: 'netty-all', version: '4.1.56.Final') + api(group: 'io.netty', name: 'netty-all', version: '4.1.58.Final') api(group: 'io.swagger', name: 'swagger-annotations', version: '1.6.2') api(group: 'it.unimi.dsi', name: 'fastutil', version: get('fastutil.version')) api(group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2') @@ -157,7 +157,7 @@ class DependencyConstraints implements Plugin<Project> { 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: '3.7.0') + api(group: 'org.mockito', name: 'mockito-core', version: '3.7.7') api(group: 'org.mortbay.jetty', name: 'servlet-api', version: '3.0.20100224') api(group: 'org.openjdk.jmh', name: 'jmh-core', version: '1.26') api(group: 'org.postgresql', name: 'postgresql', version: '42.2.8') @@ -169,7 +169,7 @@ class DependencyConstraints implements Plugin<Project> { api(group: 'org.testcontainers', name: 'testcontainers', version: '1.14.3') api(group: 'pl.pragmatists', name: 'JUnitParams', version: '1.1.0') api(group: 'redis.clients', name: 'jedis', version: '3.4.1') - api(group: 'io.lettuce', name: 'lettuce-core', version: '6.0.1.RELEASE') + api(group: 'io.lettuce', name: 'lettuce-core', version: '6.0.2.RELEASE') api(group: 'xerces', name: 'xercesImpl', version: '2.12.0') } } @@ -249,23 +249,20 @@ class DependencyConstraints implements Plugin<Project> { entry('spring-security-oauth2-jose') } - dependencySet(group: 'org.springframework', version: '5.3.2') { + dependencySet(group: 'org.springframework', version: '5.3.3') { entry('spring-aspects') entry('spring-beans') entry('spring-context') entry('spring-core') entry('spring-expression') entry('spring-oxm') + entry('spring-test') entry('spring-tx') entry('spring-web') entry('spring-webmvc') } - dependencySet(group: 'org.springframework', version: '5.3.1') { - entry('spring-test') - } - - dependencySet(group: 'org.springframework.boot', version: '2.4.1') { + dependencySet(group: 'org.springframework.boot', version: '2.4.2') { entry('spring-boot-starter') entry('spring-boot-starter-jetty') entry('spring-boot-starter-web') diff --git a/ci/pipelines/images/jinja.template.yml b/ci/pipelines/images/jinja.template.yml index 8b58c5c..bd95ff2 100644 --- a/ci/pipelines/images/jinja.template.yml +++ b/ci/pipelines/images/jinja.template.yml @@ -163,6 +163,15 @@ resources: password: ((docker-password)) repository: gcr.io/((gcp-project))/((pipeline-prefix))metric-tools +- name: geode-dependencies + type: git + source: + {{ github_access() | indent(4) }} + branch: ((geode-build-branch)) + depth: 1 + paths: + - "buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy" + - name: gce-instances-resource-dockerfile type: git source: @@ -231,6 +240,8 @@ jobs: trigger: true - get: build-concourse-dockerfile trigger: true + - get: geode-dependencies + trigger: true - put: build-concourse-docker-image params: build: build-concourse-dockerfile/ci/docker @@ -283,6 +294,8 @@ jobs: passed: [build-alpine-tools-docker-image] - get: linux-base-family trigger: true + - get: geode-dependencies + trigger: true - task: build-image timeout: 1h image: alpine-tools-docker-image diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt index 2de258f..e0e8984 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -1051,11 +1051,11 @@ 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.6.2.jar +lib/micrometer-core-1.6.3.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.56.Final.jar +lib/netty-all-4.1.58.Final.jar lib/protobuf-java-3.11.4.jar lib/ra.jar lib/rmiio-2.1.2.jar @@ -1070,12 +1070,12 @@ lib/shiro-event-1.7.0.jar lib/shiro-lang-1.7.0.jar lib/slf4j-api-1.7.30.jar lib/snappy-0.4.jar -lib/spring-beans-5.3.2.jar -lib/spring-context-5.3.2.jar -lib/spring-core-5.3.2.jar -lib/spring-jcl-5.3.2.jar +lib/spring-beans-5.3.3.jar +lib/spring-context-5.3.3.jar +lib/spring-core-5.3.3.jar +lib/spring-jcl-5.3.3.jar lib/spring-shell-1.2.0.RELEASE.jar -lib/spring-web-5.3.2.jar +lib/spring-web-5.3.3.jar lib/swagger-annotations-1.6.2.jar tools/ClientProtocol/geode-protobuf-messages-definitions-0.0.0.zip tools/Extensions/geode-web-0.0.0.war diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt index a256d55..3ffc056 100644 --- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt @@ -43,7 +43,7 @@ commons-collections-3.2.2.jar commons-io-2.8.0.jar commons-logging-1.2.jar classgraph-4.8.52.jar -micrometer-core-1.6.2.jar +micrometer-core-1.6.3.jar swagger-annotations-1.6.2.jar fastutil-8.4.4.jar javax.resource-api-1.7.1.jar @@ -65,13 +65,13 @@ shiro-event-1.7.0.jar shiro-crypto-core-1.7.0.jar shiro-lang-1.7.0.jar slf4j-api-1.7.30.jar -spring-core-5.3.2.jar +spring-core-5.3.3.jar javax.activation-api-1.2.0.jar jline-2.12.jar HdrHistogram-2.1.12.jar LatencyUtils-2.0.3.jar javax.transaction-api-1.3.jar -spring-jcl-5.3.2.jar +spring-jcl-5.3.3.jar jetty-http-9.4.35.v20201120.jar jetty-io-9.4.35.v20201120.jar jetty-xml-9.4.35.v20201120.jar @@ -87,4 +87,4 @@ lucene-core-6.6.6.jar lucene-queries-6.6.6.jar protobuf-java-3.11.4.jar geo-0.7.7.jar -netty-all-4.1.56.Final.jar +netty-all-4.1.58.Final.jar diff --git a/geode-connectors/build.gradle b/geode-connectors/build.gradle index aa2b37c..14abd8e 100644 --- a/geode-connectors/build.gradle +++ b/geode-connectors/build.gradle @@ -126,7 +126,7 @@ dependencies { acceptanceTestRuntimeOnly('org.apache.derby:derby') acceptanceTestRuntimeOnly('org.postgresql:postgresql') - jdbcTestingJars('mysql:mysql-connector-java:8.0.22') + jdbcTestingJars('mysql:mysql-connector-java:8.0.23') } integrationTest.forkEvery 0 diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceCommandDUnitTest.java index 2e34f10..04dc224 100644 --- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceCommandDUnitTest.java +++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceCommandDUnitTest.java @@ -118,7 +118,7 @@ public class CreateDataSourceCommandDUnitTest { "Failed to connect to \"mySqlDataSource\""); // aquire the jar to be used - final String jdbcJarName = "mysql-connector-java-8.0.22.jar"; + final String jdbcJarName = "mysql-connector-java-8.0.23.jar"; final String jdbcDriverClassName = "com.mysql.cj.jdbc.Driver"; File mySqlDriverFile = loadTestResource("/" + jdbcJarName); assertThat(mySqlDriverFile).exists(); diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DeregisterDriverCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DeregisterDriverCommandDUnitTest.java index 01b2b93..261492f 100644 --- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DeregisterDriverCommandDUnitTest.java +++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DeregisterDriverCommandDUnitTest.java @@ -53,7 +53,7 @@ public class DeregisterDriverCommandDUnitTest { public void testDeregisterDriverDoesNotThrowException() { // aquire the jar to be used - final String jdbcJarName = "mysql-connector-java-8.0.22.jar"; + final String jdbcJarName = "mysql-connector-java-8.0.23.jar"; final String jdbcDriverClassName = "com.mysql.cj.jdbc.Driver"; File mySqlDriverFile = loadTestResource("/" + jdbcJarName); assertThat(mySqlDriverFile).exists(); diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListDriversCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListDriversCommandDUnitTest.java index ed664bd..8f5395e 100644 --- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListDriversCommandDUnitTest.java +++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListDriversCommandDUnitTest.java @@ -54,7 +54,7 @@ public class ListDriversCommandDUnitTest { public void testListDriversWithoutMemberNameDoesNotThrowException() { // acquire the jar to be used - final String jdbcJarName = "mysql-connector-java-8.0.22.jar"; + final String jdbcJarName = "mysql-connector-java-8.0.23.jar"; final String jdbcDriverClassName = "com.mysql.cj.jdbc.Driver"; File mySqlDriverFile = loadTestResource("/" + jdbcJarName); assertThat(mySqlDriverFile).exists(); @@ -73,7 +73,7 @@ public class ListDriversCommandDUnitTest { @Test public void testLIstDriversWithMemberNameDoesNotThrowException() { // acquire the jar to be used - final String jdbcJarName = "mysql-connector-java-8.0.22.jar"; + final String jdbcJarName = "mysql-connector-java-8.0.23.jar"; final String jdbcDriverClassName = "com.mysql.cj.jdbc.Driver"; File mySqlDriverFile = loadTestResource("/" + jdbcJarName); assertThat(mySqlDriverFile).exists(); diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/RegisterDriverCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/RegisterDriverCommandDUnitTest.java index 421ca5a..11a14cb 100644 --- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/RegisterDriverCommandDUnitTest.java +++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/RegisterDriverCommandDUnitTest.java @@ -61,7 +61,7 @@ public class RegisterDriverCommandDUnitTest { public void testRegisterDriverDoesNotThrowException() { // aquire the jar to be used - final String jdbcJarName = "mysql-connector-java-8.0.22.jar"; + final String jdbcJarName = "mysql-connector-java-8.0.23.jar"; File mySqlDriverFile = loadTestResource("/" + jdbcJarName); assertThat(mySqlDriverFile).exists(); String jarFile = mySqlDriverFile.getAbsolutePath();