From 24cd23339d00a42bddfdfc1c6a9b7fb57c428b46 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Tue, 9 Jul 2024 10:22:48 -0700 Subject: [PATCH 01/17] Fix release version for java client. Rework java CD. Signed-off-by: Yury-Fridlyand --- .github/workflows/java-cd.yml | 17 +++---------- java/client/build.gradle | 45 +++++++++++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 19 deletions(-) diff --git a/.github/workflows/java-cd.yml b/.github/workflows/java-cd.yml index 1dba670476..af26d1c1ee 100644 --- a/.github/workflows/java-cd.yml +++ b/.github/workflows/java-cd.yml @@ -56,26 +56,21 @@ jobs: OS: ubuntu, RUNNER: ubuntu-latest, TARGET: x86_64-unknown-linux-gnu, - CLASSIFIER: linux-x86_64 } - { OS: ubuntu, RUNNER: ["self-hosted", "Linux", "ARM64"], TARGET: aarch64-unknown-linux-gnu, - CLASSIFIER: linux-aarch_64, - CONTAINER: "2_28" } - { OS: macos, RUNNER: macos-12, TARGET: x86_64-apple-darwin, - CLASSIFIER: osx-x86_64 } - { OS: macos, RUNNER: macos-latest, TARGET: aarch64-apple-darwin, - CLASSIFIER: osx-aarch_64 } runs-on: ${{ matrix.host.RUNNER }} @@ -99,7 +94,7 @@ jobs: - name: Set the release version shell: bash run: | - if ${{ github.event_name == 'pull_request' || github.event_name == 'push' }}; then + if ${{ github.event_name == 'pull_request' }}; then R_VERSION="255.255.255" elif ${{ github.event_name == 'workflow_dispatch' }}; then R_VERSION="${{ env.INPUT_VERSION }}" @@ -139,18 +134,12 @@ jobs: env: SECRING_GPG: ${{ secrets.SECRING_GPG }} - - name: Replace placeholders and version in build.gradle - shell: bash - working-directory: ./java/client - run: | - SED_FOR_MACOS=`if [[ "${{ matrix.host.os }}" =~ .*"macos".* ]]; then echo "''"; fi` - sed -i $SED_FOR_MACOS 's/placeholder/${{ matrix.host.CLASSIFIER }}/g' build.gradle - sed -i $SED_FOR_MACOS "s/255.255.255/${{ env.RELEASE_VERSION }}/g" build.gradle - - name: Build java client working-directory: java run: | ./gradlew :client:publishToMavenLocal -Psigning.secretKeyRingFile=secring.gpg -Psigning.password="${{ secrets.GPG_PASSWORD }}" -Psigning.keyId=${{ secrets.GPG_KEY_ID }} + env: + GLIDE_RELEASE_VERSION: ${{ env.RELEASE_VERSION }} - name: Bundle JAR working-directory: java diff --git a/java/client/build.gradle b/java/client/build.gradle index 15d207c019..5561df13ab 100644 --- a/java/client/build.gradle +++ b/java/client/build.gradle @@ -4,7 +4,9 @@ plugins { id 'java-library' id 'maven-publish' id 'signing' - id ("com.github.spotbugs") version "6.0.18" + id 'io.freefair.lombok' version '8.6' + id 'com.github.spotbugs' version '6.0.18' + id 'com.google.osdetector' version '1.7.3' } repositories { @@ -156,7 +158,11 @@ tasks.register('copyNativeLib', Copy) { into sourceSets.main.output.resourcesDir } +def defaultReleaseVersion = "255.255.255"; + +delombok.dependsOn('compileJava') jar.dependsOn('copyNativeLib') +javadoc.dependsOn('copyNativeLib') copyNativeLib.dependsOn('buildRustRelease') compileTestJava.dependsOn('copyNativeLib') test.dependsOn('buildRust') @@ -183,8 +189,7 @@ publishing { from components.java groupId = 'io.valkey' artifactId = 'valkey-glide' - // version is replaced during released workflow java-cd.yml - version = "255.255.255" + version = System.getenv("GLIDE_RELEASE_VERSION") ?: defaultReleaseVersion; pom { name = 'valkey-glide' description = 'General Language Independent Driver for the Enterprise (GLIDE) for Valkey' @@ -216,6 +221,18 @@ publishing { } } +java { + modularity.inferModulePath = true + withSourcesJar() + withJavadocJar() +} + +tasks.withType(Sign) { + def releaseVersion = System.getenv("GLIDE_RELEASE_VERSION") ?: defaultReleaseVersion; + def isReleaseVersion = !releaseVersion.endsWith("SNAPSHOT") && releaseVersion != defaultReleaseVersion; + onlyIf("isReleaseVersion is set") { isReleaseVersion } +} + signing { sign publishing.publications } @@ -232,8 +249,26 @@ tasks.withType(Test) { jar { archiveBaseName = "valkey-glide" - // placeholder will be renamed by platform+arch on the release workflow java-cd.yml - archiveClassifier = "placeholder" + archiveClassifier = osdetector.classifier +} + +sourcesJar { + // suppress following error + // Entry glide/api/BaseClient.java is a duplicate but no duplicate handling strategy has been set + duplicatesStrategy = DuplicatesStrategy.EXCLUDE +} + +delombok { + modulePath = classpath +} + +lombok { + version = "1.18.34" +} + +javadoc { + dependsOn delombok + source = delombok.outputs } spotbugsMain { From eb2d52e0ec0bacb1ea82c5c57218b00af1328b18 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Wed, 10 Jul 2024 17:23:36 -0700 Subject: [PATCH 02/17] cleanup Signed-off-by: Yury-Fridlyand --- java/client/build.gradle | 5 ----- 1 file changed, 5 deletions(-) diff --git a/java/client/build.gradle b/java/client/build.gradle index 5561df13ab..1422d2deda 100644 --- a/java/client/build.gradle +++ b/java/client/build.gradle @@ -248,7 +248,6 @@ tasks.withType(Test) { } jar { - archiveBaseName = "valkey-glide" archiveClassifier = osdetector.classifier } @@ -262,10 +261,6 @@ delombok { modulePath = classpath } -lombok { - version = "1.18.34" -} - javadoc { dependsOn delombok source = delombok.outputs From e4014c30e46944c08ae7515ef3f842894d2b3904 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Wed, 10 Jul 2024 17:42:29 -0700 Subject: [PATCH 03/17] Fix for javadoc to generate examples. Signed-off-by: Yury-Fridlyand --- java/client/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/java/client/build.gradle b/java/client/build.gradle index 1422d2deda..c000b0b27f 100644 --- a/java/client/build.gradle +++ b/java/client/build.gradle @@ -264,6 +264,7 @@ delombok { javadoc { dependsOn delombok source = delombok.outputs + options.tags = [ "example:a:Example:" ] } spotbugsMain { From b7ce7f6fca7f3eb2ef7125d50afbbf2e26c4a02e Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Wed, 10 Jul 2024 17:54:42 -0700 Subject: [PATCH 04/17] Suppress all javadoc errors. Signed-off-by: Yury-Fridlyand --- java/client/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/java/client/build.gradle b/java/client/build.gradle index c000b0b27f..0178f311ea 100644 --- a/java/client/build.gradle +++ b/java/client/build.gradle @@ -265,6 +265,7 @@ javadoc { dependsOn delombok source = delombok.outputs options.tags = [ "example:a:Example:" ] + failOnError = false // TODO fix all javadoc errors and warnings and remove that } spotbugsMain { From aeacab1ada9df8f4aa310cd799d60c72cb84393f Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Mon, 15 Jul 2024 18:17:50 -0700 Subject: [PATCH 05/17] Signed-off-by: Yury-Fridlyand --- .github/workflows/java-cd.yml | 2 +- java/DEVELOPER.md | 5 ++--- .../src/main/java/glide/api/commands/StreamBaseCommands.java | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/java-cd.yml b/.github/workflows/java-cd.yml index af26d1c1ee..d38b2003dd 100644 --- a/.github/workflows/java-cd.yml +++ b/.github/workflows/java-cd.yml @@ -149,7 +149,7 @@ jobs: jar -cvf bundle.jar * ls -ltr cd - - cp $src_folder/bundle.jar . + cp $src_folder/bundle-${{ matrix.host.TARGET }}.jar . - name: Upload artifacts to publish continue-on-error: true diff --git a/java/DEVELOPER.md b/java/DEVELOPER.md index 2ecaf0f1c3..3a3fda1272 100644 --- a/java/DEVELOPER.md +++ b/java/DEVELOPER.md @@ -176,11 +176,10 @@ dependencies { } ``` -Optionally: you can specify a snapshot release and classifier: +Optionally: you can specify a snapshot release: ```bash -export GLIDE_LOCAL_VERSION=1.0.0-SNAPSHOT -export GLIDE_LOCAL_CLASSIFIER=osx-aarch_64 +export GLIDE_RELEASE_VERSION=1.0.0-SNAPSHOT ./gradlew publishToMavenLocal ``` diff --git a/java/client/src/main/java/glide/api/commands/StreamBaseCommands.java b/java/client/src/main/java/glide/api/commands/StreamBaseCommands.java index c88bda1201..883e52c8e5 100644 --- a/java/client/src/main/java/glide/api/commands/StreamBaseCommands.java +++ b/java/client/src/main/java/glide/api/commands/StreamBaseCommands.java @@ -653,7 +653,7 @@ CompletableFuture> xrevrange( * @param key The key of the stream. * @param groupname The newly created consumer group name. * @param id Stream entry ID that specifies the last delivered entry in the stream from the new - * group’s perspective. The special ID "$" can be used to specify the last entry + * group's perspective. The special ID "$" can be used to specify the last entry * in the stream. * @return OK. * @example @@ -693,7 +693,7 @@ CompletableFuture xgroupCreate( * @param key The key of the stream. * @param groupName The newly created consumer group name. * @param id Stream entry ID that specifies the last delivered entry in the stream from the new - * group’s perspective. The special ID "$" can be used to specify the last entry + * group's perspective. The special ID "$" can be used to specify the last entry * in the stream. * @param options The group options {@link StreamGroupOptions}. * @return OK. From 807387cf3631be93adf35e540d019d315b5e0c98 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Mon, 15 Jul 2024 18:53:52 -0700 Subject: [PATCH 06/17] Signed-off-by: Yury-Fridlyand --- .github/workflows/java-cd.yml | 1 + .../main/java/glide/api/models/commands/scan/ScanOptions.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/java-cd.yml b/.github/workflows/java-cd.yml index d38b2003dd..5b382769c8 100644 --- a/.github/workflows/java-cd.yml +++ b/.github/workflows/java-cd.yml @@ -158,3 +158,4 @@ jobs: name: java-${{ matrix.host.TARGET }} path: | java/bundle.jar + java/client/build/tmp/javadoc/javadoc.options diff --git a/java/client/src/main/java/glide/api/models/commands/scan/ScanOptions.java b/java/client/src/main/java/glide/api/models/commands/scan/ScanOptions.java index 6fffc46f35..da0274bc55 100644 --- a/java/client/src/main/java/glide/api/models/commands/scan/ScanOptions.java +++ b/java/client/src/main/java/glide/api/models/commands/scan/ScanOptions.java @@ -15,7 +15,7 @@ * @see valkey.io */ @SuperBuilder -@EqualsAndHashCode +@EqualsAndHashCode(callSuper = true) public class ScanOptions extends BaseScanOptions { /** TYPE option string to include in the SCAN commands. */ public static final String TYPE_OPTION_STRING = "TYPE"; From fa3c4e0c6382f7320d2d7acaf444cf2e83e64658 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Mon, 15 Jul 2024 19:15:47 -0700 Subject: [PATCH 07/17] Signed-off-by: Yury-Fridlyand --- .github/workflows/java-cd.yml | 1 - .github/workflows/java.yml | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/java-cd.yml b/.github/workflows/java-cd.yml index 5b382769c8..d38b2003dd 100644 --- a/.github/workflows/java-cd.yml +++ b/.github/workflows/java-cd.yml @@ -158,4 +158,3 @@ jobs: name: java-${{ matrix.host.TARGET }} path: | java/bundle.jar - java/client/build/tmp/javadoc/javadoc.options diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index dd8a7fc4af..ed2c0e4e5f 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -171,18 +171,20 @@ jobs: - name: Build java part working-directory: java - run: ./gradlew --continue build + run: ./gradlew javadoc +# run: ./gradlew --continue build - name: Upload test & spotbugs reports if: always() continue-on-error: true uses: actions/upload-artifact@v4 with: - name: test-reports-${{ matrix.java }} + name: test-reports-${{ matrix.java }}-amazon-linux path: | java/client/build/reports/** java/integTest/build/reports/** java/client/build/reports/spotbugs/** + java/client/build/tmp/javadoc/javadoc.options lint-rust: timeout-minutes: 15 From dd9efa92aac0b9e762a1162f324f86cc09aec8e4 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Mon, 15 Jul 2024 19:35:16 -0700 Subject: [PATCH 08/17] Signed-off-by: Yury-Fridlyand --- .github/workflows/java.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index ed2c0e4e5f..7951d99348 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -93,9 +93,9 @@ jobs: version: "26.1" repo-token: ${{ secrets.GITHUB_TOKEN }} - - name: Build java client - working-directory: java - run: ./gradlew --continue build +# - name: Build java client +# working-directory: java +# run: ./gradlew --continue build - name: Ensure no skipped files by linter working-directory: java @@ -181,10 +181,10 @@ jobs: with: name: test-reports-${{ matrix.java }}-amazon-linux path: | - java/client/build/reports/** - java/integTest/build/reports/** - java/client/build/reports/spotbugs/** java/client/build/tmp/javadoc/javadoc.options +# java/client/build/reports/** +# java/integTest/build/reports/** +# java/client/build/reports/spotbugs/** lint-rust: timeout-minutes: 15 From eda4b4e98a465d9fb9cb7e7fe874925f3054a927 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Mon, 15 Jul 2024 19:45:43 -0700 Subject: [PATCH 09/17] Signed-off-by: Yury-Fridlyand --- .github/workflows/java.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 7951d99348..75b547b5f0 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -171,7 +171,7 @@ jobs: - name: Build java part working-directory: java - run: ./gradlew javadoc + run: ./gradlew -d javadoc # run: ./gradlew --continue build - name: Upload test & spotbugs reports @@ -182,6 +182,7 @@ jobs: name: test-reports-${{ matrix.java }}-amazon-linux path: | java/client/build/tmp/javadoc/javadoc.options + java/benchmarks/build/tmp/javadoc/javadoc.options # java/client/build/reports/** # java/integTest/build/reports/** # java/client/build/reports/spotbugs/** From 2f87192ee90e9c778fbc3af1140b6b90b4c020eb Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Mon, 15 Jul 2024 20:05:01 -0700 Subject: [PATCH 10/17] Signed-off-by: Yury-Fridlyand --- .github/workflows/java.yml | 10 ++++------ java/client/build.gradle | 3 ++- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 75b547b5f0..937b62393f 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -165,13 +165,11 @@ jobs: run: | yum install -y java-${{ matrix.java }} - - name: Build rust part + - name: Build java wrapper working-directory: java - run: cargo build --release - - - name: Build java part - working-directory: java - run: ./gradlew -d javadoc + run: | + javadoc --version + ./gradlew -d javadoc # run: ./gradlew --continue build - name: Upload test & spotbugs reports diff --git a/java/client/build.gradle b/java/client/build.gradle index 0178f311ea..406aea54be 100644 --- a/java/client/build.gradle +++ b/java/client/build.gradle @@ -265,7 +265,8 @@ javadoc { dependsOn delombok source = delombok.outputs options.tags = [ "example:a:Example:" ] - failOnError = false // TODO fix all javadoc errors and warnings and remove that + // failOnError = false // TODO fix all javadoc errors and warnings and remove that + options.addBooleanOption("Xdoclint:all", true) } spotbugsMain { From 9b161a38b70d1c2e9caa5c48ca7249e1d6c47818 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Mon, 15 Jul 2024 20:13:55 -0700 Subject: [PATCH 11/17] Signed-off-by: Yury-Fridlyand --- .github/workflows/java.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 937b62393f..b5137580a1 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -163,7 +163,8 @@ jobs: - name: Install Java run: | - yum install -y java-${{ matrix.java }} + yum install -y java-${{ matrix.java }}-amazon-corretto-devel.x86_64 +# yum install -y java-${{ matrix.java }} - name: Build java wrapper working-directory: java From 1111f7e485ab521a4ef8c2449981aa2cdcca6849 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Mon, 15 Jul 2024 20:26:36 -0700 Subject: [PATCH 12/17] Signed-off-by: Yury-Fridlyand --- .github/workflows/java.yml | 20 ++++++++------------ java/client/build.gradle | 3 +-- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index b5137580a1..7eae034a86 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -95,7 +95,7 @@ jobs: # - name: Build java client # working-directory: java -# run: ./gradlew --continue build +# run: ./gradlew --continue build -x javadoc - name: Ensure no skipped files by linter working-directory: java @@ -163,15 +163,13 @@ jobs: - name: Install Java run: | - yum install -y java-${{ matrix.java }}-amazon-corretto-devel.x86_64 -# yum install -y java-${{ matrix.java }} +# yum install -y java-${{ matrix.java }}-amazon-corretto-devel.x86_64 + yum install -y java-${{ matrix.java }} - name: Build java wrapper working-directory: java - run: | - javadoc --version - ./gradlew -d javadoc -# run: ./gradlew --continue build +# run: ./gradlew javadoc + run: ./gradlew --continue build -x javadoc - name: Upload test & spotbugs reports if: always() @@ -180,11 +178,9 @@ jobs: with: name: test-reports-${{ matrix.java }}-amazon-linux path: | - java/client/build/tmp/javadoc/javadoc.options - java/benchmarks/build/tmp/javadoc/javadoc.options -# java/client/build/reports/** -# java/integTest/build/reports/** -# java/client/build/reports/spotbugs/** + java/client/build/reports/** + java/integTest/build/reports/** + java/client/build/reports/spotbugs/** lint-rust: timeout-minutes: 15 diff --git a/java/client/build.gradle b/java/client/build.gradle index 406aea54be..0178f311ea 100644 --- a/java/client/build.gradle +++ b/java/client/build.gradle @@ -265,8 +265,7 @@ javadoc { dependsOn delombok source = delombok.outputs options.tags = [ "example:a:Example:" ] - // failOnError = false // TODO fix all javadoc errors and warnings and remove that - options.addBooleanOption("Xdoclint:all", true) + failOnError = false // TODO fix all javadoc errors and warnings and remove that } spotbugsMain { From f93367f366a6f5ec8fd57fc51fe4c77e4d6c81bf Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Mon, 15 Jul 2024 20:28:06 -0700 Subject: [PATCH 13/17] Signed-off-by: Yury-Fridlyand --- .github/workflows/java.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 7eae034a86..876917b5fb 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -163,8 +163,8 @@ jobs: - name: Install Java run: | -# yum install -y java-${{ matrix.java }}-amazon-corretto-devel.x86_64 yum install -y java-${{ matrix.java }} +# yum install -y java-${{ matrix.java }}-amazon-corretto-devel.x86_64 - name: Build java wrapper working-directory: java From 9c633c9f6dba29961d6ce3cd66ccf551aa484069 Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Mon, 15 Jul 2024 21:02:39 -0700 Subject: [PATCH 14/17] Signed-off-by: Yury-Fridlyand --- .github/workflows/java.yml | 10 ++++------ .../java/glide/api/commands/StreamBaseCommands.java | 4 ++-- .../glide/api/models/commands/scan/ScanOptions.java | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index 876917b5fb..c2ee5a56b3 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -93,9 +93,9 @@ jobs: version: "26.1" repo-token: ${{ secrets.GITHUB_TOKEN }} -# - name: Build java client -# working-directory: java -# run: ./gradlew --continue build -x javadoc + - name: Build java client + working-directory: java + run: ./gradlew --continue build -x javadoc - name: Ensure no skipped files by linter working-directory: java @@ -163,12 +163,10 @@ jobs: - name: Install Java run: | - yum install -y java-${{ matrix.java }} -# yum install -y java-${{ matrix.java }}-amazon-corretto-devel.x86_64 + yum install -y java-${{ matrix.java }}-amazon-corretto-devel.x86_64 - name: Build java wrapper working-directory: java -# run: ./gradlew javadoc run: ./gradlew --continue build -x javadoc - name: Upload test & spotbugs reports diff --git a/java/client/src/main/java/glide/api/commands/StreamBaseCommands.java b/java/client/src/main/java/glide/api/commands/StreamBaseCommands.java index 883e52c8e5..c88bda1201 100644 --- a/java/client/src/main/java/glide/api/commands/StreamBaseCommands.java +++ b/java/client/src/main/java/glide/api/commands/StreamBaseCommands.java @@ -653,7 +653,7 @@ CompletableFuture> xrevrange( * @param key The key of the stream. * @param groupname The newly created consumer group name. * @param id Stream entry ID that specifies the last delivered entry in the stream from the new - * group's perspective. The special ID "$" can be used to specify the last entry + * group’s perspective. The special ID "$" can be used to specify the last entry * in the stream. * @return OK. * @example @@ -693,7 +693,7 @@ CompletableFuture xgroupCreate( * @param key The key of the stream. * @param groupName The newly created consumer group name. * @param id Stream entry ID that specifies the last delivered entry in the stream from the new - * group's perspective. The special ID "$" can be used to specify the last entry + * group’s perspective. The special ID "$" can be used to specify the last entry * in the stream. * @param options The group options {@link StreamGroupOptions}. * @return OK. diff --git a/java/client/src/main/java/glide/api/models/commands/scan/ScanOptions.java b/java/client/src/main/java/glide/api/models/commands/scan/ScanOptions.java index da0274bc55..6fffc46f35 100644 --- a/java/client/src/main/java/glide/api/models/commands/scan/ScanOptions.java +++ b/java/client/src/main/java/glide/api/models/commands/scan/ScanOptions.java @@ -15,7 +15,7 @@ * @see valkey.io */ @SuperBuilder -@EqualsAndHashCode(callSuper = true) +@EqualsAndHashCode public class ScanOptions extends BaseScanOptions { /** TYPE option string to include in the SCAN commands. */ public static final String TYPE_OPTION_STRING = "TYPE"; From f7f70e3ef2d693fece79a8c6446321e6c88a1a4f Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Mon, 15 Jul 2024 21:32:04 -0700 Subject: [PATCH 15/17] Signed-off-by: Yury-Fridlyand --- .github/workflows/java-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-cd.yml b/.github/workflows/java-cd.yml index d38b2003dd..bdd33917e8 100644 --- a/.github/workflows/java-cd.yml +++ b/.github/workflows/java-cd.yml @@ -149,7 +149,7 @@ jobs: jar -cvf bundle.jar * ls -ltr cd - - cp $src_folder/bundle-${{ matrix.host.TARGET }}.jar . + cp $src_folder/bundle.jar bundle-${{ matrix.host.TARGET }}.jar - name: Upload artifacts to publish continue-on-error: true From 9d9ae55c4ef6e2665cd28af127e9e00e537d34bd Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Tue, 16 Jul 2024 11:25:01 -0700 Subject: [PATCH 16/17] Signed-off-by: Yury-Fridlyand --- .github/workflows/java-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/java-cd.yml b/.github/workflows/java-cd.yml index bdd33917e8..0859892b45 100644 --- a/.github/workflows/java-cd.yml +++ b/.github/workflows/java-cd.yml @@ -157,4 +157,4 @@ jobs: with: name: java-${{ matrix.host.TARGET }} path: | - java/bundle.jar + java/bundle*.jar From 4d36b9fb899522f373b797ce19bf8d170a77e2be Mon Sep 17 00:00:00 2001 From: Yury-Fridlyand Date: Wed, 17 Jul 2024 08:52:14 -0700 Subject: [PATCH 17/17] Signed-off-by: Yury-Fridlyand --- examples/java/build.gradle | 2 +- java/DEVELOPER.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/java/build.gradle b/examples/java/build.gradle index be87b0a3f8..fa55ac434e 100644 --- a/examples/java/build.gradle +++ b/examples/java/build.gradle @@ -11,7 +11,7 @@ repositories { } dependencies { - implementation group: 'io.valkey', name: 'valkey-glide', version: '1.0.0', classifier: osdetector.classifier + implementation "io.valkey:valkey-glide:1.0.1:${osdetector.classifier}" } application { diff --git a/java/DEVELOPER.md b/java/DEVELOPER.md index 3a3fda1272..ef78ee7c15 100644 --- a/java/DEVELOPER.md +++ b/java/DEVELOPER.md @@ -179,7 +179,7 @@ dependencies { Optionally: you can specify a snapshot release: ```bash -export GLIDE_RELEASE_VERSION=1.0.0-SNAPSHOT +export GLIDE_RELEASE_VERSION=1.0.1-SNAPSHOT ./gradlew publishToMavenLocal ``` @@ -190,7 +190,7 @@ repositories { } dependencies { // Update to use version defined in the previous step - implementation group: 'io.valkey', name: 'valkey-glide', version: '1.0.0-SNAPSHOT', classifier='osx-aarch_64' + implementation group: 'io.valkey', name: 'valkey-glide', version: '1.0.1-SNAPSHOT', classifier='osx-aarch_64' } ```