From 776ea9d8a3401f1e0217b6098f7f815b2df58b96 Mon Sep 17 00:00:00 2001
From: jimit-j-shah <57637300+jimit-j-shah@users.noreply.github.com>
Date: Tue, 24 Sep 2024 00:50:00 -0700
Subject: [PATCH 1/3] fix: Update opentelemetry-sdk dependency to be test-only

---
 google-cloud-datastore/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/google-cloud-datastore/pom.xml b/google-cloud-datastore/pom.xml
index 23d17e836..26b2825c5 100644
--- a/google-cloud-datastore/pom.xml
+++ b/google-cloud-datastore/pom.xml
@@ -200,6 +200,7 @@
       <groupId>io.opentelemetry</groupId>
       <artifactId>opentelemetry-sdk</artifactId>
       <version>${opentelemetry.version}</version>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>

From 6baf22f07f2e11bbbab443cf91cbf1e1dd76add6 Mon Sep 17 00:00:00 2001
From: jimit-j-shah <57637300+jimit-j-shah@users.noreply.github.com>
Date: Tue, 24 Sep 2024 10:54:14 -0700
Subject: [PATCH 2/3] fix: move RemoteDatastoreHelper into `test`

---
 .../com/google/cloud/datastore/testing/RemoteDatastoreHelper.java | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename google-cloud-datastore/src/{main => test}/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java (100%)

diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
similarity index 100%
rename from google-cloud-datastore/src/main/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java
rename to google-cloud-datastore/src/test/java/com/google/cloud/datastore/testing/RemoteDatastoreHelper.java

From 91a11799065d0cf6b338bdfd87075621c143b431 Mon Sep 17 00:00:00 2001
From: jimit-j-shah <57637300+jimit-j-shah@users.noreply.github.com>
Date: Tue, 24 Sep 2024 11:00:57 -0700
Subject: [PATCH 3/3] fix: Add CLIRR exception for 8001: Removed class for
 `RemoteDatastoreHelper`

---
 google-cloud-datastore/clirr-ignored-differences.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/google-cloud-datastore/clirr-ignored-differences.xml b/google-cloud-datastore/clirr-ignored-differences.xml
index 847ba4f4c..6275f05c6 100644
--- a/google-cloud-datastore/clirr-ignored-differences.xml
+++ b/google-cloud-datastore/clirr-ignored-differences.xml
@@ -67,4 +67,9 @@
         <className>com/google/cloud/datastore/TraceUtil</className>
         <differenceType>8001</differenceType>
     </difference>
+    <difference>
+        <className>com/google/cloud/datastore/testing/RemoteDatastoreHelper</className>
+        <differenceType>8001</differenceType>
+    </difference>
+
 </differences>