From c468655ec6fdf15f965e821f8c0cec71d82ac75b Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Wed, 22 Nov 2023 23:49:08 +0900 Subject: [PATCH 1/9] Upgrade dependencies --- build.gradle.kts | 18 +++++++++--------- fluency-aws-s3/build.gradle.kts | 2 +- fluency-treasuredata/build.gradle.kts | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3b72dda3..ab1de83c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -33,18 +33,18 @@ subprojects { } dependencies { - implementation("org.slf4j:slf4j-api:2.0.6") - implementation("org.msgpack:jackson-dataformat-msgpack:0.9.3") + implementation("org.slf4j:slf4j-api:2.0.9") + implementation("org.msgpack:jackson-dataformat-msgpack:0.9.6") implementation("org.komamitsu:phi-accural-failure-detector:0.0.5") - implementation("net.jodah:failsafe:2.4.4") + implementation("dev.jodah:failsafe:3.3.2") - testImplementation("org.junit.jupiter:junit-jupiter-api:5.9.1") - testImplementation("org.junit.jupiter:junit-jupiter-engine:5.9.1") - testImplementation("org.junit.jupiter:junit-jupiter-params:5.9.1") - testImplementation("ch.qos.logback:logback-classic:1.2.11") + testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1") + testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.1") + testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.1") + testImplementation("ch.qos.logback:logback-classic:1.4.11") testImplementation("org.hamcrest:hamcrest-all:1.3") - testImplementation("org.mockito:mockito-core:4.9.0") - testImplementation("com.google.guava:guava:31.1-jre") + testImplementation("org.mockito:mockito-core:5.7.0") + testImplementation("com.google.guava:guava:32.1.3-jre") } base { diff --git a/fluency-aws-s3/build.gradle.kts b/fluency-aws-s3/build.gradle.kts index e57cd17a..6119e1ae 100644 --- a/fluency-aws-s3/build.gradle.kts +++ b/fluency-aws-s3/build.gradle.kts @@ -1,5 +1,5 @@ dependencies { implementation(projects.fluencyCore) - implementation("software.amazon.awssdk:s3:2.18.24") + implementation("software.amazon.awssdk:s3:2.21.27") } diff --git a/fluency-treasuredata/build.gradle.kts b/fluency-treasuredata/build.gradle.kts index 783d5bee..c95ad93c 100644 --- a/fluency-treasuredata/build.gradle.kts +++ b/fluency-treasuredata/build.gradle.kts @@ -1,5 +1,5 @@ dependencies { implementation(projects.fluencyCore) - implementation("com.treasuredata.client:td-client:0.9.6") + implementation("com.treasuredata.client:td-client:1.1.0") } From 1e2e3f82cdb20a5a6aeb0d2609ffff6aa8defbc5 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Thu, 23 Nov 2023 11:12:59 +0900 Subject: [PATCH 2/9] Use ubuntu-latest for CI --- .github/workflows/ci.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 587693d9..9e526080 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,9 +8,7 @@ on: jobs: build: - # With ubuntu-latest (20.04), some tests using self signed SSL cert suddenly failed at version 20210614.1. - # The issue may be fixed later, but I'll use ubuntu-18.04 for a while as a workaround. - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest strategy: matrix: java_version: [8, 11] @@ -39,7 +37,7 @@ jobs: run: ./gradlew -p fluency-aws-s3 check jacocoTestReport coveralls --stacktrace --info build_ext: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest strategy: matrix: java_version: [16, 17] @@ -66,7 +64,7 @@ jobs: # can use Fluecy jars built with JDK 8 without any problem. # We're using --release option to build source code with JDK 8. So JDK 17 should work here. prepare_for_integration_test: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Set up JDK 17 @@ -91,7 +89,7 @@ jobs: path: ~/.m2 integration_test: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest needs: prepare_for_integration_test strategy: matrix: @@ -124,7 +122,7 @@ jobs: cd tests/mutual-tls && ./run.sh integration_ext_test: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest strategy: matrix: java_version: [16, 17] From c49fa8605f3b3909a08ac0c530aac1fb4aafa357 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Thu, 23 Nov 2023 12:20:30 +0900 Subject: [PATCH 3/9] Fix dependencies --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index ab1de83c..ffce8851 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -36,14 +36,14 @@ subprojects { implementation("org.slf4j:slf4j-api:2.0.9") implementation("org.msgpack:jackson-dataformat-msgpack:0.9.6") implementation("org.komamitsu:phi-accural-failure-detector:0.0.5") - implementation("dev.jodah:failsafe:3.3.2") + implementation("net.jodah:failsafe:2.4.4") testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1") testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.1") testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.1") testImplementation("ch.qos.logback:logback-classic:1.4.11") testImplementation("org.hamcrest:hamcrest-all:1.3") - testImplementation("org.mockito:mockito-core:5.7.0") + testImplementation("org.mockito:mockito-core:4.11.0") testImplementation("com.google.guava:guava:32.1.3-jre") } From 588c7ab1de40c1b437a7e5f07a8991f2650cfdc7 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Thu, 23 Nov 2023 12:48:07 +0900 Subject: [PATCH 4/9] Fix dependencies --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index ffce8851..aa5f0ed7 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -41,7 +41,7 @@ subprojects { testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.1") testImplementation("org.junit.jupiter:junit-jupiter-engine:5.10.1") testImplementation("org.junit.jupiter:junit-jupiter-params:5.10.1") - testImplementation("ch.qos.logback:logback-classic:1.4.11") + testImplementation("ch.qos.logback:logback-classic:1.2.12") testImplementation("org.hamcrest:hamcrest-all:1.3") testImplementation("org.mockito:mockito-core:4.11.0") testImplementation("com.google.guava:guava:32.1.3-jre") From 08a0630aa3b4a7000d2141ce6947a412b1942b86 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Thu, 23 Nov 2023 15:12:06 +0900 Subject: [PATCH 5/9] Fix dependencies --- .../treasuredata/ingester/sender/TreasureDataSender.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fluency-treasuredata/src/main/java/org/komamitsu/fluency/treasuredata/ingester/sender/TreasureDataSender.java b/fluency-treasuredata/src/main/java/org/komamitsu/fluency/treasuredata/ingester/sender/TreasureDataSender.java index e4bb720e..9457fa22 100644 --- a/fluency-treasuredata/src/main/java/org/komamitsu/fluency/treasuredata/ingester/sender/TreasureDataSender.java +++ b/fluency-treasuredata/src/main/java/org/komamitsu/fluency/treasuredata/ingester/sender/TreasureDataSender.java @@ -17,7 +17,6 @@ package org.komamitsu.fluency.treasuredata.ingester.sender; import com.fasterxml.jackson.databind.util.ByteBufferBackedInputStream; -import com.google.common.annotations.VisibleForTesting; import com.treasuredata.client.TDClient; import com.treasuredata.client.TDClientBuilder; import com.treasuredata.client.TDClientHttpException; @@ -31,6 +30,7 @@ import org.komamitsu.fluency.validation.Validatable; import org.komamitsu.fluency.validation.annotation.DecimalMin; import org.komamitsu.fluency.validation.annotation.Min; +import org.msgpack.core.annotations.VisibleForTesting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; From aa69e73a11e0e5d5c88a4245939c1beca5cc1cb6 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Thu, 23 Nov 2023 19:11:32 +0900 Subject: [PATCH 6/9] Revert fluency-treasuredata/build.gradle.kts --- fluency-treasuredata/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fluency-treasuredata/build.gradle.kts b/fluency-treasuredata/build.gradle.kts index c95ad93c..783d5bee 100644 --- a/fluency-treasuredata/build.gradle.kts +++ b/fluency-treasuredata/build.gradle.kts @@ -1,5 +1,5 @@ dependencies { implementation(projects.fluencyCore) - implementation("com.treasuredata.client:td-client:1.1.0") + implementation("com.treasuredata.client:td-client:0.9.6") } From 95be5628f2711d6870174f54d1cd069c121b27d9 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Thu, 23 Nov 2023 21:17:56 +0900 Subject: [PATCH 7/9] Use gradle 8.4 --- build.gradle.kts | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index aa5f0ed7..226ef1fa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -48,7 +48,7 @@ subprojects { } base { - archivesBaseName = "fluency" + archivesName.set("fluency") } java { @@ -72,7 +72,7 @@ subprojects { tasks.withType { relocate("com.fasterxml.jackson", "org.komamitsu.thirdparty.jackson") relocate("org.msgpack.jackson", "org.komamitsu.thirdparty.msgpack.jackson") - classifier = "shadow" + archiveClassifier.set("shadow") } publishing { @@ -170,8 +170,8 @@ subprojects { } reports { - xml.isEnabled = true - html.isEnabled = true + xml.required.set(true) + html.required.set(true) } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ae04661e..e411586a 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 65ee1b5a71e8f34e7094601b98b08742c5ba7945 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Thu, 23 Nov 2023 21:36:36 +0900 Subject: [PATCH 8/9] Support Jackson's Multi-Release Jar --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 226ef1fa..5a3b505b 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -13,7 +13,7 @@ plugins { signing `maven-publish` id("com.github.kt3k.coveralls") version "2.12.0" - id("com.github.johnrengelman.shadow") version "7.1.2" + id("com.github.johnrengelman.shadow") version "8.1.1" } subprojects { From 41f4bc9bd6d75b159c668c096fe899124cb0a431 Mon Sep 17 00:00:00 2001 From: Mitsunori Komatsu Date: Thu, 23 Nov 2023 21:37:50 +0900 Subject: [PATCH 9/9] Fix wrong version cache --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9e526080..4dce1733 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -77,7 +77,7 @@ jobs: path: | ~/.gradle/caches ~/.gradle/wrapper - key: ${{ runner.os }}-11-gradle-${{ hashFiles('**/*.gradle*') }} + key: ${{ runner.os }}-17-gradle-${{ hashFiles('**/*.gradle*') }} - name: Install local maven package run: | ./gradlew -p fluency-core publishToMavenLocal --stacktrace --info