Merge remote-tracking branch 'upstream/main' into go/xgroup-create

Signed-off-by: Yury-Fridlyand <[email protected]>
Bit-Quill · Jan 20, 2025 · 5648fe3 · 5648fe3
2 parents 0099bc9 + a2e90f6
commit 5648fe3
Show file tree

Hide file tree

Showing 22 changed files with 2,853 additions and 280 deletions.
diff --git a/.github/workflows/ort.yml b/.github/workflows/ort.yml
@@ -158,6 +158,17 @@ jobs:
                   distribution: "temurin"
                   java-version: 11
 
+            - name: Install protoc (protobuf)
+              uses: arduino/setup-protoc@v3
+              with:
+                  version: "29.1"
+                  repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+            - name: Build java artifact
+              working-directory: ./java
+              run: |
+                  ./gradlew publishToMavenLocal -x buildRust -x javadoc
+
             - name: Run ORT tools for Java
               uses: ./.github/workflows/run-ort-tools
               with:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@
 * Go: Add `ZCARD` ([#2838](https://github.com/valkey-io/valkey-glide/pull/2838))
 * Java, Node, Python: Update documentation for CONFIG SET and CONFIG GET ([#2919](https://github.com/valkey-io/valkey-glide/pull/2919))
 * Go: Add `BZPopMin` ([#2849](https://github.com/valkey-io/valkey-glide/pull/2849))
+* Java: Shadow `protobuf` dependency ([#2931](https://github.com/valkey-io/valkey-glide/pull/2931))
 * Java: Add `RESP2` support ([#2383](https://github.com/valkey-io/valkey-glide/pull/2383))
 * Node: Add `IFEQ` option ([#2909](https://github.com/valkey-io/valkey-glide/pull/2909))