From 88f2e32da86605b7c9be2ef2ec2fe8bf98fbd7a5 Mon Sep 17 00:00:00 2001 From: Sean Arms <67096+lesserwhirls@users.noreply.github.com> Date: Mon, 18 Sep 2023 13:13:31 -0600 Subject: [PATCH 1/3] Test shadowjar task for PRs --- .github/workflows/tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 17164fb03..968948a0d 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,7 +15,7 @@ jobs: distribution: 'temurin' java-version: '8' check-latest: true - - run: ./gradlew clean classes testClasses integrationTestClasses --refresh-dependencies + - run: ./gradlew clean classes testClasses integrationTestClasses shadowJar --refresh-dependencies test: name: Test with multiple Temurin JDK versions strategy: From 14c846f50fce3b37ebed5972cad2e75a47eb0d5f Mon Sep 17 00:00:00 2001 From: Sean Arms <67096+lesserwhirls@users.noreply.github.com> Date: Mon, 18 Sep 2023 13:13:35 -0600 Subject: [PATCH 2/3] Downgrade jackson to 2.14.3 and redo 5.6.2 release jackson 2.15.x pulls in a dependency that is not compatible with Java 8, and this causes the shadowJar task to fail. --- libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs.versions.toml b/libs.versions.toml index f9154df8e..76d0d9bb9 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -16,7 +16,7 @@ # # project version # -ds3SdkVersion = "5.6.3-SNAPSHOT" +ds3SdkVersion = "5.6.2" # # dependency versions # @@ -27,7 +27,7 @@ findbugsVersion = "3.0.1" guavaVersion = "32.1.2-jre" hamcrestVersion = "2.2" httpclientVersion = "4.5.13" -jacksonVersion = "2.15.2" +jacksonVersion = "2.14.3" jnaVersion = "5.12.1" junitJupiterVersion = "5.9.0" junitVersion = "4.13.2" From 9be82d851736b4a9d23e002294f9b38e376b97c8 Mon Sep 17 00:00:00 2001 From: Sean Arms <67096+lesserwhirls@users.noreply.github.com> Date: Mon, 18 Sep 2023 13:17:00 -0600 Subject: [PATCH 3/3] Begin work on 5.6.3-SNAPSHOT --- libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs.versions.toml b/libs.versions.toml index 76d0d9bb9..f476094a6 100644 --- a/libs.versions.toml +++ b/libs.versions.toml @@ -16,7 +16,7 @@ # # project version # -ds3SdkVersion = "5.6.2" +ds3SdkVersion = "5.6.3-SNAPSHOT" # # dependency versions # @@ -27,7 +27,7 @@ findbugsVersion = "3.0.1" guavaVersion = "32.1.2-jre" hamcrestVersion = "2.2" httpclientVersion = "4.5.13" -jacksonVersion = "2.14.3" +jacksonVersion = "2.14.3" # stuck on 2.14.x until we move away from Java 8 as a minimum supported version jnaVersion = "5.12.1" junitJupiterVersion = "5.9.0" junitVersion = "4.13.2"