From 20996feef64bbffc54829fbc582329d4753c1ab7 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 15 Jan 2025 11:08:17 -0600 Subject: [PATCH 1/2] Use proper groupId for mysql connector in java Signed-off-by: Florent Poinsard --- .github/workflows/docker_test_cluster_10.yml | 1 + .github/workflows/docker_test_cluster_25.yml | 1 + java/example/pom.xml | 2 +- java/pom.xml | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker_test_cluster_10.yml b/.github/workflows/docker_test_cluster_10.yml index 090edd8ae33..6dc7b19b456 100644 --- a/.github/workflows/docker_test_cluster_10.yml +++ b/.github/workflows/docker_test_cluster_10.yml @@ -50,6 +50,7 @@ jobs: - 'config/**' - 'bootstrap.sh' - 'docker/**' + - 'java/**' - '.github/workflows/docker_test_cluster_10.yml' - name: Set up Go diff --git a/.github/workflows/docker_test_cluster_25.yml b/.github/workflows/docker_test_cluster_25.yml index a0159f941b0..ab6e418eed0 100644 --- a/.github/workflows/docker_test_cluster_25.yml +++ b/.github/workflows/docker_test_cluster_25.yml @@ -50,6 +50,7 @@ jobs: - 'config/**' - 'bootstrap.sh' - 'docker/**' + - 'java/**' - '.github/workflows/docker_test_cluster_25.yml' - name: Set up Go diff --git a/java/example/pom.xml b/java/example/pom.xml index 114dc9af5ff..19b5838510b 100644 --- a/java/example/pom.xml +++ b/java/example/pom.xml @@ -30,7 +30,7 @@ - mysql + com.mysql mysql-connector-j 8.4.0 false diff --git a/java/pom.xml b/java/pom.xml index 7a80212f0a9..bc173282faf 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -252,7 +252,7 @@ true true - mysql:mysql-connector-j + com.mysql:mysql-connector-j io.grpc:grpc-context From 2e590d12efc43418e80d5a074322a18893bfec07 Mon Sep 17 00:00:00 2001 From: Florent Poinsard Date: Wed, 15 Jan 2025 11:20:56 -0600 Subject: [PATCH 2/2] Rename workflow Signed-off-by: Florent Poinsard --- .github/workflows/docker_test_cluster_25.yml | 1 - .../{docker_test_cluster_10.yml => java_docker_test.yml} | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) rename .github/workflows/{docker_test_cluster_10.yml => java_docker_test.yml} (97%) diff --git a/.github/workflows/docker_test_cluster_25.yml b/.github/workflows/docker_test_cluster_25.yml index ab6e418eed0..a0159f941b0 100644 --- a/.github/workflows/docker_test_cluster_25.yml +++ b/.github/workflows/docker_test_cluster_25.yml @@ -50,7 +50,6 @@ jobs: - 'config/**' - 'bootstrap.sh' - 'docker/**' - - 'java/**' - '.github/workflows/docker_test_cluster_25.yml' - name: Set up Go diff --git a/.github/workflows/docker_test_cluster_10.yml b/.github/workflows/java_docker_test.yml similarity index 97% rename from .github/workflows/docker_test_cluster_10.yml rename to .github/workflows/java_docker_test.yml index 6dc7b19b456..c49beba7b61 100644 --- a/.github/workflows/docker_test_cluster_10.yml +++ b/.github/workflows/java_docker_test.yml @@ -1,10 +1,10 @@ -name: docker_test_cluster_10 +name: java_docker_test on: [push, pull_request] permissions: read-all jobs: build: - name: Docker Test Cluster 10 + name: Java Docker Test runs-on: ubuntu-24.04 steps: