This is an automated email from the ASF dual-hosted git repository. upthewaterspout pushed a commit to branch support/1.14 in repository https://gitbox.apache.org/repos/asf/geode.git
commit e9ffadfe1417834b9e53b98021c945b0e8892a5e Author: Jens Deppe <[email protected]> AuthorDate: Fri Nov 5 05:57:58 2021 -0700 GEODE-9778: Bump netty from 4.1.67.Final to 4.1.70.Final (cherry picked from commit 7f4bf62a08b24aca81fe05349cdc72d919a6cab7) --- boms/geode-all-bom/src/test/resources/expected-pom.xml | 18 ++++++++++++------ .../geode/gradle/plugins/DependencyConstraints.groovy | 6 +++++- geode-apis-compatible-with-redis/build.gradle | 5 ++++- .../src/test/resources/expected-pom.xml | 2 +- .../src/integrationTest/resources/assembly_content.txt | 7 ++++++- .../integrationTest/resources/dependency_classpath.txt | 7 ++++++- .../src/integrationTest/resources/expected_jars.txt | 7 ++++++- 7 files changed, 40 insertions(+), 12 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 332ac2d..4d038e1 100644 --- a/boms/geode-all-bom/src/test/resources/expected-pom.xml +++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml @@ -230,12 +230,6 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> - <version>4.1.59.Final</version> - <scope>compile</scope> - </dependency> - <dependency> <groupId>io.swagger</groupId> <artifactId>swagger-annotations</artifactId> <version>1.6.2</version> @@ -710,6 +704,18 @@ <scope>compile</scope> </dependency> <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-codec-redis</artifactId> + <version>4.1.70.Final</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>io.netty</groupId> + <artifactId>netty-handler</artifactId> + <version>4.1.70.Final</version> + <scope>compile</scope> + </dependency> + <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-api</artifactId> <version>3.141.59</version> 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 3153b56..9c3a9c8 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 @@ -117,7 +117,6 @@ 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.59.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') @@ -230,6 +229,11 @@ class DependencyConstraints implements Plugin<Project> { entry('powermock-module-junit4') } + dependencySet(group: 'io.netty', version: '4.1.70.Final') { + entry('netty-codec-redis') + entry('netty-handler') + } + dependencySet(group: 'org.seleniumhq.selenium', version: '3.141.59') { entry('selenium-api') entry('selenium-chrome-driver') diff --git a/geode-apis-compatible-with-redis/build.gradle b/geode-apis-compatible-with-redis/build.gradle index b13bfc5..4f50fb2 100644 --- a/geode-apis-compatible-with-redis/build.gradle +++ b/geode-apis-compatible-with-redis/build.gradle @@ -35,7 +35,7 @@ dependencies { implementation(project(':geode-core')) implementation(project(':geode-gfsh')) implementation('com.github.davidmoten:geo') - implementation('io.netty:netty-all') + implementation('io.netty:netty-handler') implementation('org.apache.logging.log4j:log4j-api') implementation('commons-codec:commons-codec') implementation('org.apache.commons:commons-lang3') @@ -44,6 +44,7 @@ dependencies { testImplementation('org.mockito:mockito-core') testImplementation('redis.clients:jedis') + commonTestImplementation('io.netty:netty-codec-redis') commonTestImplementation(project(':geode-junit')) commonTestImplementation(project(':geode-dunit')) commonTestImplementation('org.testcontainers:testcontainers') @@ -66,6 +67,7 @@ dependencies { acceptanceTestImplementation(project(':geode-junit')) acceptanceTestImplementation('redis.clients:jedis') acceptanceTestImplementation('org.testcontainers:testcontainers') + acceptanceTestRuntime('io.netty:netty-codec-redis') acceptanceTestRuntime(project(':geode-log4j')) acceptanceTestImplementation('org.springframework.boot:spring-boot-starter-web') { exclude module: 'spring-boot-starter-tomcat' @@ -76,6 +78,7 @@ dependencies { // This only exists for debugging PubSubNativeRedisAcceptanceTest acceptanceTestImplementation('org.buildobjects:jproc:2.4.0') + distributedTestImplementation('io.netty:netty-codec-redis') distributedTestImplementation('org.apache.logging.log4j:log4j-core') distributedTestImplementation(project(':geode-dunit')) distributedTestImplementation(sourceSets.commonTest.output) diff --git a/geode-apis-compatible-with-redis/src/test/resources/expected-pom.xml b/geode-apis-compatible-with-redis/src/test/resources/expected-pom.xml index 7cd571a..61a8215 100644 --- a/geode-apis-compatible-with-redis/src/test/resources/expected-pom.xml +++ b/geode-apis-compatible-with-redis/src/test/resources/expected-pom.xml @@ -103,7 +103,7 @@ </dependency> <dependency> <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> + <artifactId>netty-handler</artifactId> <scope>runtime</scope> <exclusions> <exclusion> diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt index 2b1cef8..0bebcda 100644 --- a/geode-assembly/src/integrationTest/resources/assembly_content.txt +++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt @@ -1055,7 +1055,12 @@ 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.59.Final.jar +lib/netty-buffer-4.1.70.Final.jar +lib/netty-codec-4.1.70.Final.jar +lib/netty-common-4.1.70.Final.jar +lib/netty-handler-4.1.70.Final.jar +lib/netty-resolver-4.1.70.Final.jar +lib/netty-transport-4.1.70.Final.jar lib/protobuf-java-3.11.4.jar lib/ra.jar lib/rmiio-2.1.2.jar diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt index d72935d..13167de 100644 --- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt +++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt @@ -87,4 +87,9 @@ 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.59.Final.jar +netty-handler-4.1.70.Final.jar +netty-codec-4.1.70.Final.jar +netty-transport-4.1.70.Final.jar +netty-buffer-4.1.70.Final.jar +netty-resolver-4.1.70.Final.jar +netty-common-4.1.70.Final.jar diff --git a/geode-assembly/src/integrationTest/resources/expected_jars.txt b/geode-assembly/src/integrationTest/resources/expected_jars.txt index 463ee4d..0f17b53 100644 --- a/geode-assembly/src/integrationTest/resources/expected_jars.txt +++ b/geode-assembly/src/integrationTest/resources/expected_jars.txt @@ -76,7 +76,12 @@ micrometer-core mx4j mx4j-remote mx4j-tools -netty-all +netty-buffer +netty-codec +netty-common +netty-handler +netty-resolver +netty-transport nimbus-jose-jwt oauth2-oidc-sdk protobuf-java
