From a1218a383d80986b029feb53660fd18066f1b826 Mon Sep 17 00:00:00 2001
From: Sri Harsha CH <sriharshach@google.com>
Date: Fri, 15 Dec 2023 19:27:48 +0530
Subject: [PATCH 1/5] test: update executor code

---
 google-cloud-spanner-executor/pom.xml                      | 7 +++++--
 .../spanner => spanner/executor}/CloudClientExecutor.java  | 2 +-
 .../spanner => spanner/executor}/CloudExecutor.java        | 4 ++--
 .../spanner => spanner/executor}/CloudExecutorImpl.java    | 2 +-
 .../{executor/spanner => spanner/executor}/CloudUtil.java  | 2 +-
 .../spanner => spanner/executor}/WorkerProxy.java          | 3 ++-
 google-cloud-spanner/pom.xml                               | 1 -
 7 files changed, 12 insertions(+), 9 deletions(-)
 rename google-cloud-spanner-executor/src/main/java/com/google/cloud/{executor/spanner => spanner/executor}/CloudClientExecutor.java (99%)
 rename google-cloud-spanner-executor/src/main/java/com/google/cloud/{executor/spanner => spanner/executor}/CloudExecutor.java (99%)
 rename google-cloud-spanner-executor/src/main/java/com/google/cloud/{executor/spanner => spanner/executor}/CloudExecutorImpl.java (98%)
 rename google-cloud-spanner-executor/src/main/java/com/google/cloud/{executor/spanner => spanner/executor}/CloudUtil.java (99%)
 rename google-cloud-spanner-executor/src/main/java/com/google/cloud/{executor/spanner => spanner/executor}/WorkerProxy.java (99%)

diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml
index eab274a3a6f..1fdd625d5f1 100644
--- a/google-cloud-spanner-executor/pom.xml
+++ b/google-cloud-spanner-executor/pom.xml
@@ -93,7 +93,10 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-spanner-executor-v1</artifactId>
-      <version>1.4.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>grpc-google-cloud-spanner-executor-v1</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -168,7 +171,7 @@
           </descriptors>
           <archive>
             <manifest>
-              <mainClass>com.google.cloud.executor.spanner.WorkerProxy</mainClass>
+              <mainClass>com.google.cloud.spanner.executor.WorkerProxy</mainClass>
             </manifest>
           </archive>
         </configuration>
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudClientExecutor.java
similarity index 99%
rename from google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java
rename to google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudClientExecutor.java
index ffcf61b96b8..1fb221db1cc 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudClientExecutor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.executor.spanner;
+package com.google.cloud.spanner.executor;
 
 import static com.google.cloud.spanner.TransactionRunner.TransactionCallable;
 
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutor.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java
similarity index 99%
rename from google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutor.java
rename to google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java
index cda9923f392..89138ee4194 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutor.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.cloud.executor.spanner;
+package com.google.cloud.spanner.executor;
 
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.auth.http.HttpTransportFactory;
-import com.google.cloud.executor.spanner.CloudClientExecutor.ExecutionFlowContext;
+import com.google.cloud.spanner.executor.CloudClientExecutor.ExecutionFlowContext;
 import com.google.cloud.spanner.ErrorCode;
 import com.google.cloud.spanner.SpannerException;
 import com.google.cloud.spanner.SpannerExceptionFactory;
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutorImpl.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutorImpl.java
similarity index 98%
rename from google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutorImpl.java
rename to google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutorImpl.java
index 548392b5c84..6c9084913f9 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutorImpl.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutorImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.executor.spanner;
+package com.google.cloud.spanner.executor;
 
 import com.google.cloud.spanner.ErrorCode;
 import com.google.cloud.spanner.SpannerExceptionFactory;
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudUtil.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudUtil.java
similarity index 99%
rename from google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudUtil.java
rename to google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudUtil.java
index 30a4d98a354..71bf4600552 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudUtil.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.executor.spanner;
+package com.google.cloud.spanner.executor;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/WorkerProxy.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java
similarity index 99%
rename from google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/WorkerProxy.java
rename to google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java
index 08809d45887..d6c92462471 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/WorkerProxy.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java
@@ -14,10 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.cloud.executor.spanner;
+package com.google.cloud.spanner.executor;
 
 import com.google.cloud.spanner.ErrorCode;
 import com.google.cloud.spanner.SpannerExceptionFactory;
+
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
 import io.grpc.protobuf.services.HealthStatusManager;
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
index e929635d841..1aabcfa93c1 100644
--- a/google-cloud-spanner/pom.xml
+++ b/google-cloud-spanner/pom.xml
@@ -201,7 +201,6 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-spanner-executor-v1</artifactId>
-      <version>1.4.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>

From 28a9022353c7ff1b4f22d44e3372181e23a16c03 Mon Sep 17 00:00:00 2001
From: Sri Harsha CH <sriharshach@google.com>
Date: Fri, 15 Dec 2023 19:55:04 +0530
Subject: [PATCH 2/5] fix: line and clirr

---
 .../clirr-ignored-differences.xml             | 32 +++++++++++++++++++
 .../cloud/spanner/executor/CloudExecutor.java |  2 +-
 .../cloud/spanner/executor/WorkerProxy.java   |  1 -
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 google-cloud-spanner-executor/clirr-ignored-differences.xml

diff --git a/google-cloud-spanner-executor/clirr-ignored-differences.xml b/google-cloud-spanner-executor/clirr-ignored-differences.xml
new file mode 100644
index 00000000000..dd234e4ab96
--- /dev/null
+++ b/google-cloud-spanner-executor/clirr-ignored-differences.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
+<differences>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/executor/spanner/CloudClientExecutor</className>
+  </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/executor/spanner/CloudExecutor</className>
+  </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/executor/spanner/CloudExecutorImpl</className>
+  </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/executor/spanner/CloudUtil</className>
+  </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/executor/spanner/WorkerProxy</className>
+  </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/executor/spanner/CloudExecutor$Metadata</className>
+  </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/executor/spanner/CloudExecutor$OutcomeSender</className>
+  </difference>
+</differences>
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java
index 89138ee4194..00c7ed6eba3 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java
@@ -18,10 +18,10 @@
 
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.auth.http.HttpTransportFactory;
-import com.google.cloud.spanner.executor.CloudClientExecutor.ExecutionFlowContext;
 import com.google.cloud.spanner.ErrorCode;
 import com.google.cloud.spanner.SpannerException;
 import com.google.cloud.spanner.SpannerExceptionFactory;
+import com.google.cloud.spanner.executor.CloudClientExecutor.ExecutionFlowContext;
 import com.google.common.base.Preconditions;
 import com.google.protobuf.Timestamp;
 import com.google.protobuf.util.Timestamps;
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java
index d6c92462471..9dbf6e2f003 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java
@@ -18,7 +18,6 @@
 
 import com.google.cloud.spanner.ErrorCode;
 import com.google.cloud.spanner.SpannerExceptionFactory;
-
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
 import io.grpc.protobuf.services.HealthStatusManager;

From 53484a3ab3078f6c64d83320e05975481ee72d59 Mon Sep 17 00:00:00 2001
From: Sri Harsha CH <sriharshach@google.com>
Date: Wed, 20 Dec 2023 13:07:05 +0530
Subject: [PATCH 3/5] Revert "fix: line and clirr"

This reverts commit 28a9022353c7ff1b4f22d44e3372181e23a16c03.
---
 .../clirr-ignored-differences.xml             | 32 -------------------
 .../cloud/spanner/executor/CloudExecutor.java |  2 +-
 .../cloud/spanner/executor/WorkerProxy.java   |  1 +
 3 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 google-cloud-spanner-executor/clirr-ignored-differences.xml

diff --git a/google-cloud-spanner-executor/clirr-ignored-differences.xml b/google-cloud-spanner-executor/clirr-ignored-differences.xml
deleted file mode 100644
index dd234e4ab96..00000000000
--- a/google-cloud-spanner-executor/clirr-ignored-differences.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- see http://www.mojohaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
-<differences>
-  <difference>
-    <differenceType>8001</differenceType>
-    <className>com/google/cloud/executor/spanner/CloudClientExecutor</className>
-  </difference>
-  <difference>
-    <differenceType>8001</differenceType>
-    <className>com/google/cloud/executor/spanner/CloudExecutor</className>
-  </difference>
-  <difference>
-    <differenceType>8001</differenceType>
-    <className>com/google/cloud/executor/spanner/CloudExecutorImpl</className>
-  </difference>
-  <difference>
-    <differenceType>8001</differenceType>
-    <className>com/google/cloud/executor/spanner/CloudUtil</className>
-  </difference>
-  <difference>
-    <differenceType>8001</differenceType>
-    <className>com/google/cloud/executor/spanner/WorkerProxy</className>
-  </difference>
-  <difference>
-    <differenceType>8001</differenceType>
-    <className>com/google/cloud/executor/spanner/CloudExecutor$Metadata</className>
-  </difference>
-  <difference>
-    <differenceType>8001</differenceType>
-    <className>com/google/cloud/executor/spanner/CloudExecutor$OutcomeSender</className>
-  </difference>
-</differences>
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java
index 00c7ed6eba3..89138ee4194 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java
@@ -18,10 +18,10 @@
 
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.auth.http.HttpTransportFactory;
+import com.google.cloud.spanner.executor.CloudClientExecutor.ExecutionFlowContext;
 import com.google.cloud.spanner.ErrorCode;
 import com.google.cloud.spanner.SpannerException;
 import com.google.cloud.spanner.SpannerExceptionFactory;
-import com.google.cloud.spanner.executor.CloudClientExecutor.ExecutionFlowContext;
 import com.google.common.base.Preconditions;
 import com.google.protobuf.Timestamp;
 import com.google.protobuf.util.Timestamps;
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java
index 9dbf6e2f003..d6c92462471 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java
@@ -18,6 +18,7 @@
 
 import com.google.cloud.spanner.ErrorCode;
 import com.google.cloud.spanner.SpannerExceptionFactory;
+
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
 import io.grpc.protobuf.services.HealthStatusManager;

From 165f78818935637e40586e2340ec9066d7e0c81e Mon Sep 17 00:00:00 2001
From: Sri Harsha CH <sriharshach@google.com>
Date: Wed, 20 Dec 2023 13:09:14 +0530
Subject: [PATCH 4/5] Revert "test: update executor code"

This reverts commit a1218a383d80986b029feb53660fd18066f1b826.
---
 google-cloud-spanner-executor/pom.xml                      | 7 ++-----
 .../executor => executor/spanner}/CloudClientExecutor.java | 2 +-
 .../executor => executor/spanner}/CloudExecutor.java       | 4 ++--
 .../executor => executor/spanner}/CloudExecutorImpl.java   | 2 +-
 .../{spanner/executor => executor/spanner}/CloudUtil.java  | 2 +-
 .../executor => executor/spanner}/WorkerProxy.java         | 3 +--
 google-cloud-spanner/pom.xml                               | 1 +
 7 files changed, 9 insertions(+), 12 deletions(-)
 rename google-cloud-spanner-executor/src/main/java/com/google/cloud/{spanner/executor => executor/spanner}/CloudClientExecutor.java (99%)
 rename google-cloud-spanner-executor/src/main/java/com/google/cloud/{spanner/executor => executor/spanner}/CloudExecutor.java (99%)
 rename google-cloud-spanner-executor/src/main/java/com/google/cloud/{spanner/executor => executor/spanner}/CloudExecutorImpl.java (98%)
 rename google-cloud-spanner-executor/src/main/java/com/google/cloud/{spanner/executor => executor/spanner}/CloudUtil.java (99%)
 rename google-cloud-spanner-executor/src/main/java/com/google/cloud/{spanner/executor => executor/spanner}/WorkerProxy.java (99%)

diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml
index 1fdd625d5f1..eab274a3a6f 100644
--- a/google-cloud-spanner-executor/pom.xml
+++ b/google-cloud-spanner-executor/pom.xml
@@ -93,10 +93,7 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-spanner-executor-v1</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.api.grpc</groupId>
-      <artifactId>grpc-google-cloud-spanner-executor-v1</artifactId>
+      <version>1.4.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -171,7 +168,7 @@
           </descriptors>
           <archive>
             <manifest>
-              <mainClass>com.google.cloud.spanner.executor.WorkerProxy</mainClass>
+              <mainClass>com.google.cloud.executor.spanner.WorkerProxy</mainClass>
             </manifest>
           </archive>
         </configuration>
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudClientExecutor.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java
similarity index 99%
rename from google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudClientExecutor.java
rename to google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java
index 1fb221db1cc..ffcf61b96b8 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudClientExecutor.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudClientExecutor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.spanner.executor;
+package com.google.cloud.executor.spanner;
 
 import static com.google.cloud.spanner.TransactionRunner.TransactionCallable;
 
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutor.java
similarity index 99%
rename from google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java
rename to google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutor.java
index 89138ee4194..cda9923f392 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutor.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutor.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.cloud.spanner.executor;
+package com.google.cloud.executor.spanner;
 
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.auth.http.HttpTransportFactory;
-import com.google.cloud.spanner.executor.CloudClientExecutor.ExecutionFlowContext;
+import com.google.cloud.executor.spanner.CloudClientExecutor.ExecutionFlowContext;
 import com.google.cloud.spanner.ErrorCode;
 import com.google.cloud.spanner.SpannerException;
 import com.google.cloud.spanner.SpannerExceptionFactory;
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutorImpl.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutorImpl.java
similarity index 98%
rename from google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutorImpl.java
rename to google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutorImpl.java
index 6c9084913f9..548392b5c84 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudExecutorImpl.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudExecutorImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.spanner.executor;
+package com.google.cloud.executor.spanner;
 
 import com.google.cloud.spanner.ErrorCode;
 import com.google.cloud.spanner.SpannerExceptionFactory;
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudUtil.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudUtil.java
similarity index 99%
rename from google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudUtil.java
rename to google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudUtil.java
index 71bf4600552..30a4d98a354 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/CloudUtil.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/CloudUtil.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.cloud.spanner.executor;
+package com.google.cloud.executor.spanner;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
diff --git a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java b/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/WorkerProxy.java
similarity index 99%
rename from google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java
rename to google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/WorkerProxy.java
index d6c92462471..08809d45887 100644
--- a/google-cloud-spanner-executor/src/main/java/com/google/cloud/spanner/executor/WorkerProxy.java
+++ b/google-cloud-spanner-executor/src/main/java/com/google/cloud/executor/spanner/WorkerProxy.java
@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package com.google.cloud.spanner.executor;
+package com.google.cloud.executor.spanner;
 
 import com.google.cloud.spanner.ErrorCode;
 import com.google.cloud.spanner.SpannerExceptionFactory;
-
 import io.grpc.Server;
 import io.grpc.ServerBuilder;
 import io.grpc.protobuf.services.HealthStatusManager;
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
index 1aabcfa93c1..e929635d841 100644
--- a/google-cloud-spanner/pom.xml
+++ b/google-cloud-spanner/pom.xml
@@ -201,6 +201,7 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-spanner-executor-v1</artifactId>
+      <version>1.4.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>

From 42c5d877308f7fefe785b21b0cd68369ef460db4 Mon Sep 17 00:00:00 2001
From: Sri Harsha CH <sriharshach@google.com>
Date: Wed, 20 Dec 2023 13:13:01 +0530
Subject: [PATCH 5/5] feat: update pom.xml

---
 google-cloud-spanner-executor/pom.xml | 5 ++++-
 google-cloud-spanner/pom.xml          | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/google-cloud-spanner-executor/pom.xml b/google-cloud-spanner-executor/pom.xml
index eab274a3a6f..78657303de0 100644
--- a/google-cloud-spanner-executor/pom.xml
+++ b/google-cloud-spanner-executor/pom.xml
@@ -93,7 +93,10 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-spanner-executor-v1</artifactId>
-      <version>1.4.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.api.grpc</groupId>
+      <artifactId>grpc-google-cloud-spanner-executor-v1</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.guava</groupId>
diff --git a/google-cloud-spanner/pom.xml b/google-cloud-spanner/pom.xml
index e929635d841..1aabcfa93c1 100644
--- a/google-cloud-spanner/pom.xml
+++ b/google-cloud-spanner/pom.xml
@@ -201,7 +201,6 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-spanner-executor-v1</artifactId>
-      <version>1.4.0</version>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>