From eb27dadcae0c55f843fd84c431c31bf36f5ae2ac Mon Sep 17 00:00:00 2001 From: xieshujian Date: Thu, 23 Feb 2023 14:54:57 +0800 Subject: [PATCH 01/13] Update build.gradle kafka_version = '3.4.0' --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d7bfdb6f89..2afdcb7e7e 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ buildscript { opensearch_build = version_tokens[0] + '.0' common_utils_version = System.getProperty("common_utils.version", '3.0.0.0-SNAPSHOT') - kafka_version = '3.0.2' + kafka_version = '3.4.0' if (buildVersionQualifier) { opensearch_build += "-${buildVersionQualifier}" From 5add07c43f0c3f8d2be891bc7cd5ad98cdcff24b Mon Sep 17 00:00:00 2001 From: xieshujian Date: Thu, 23 Feb 2023 15:01:31 +0800 Subject: [PATCH 02/13] Update build.gradle zstd-jni versions 1.5.2-1 lz4-java versions 1.8.0 snappy-java versions 1.1.8.4 --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 2afdcb7e7e..5a08775aa8 100644 --- a/build.gradle +++ b/build.gradle @@ -411,16 +411,16 @@ dependencies { runtimeOnly 'com.google.j2objc:j2objc-annotations:1.3' runtimeOnly 'com.google.code.findbugs:jsr305:3.0.2' runtimeOnly 'com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava' - runtimeOnly 'org.lz4:lz4-java:1.7.1' + runtimeOnly 'org.lz4:lz4-java:1.8.0' runtimeOnly 'io.dropwizard.metrics:metrics-core:3.1.2' runtimeOnly 'org.slf4j:slf4j-api:1.7.30' - runtimeOnly 'org.xerial.snappy:snappy-java:1.1.8.1' + runtimeOnly 'org.xerial.snappy:snappy-java:1.1.8.4' runtimeOnly 'org.codehaus.woodstox:stax2-api:4.2.1' runtimeOnly 'org.glassfish.jaxb:txw2:2.3.4' runtimeOnly 'com.fasterxml.woodstox:woodstox-core:6.4.0' runtimeOnly 'org.apache.ws.xmlschema:xmlschema-core:2.2.5' runtimeOnly 'org.apache.santuario:xmlsec:2.2.3' - runtimeOnly 'com.github.luben:zstd-jni:1.5.0-2' + runtimeOnly 'com.github.luben:zstd-jni:1.5.2-1' runtimeOnly 'org.checkerframework:checker-qual:3.5.0' runtimeOnly "org.bouncycastle:bcpkix-jdk15on:${versions.bouncycastle}" From cf73d782e516b7fb1d564c80ff79deb361d37898 Mon Sep 17 00:00:00 2001 From: xieshujian Date: Thu, 23 Feb 2023 15:32:52 +0800 Subject: [PATCH 03/13] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5a08775aa8..32010e9b21 100644 --- a/build.gradle +++ b/build.gradle @@ -445,7 +445,7 @@ dependencies { testImplementation "org.apache.kafka:kafka_2.13:${kafka_version}" testImplementation "org.apache.kafka:kafka_2.13:${kafka_version}:test" testImplementation "org.apache.kafka:kafka-clients:${kafka_version}:test" - testImplementation 'org.springframework.kafka:spring-kafka-test:2.8.6' + testImplementation 'org.springframework.kafka:spring-kafka-test:3.0.3' testImplementation 'org.springframework:spring-beans:5.3.20' testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' From 48e2e96dae2e2a177963350d7c618046d1f8d0f3 Mon Sep 17 00:00:00 2001 From: xieshujian Date: Thu, 23 Feb 2023 15:38:51 +0800 Subject: [PATCH 04/13] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 32010e9b21..e2c885eb35 100644 --- a/build.gradle +++ b/build.gradle @@ -445,7 +445,7 @@ dependencies { testImplementation "org.apache.kafka:kafka_2.13:${kafka_version}" testImplementation "org.apache.kafka:kafka_2.13:${kafka_version}:test" testImplementation "org.apache.kafka:kafka-clients:${kafka_version}:test" - testImplementation 'org.springframework.kafka:spring-kafka-test:3.0.3' + testImplementation 'org.springframework.kafka:spring-kafka-test:2.9.6' testImplementation 'org.springframework:spring-beans:5.3.20' testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' From 8c49e353b8684f46d7f92d4dad667b75df751b28 Mon Sep 17 00:00:00 2001 From: xieshujian Date: Thu, 23 Feb 2023 16:41:31 +0800 Subject: [PATCH 05/13] Update integration-tests.yml jdk17 --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index fff2f84650..3fbc494274 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - jdk: [11, 17] + jdk: [17] test-run: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] steps: From f9227e5e62e4528badbf89998ffb72160be914b0 Mon Sep 17 00:00:00 2001 From: xieshujian Date: Thu, 23 Feb 2023 16:42:07 +0800 Subject: [PATCH 06/13] Update build.gradle spring-kafka-test:3.0.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e2c885eb35..32010e9b21 100644 --- a/build.gradle +++ b/build.gradle @@ -445,7 +445,7 @@ dependencies { testImplementation "org.apache.kafka:kafka_2.13:${kafka_version}" testImplementation "org.apache.kafka:kafka_2.13:${kafka_version}:test" testImplementation "org.apache.kafka:kafka-clients:${kafka_version}:test" - testImplementation 'org.springframework.kafka:spring-kafka-test:2.9.6' + testImplementation 'org.springframework.kafka:spring-kafka-test:3.0.3' testImplementation 'org.springframework:spring-beans:5.3.20' testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' From 3d90ae372b746d4af0c51bd4b2ecc42d3c722f36 Mon Sep 17 00:00:00 2001 From: xieshujian Date: Thu, 23 Feb 2023 17:57:56 +0800 Subject: [PATCH 07/13] Update build.gradle --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 32010e9b21..bf9415ac15 100644 --- a/build.gradle +++ b/build.gradle @@ -342,7 +342,8 @@ task integrationTest(type: Test) { //run the integrationTest task before the check task check.dependsOn integrationTest - +//xieshujian override kafka version in spring-kafka-test +ext['kafka.version'] = '3.4.0' dependencies { implementation 'jakarta.annotation:jakarta.annotation-api:1.3.5' implementation "org.opensearch.plugin:transport-netty4-client:${opensearch_version}" From 1f8e535ad5f356bdad8eb8a46b10cef6439735d5 Mon Sep 17 00:00:00 2001 From: xieshujian Date: Fri, 24 Feb 2023 07:51:02 +0800 Subject: [PATCH 08/13] Update build.gradle --- build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index bf9415ac15..1af053bd0f 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ import org.opensearch.gradle.test.RestIntegTestTask buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT") + opensearch_version = System.getProperty("opensearch.version", "1.3.8") isSnapshot = "true" == System.getProperty("build.snapshot", "true") buildVersionQualifier = System.getProperty("build.version_qualifier", "") @@ -342,8 +342,7 @@ task integrationTest(type: Test) { //run the integrationTest task before the check task check.dependsOn integrationTest -//xieshujian override kafka version in spring-kafka-test -ext['kafka.version'] = '3.4.0' + dependencies { implementation 'jakarta.annotation:jakarta.annotation-api:1.3.5' implementation "org.opensearch.plugin:transport-netty4-client:${opensearch_version}" From dfd6df19a1a9ca253eeab3ebcad6c751016cbc28 Mon Sep 17 00:00:00 2001 From: xieshujian Date: Fri, 24 Feb 2023 07:59:34 +0800 Subject: [PATCH 09/13] Update build.gradle --- build.gradle | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 1af053bd0f..0db48ba962 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ import org.opensearch.gradle.test.RestIntegTestTask buildscript { ext { - opensearch_version = System.getProperty("opensearch.version", "1.3.8") + opensearch_version = System.getProperty("opensearch.version", "3.0.0-SNAPSHOT") isSnapshot = "true" == System.getProperty("build.snapshot", "true") buildVersionQualifier = System.getProperty("build.version_qualifier", "") @@ -25,6 +25,7 @@ buildscript { common_utils_version = System.getProperty("common_utils.version", '3.0.0.0-SNAPSHOT') kafka_version = '3.4.0' + kafkaVersion = '3.4.0' if (buildVersionQualifier) { opensearch_build += "-${buildVersionQualifier}" From 9741d41dbe784e4ae6d6117cd1bad35e8683adda Mon Sep 17 00:00:00 2001 From: xieshujian Date: Fri, 24 Feb 2023 09:35:11 +0800 Subject: [PATCH 10/13] Update build.gradle --- build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/build.gradle b/build.gradle index 0db48ba962..9e13186b01 100644 --- a/build.gradle +++ b/build.gradle @@ -444,6 +444,7 @@ dependencies { testImplementation 'org.apache.httpcomponents:fluent-hc:4.5.13' testImplementation "org.apache.httpcomponents.client5:httpclient5-fluent:${versions.httpclient5}" testImplementation "org.apache.kafka:kafka_2.13:${kafka_version}" + testImplementation "org.apache.kafka:kafka-group-coordinator:${kafka_version}" testImplementation "org.apache.kafka:kafka_2.13:${kafka_version}:test" testImplementation "org.apache.kafka:kafka-clients:${kafka_version}:test" testImplementation 'org.springframework.kafka:spring-kafka-test:3.0.3' From e1a3b5c44a45aae5a1e0be671f1d9ded4b22ab18 Mon Sep 17 00:00:00 2001 From: xieshujian Date: Sat, 25 Feb 2023 16:46:47 +0800 Subject: [PATCH 11/13] Update build.gradle --- build.gradle | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 9e13186b01..bf9c789f46 100644 --- a/build.gradle +++ b/build.gradle @@ -24,8 +24,7 @@ buildscript { opensearch_build = version_tokens[0] + '.0' common_utils_version = System.getProperty("common_utils.version", '3.0.0.0-SNAPSHOT') - kafka_version = '3.4.0' - kafkaVersion = '3.4.0' + kafka_version = '3.4.0' if (buildVersionQualifier) { opensearch_build += "-${buildVersionQualifier}" @@ -447,7 +446,7 @@ dependencies { testImplementation "org.apache.kafka:kafka-group-coordinator:${kafka_version}" testImplementation "org.apache.kafka:kafka_2.13:${kafka_version}:test" testImplementation "org.apache.kafka:kafka-clients:${kafka_version}:test" - testImplementation 'org.springframework.kafka:spring-kafka-test:3.0.3' + testImplementation 'org.springframework.kafka:spring-kafka-test:2.9.6' testImplementation 'org.springframework:spring-beans:5.3.20' testImplementation 'org.junit.jupiter:junit-jupiter:5.8.2' testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' From a29762a849e9c34c6d73f427d0302b3cb00162a7 Mon Sep 17 00:00:00 2001 From: xieshujian Date: Sat, 25 Feb 2023 16:47:31 +0800 Subject: [PATCH 12/13] Update integration-tests.yml --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 3fbc494274..e5cc3fccb6 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - jdk: [17] + jdk: [11,17] test-run: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] steps: From 3a408e701095e60464443cf982bedc2412419eb2 Mon Sep 17 00:00:00 2001 From: xieshujian Date: Sat, 25 Feb 2023 19:02:24 +0800 Subject: [PATCH 13/13] Update integration-tests.yml --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index e5cc3fccb6..fff2f84650 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -11,7 +11,7 @@ jobs: strategy: fail-fast: false matrix: - jdk: [11,17] + jdk: [11, 17] test-run: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] steps: