Skip to content

Commit 743f87a

Browse files
Java: Fix Jedis compatibility layer valkey-glide dependency (#4737)
* Java: Fix Jedis compatibility layer valkey-glide dependency Signed-off-by: Prateek Kumar <prateek.kumar@improving.com>
1 parent 6b71f64 commit 743f87a

File tree

2 files changed

+18
-5
lines changed

2 files changed

+18
-5
lines changed

.github/workflows/java-cd.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,22 @@ jobs:
152152
working-directory: java
153153
run: |
154154
if [[ "${{ matrix.host.TARGET }}" == *"musl"* ]]; then
155-
./gradlew --build-cache :client:publishToMavenLocal :jedis-compatibility:publishToMavenLocal -Psigning.secretKeyRingFile=secring.gpg \
155+
# Build and publish client first
156+
./gradlew --build-cache :client:publishToMavenLocal -Psigning.secretKeyRingFile=secring.gpg \
157+
-Psigning.password="${{ secrets.GPG_PASSWORD }}" -Psigning.keyId=${{ secrets.GPG_KEY_ID }} \
158+
-Ptarget=${{ matrix.host.TARGET }}
159+
160+
# Then build jedis-compatibility
161+
./gradlew --build-cache :jedis-compatibility:publishToMavenLocal -Psigning.secretKeyRingFile=secring.gpg \
156162
-Psigning.password="${{ secrets.GPG_PASSWORD }}" -Psigning.keyId=${{ secrets.GPG_KEY_ID }} \
157163
-Ptarget=${{ matrix.host.TARGET }}
158164
else
159-
./gradlew --build-cache :client:publishToMavenLocal :jedis-compatibility:publishToMavenLocal -Psigning.secretKeyRingFile=secring.gpg \
165+
# Build and publish client first
166+
./gradlew --build-cache :client:publishToMavenLocal -Psigning.secretKeyRingFile=secring.gpg \
167+
-Psigning.password="${{ secrets.GPG_PASSWORD }}" -Psigning.keyId=${{ secrets.GPG_KEY_ID }}
168+
169+
# Then build jedis-compatibility
170+
./gradlew --build-cache :jedis-compatibility:publishToMavenLocal -Psigning.secretKeyRingFile=secring.gpg \
160171
-Psigning.password="${{ secrets.GPG_PASSWORD }}" -Psigning.keyId=${{ secrets.GPG_KEY_ID }}
161172
fi
162173
env:

java/jedis-compatibility/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ ext {
2121
}
2222

2323
dependencies {
24-
// Depend on the main GLIDE client
2524
implementation project(':client')
2625

26+
// Transitive dependencies needed by GLIDE client
27+
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.13.0'
28+
2729
// Explicit protobuf version to match client
2830
shadow group: 'com.google.protobuf', name: 'protobuf-java', version: '4.29.3'
2931

@@ -74,10 +76,10 @@ tasks.register('copyNativeLib', Copy) {
7476
jar.dependsOn('copyNativeLib')
7577
shadowJar.dependsOn('copyNativeLib')
7678
javadoc.dependsOn('copyNativeLib')
77-
copyNativeLib.dependsOn(':client:buildRust')
78-
compileJava.dependsOn(':client:shadowJar', ':client:jar')
7979
compileTestJava.dependsOn('copyNativeLib')
8080
delombok.dependsOn('compileJava')
81+
copyNativeLib.dependsOn(':client:buildRust')
82+
compileJava.dependsOn(':client:shadowJar', ':client:jar')
8183

8284
tasks.withType(Test) {
8385
useJUnitPlatform()

0 commit comments

Comments
 (0)