From ab4bb2dd93bfbdfae182487a0a39728ea8780d6d Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Mon, 26 Feb 2024 13:56:53 -0500
Subject: [PATCH 1/3] deps: grandfathering the dependencies

Apache Arrow dependencies for java-bigquery

Flogger dependencies for java-pubsublite
---
 .../third-party-dependencies/pom.xml          | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml
index 3eb48c6852..60dd2b8a4e 100644
--- a/java-shared-dependencies/third-party-dependencies/pom.xml
+++ b/java-shared-dependencies/third-party-dependencies/pom.xml
@@ -38,10 +38,30 @@
     <perfmark-api.version>0.27.0</perfmark-api.version>
     <j2objc-annotations.version>2.8</j2objc-annotations.version>
     <opentelemetry.version>1.34.1</opentelemetry.version>
+    <flogger.version>0.8</flogger.version>
+    <arrow.version>15.0.0</arrow.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
+
+      <!-- org.apache.arrow:arrow-memory-core, org.threeten:threeten-extra, org.apache.arrow:arrow-memory-netty, org.apache.arrow:arrow-vector, org.apache.arrow:arrow-format -->
+      <dependency>
+        <groupId>org.apache.arrow</groupId>
+        <artifactId>arrow-memory-core</artifactId>
+        <version>${arrow.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.arrow</groupId>
+        <artifactId>arrow-memory-netty</artifactId>
+        <version>${arrow.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.arrow</groupId>
+        <artifactId>arrow-vector</artifactId>
+        <version>${arrow.version}</version>
+      </dependency>
+
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpcore</artifactId>
@@ -57,6 +77,11 @@
         <artifactId>threetenbp</artifactId>
         <version>${threeten.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.threeten</groupId>
+        <artifactId>threeten-extra</artifactId>
+        <version>${threeten.version}</version>
+      </dependency>
       <dependency>
         <groupId>javax.annotation</groupId>
         <artifactId>javax.annotation-api</artifactId>
@@ -78,6 +103,18 @@
         <artifactId>error_prone_annotations</artifactId>
         <version>${errorprone.version}</version>
       </dependency>
+      <!-- Grandfathering java-pubsublite's flogger dependencies.
+      In general, let's avoid declaring logging backend dependencies -->
+      <dependency>
+        <groupId>com.google.flogger</groupId>
+        <artifactId>google-extensions</artifactId>
+        <version>${flogger.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.flogger</groupId>
+        <artifactId>flogger-system-backend</artifactId>
+        <version>${flogger.version}</version>
+      </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>

From 679ca0f81e6a56d0e077f17b4b20f00165971f83 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Mon, 26 Feb 2024 14:30:33 -0500
Subject: [PATCH 2/3] deps: threeten-extra.version

---
 java-shared-dependencies/third-party-dependencies/pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml
index 60dd2b8a4e..5e39126ea8 100644
--- a/java-shared-dependencies/third-party-dependencies/pom.xml
+++ b/java-shared-dependencies/third-party-dependencies/pom.xml
@@ -24,6 +24,7 @@
     <site.installationModule>${project.artifactId}</site.installationModule>
 
     <threeten.version>1.6.8</threeten.version>
+    <threeten-extra.version>1.7.2</threeten-extra.version>
     <javax.annotations.version>1.3.2</javax.annotations.version>
     <animal-sniffer.version>1.23</animal-sniffer.version>
     <opencensus.version>0.31.1</opencensus.version>
@@ -80,7 +81,7 @@
       <dependency>
         <groupId>org.threeten</groupId>
         <artifactId>threeten-extra</artifactId>
-        <version>${threeten.version}</version>
+        <version>${threeten-extra.version}</version>
       </dependency>
       <dependency>
         <groupId>javax.annotation</groupId>

From 978d8134068db9085f52fee0f00e6f50d173adb3 Mon Sep 17 00:00:00 2001
From: Tomo Suzuki <suztomo@google.com>
Date: Mon, 26 Feb 2024 15:06:34 -0500
Subject: [PATCH 3/3] Legacy exemption

---
 java-shared-dependencies/third-party-dependencies/pom.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/java-shared-dependencies/third-party-dependencies/pom.xml b/java-shared-dependencies/third-party-dependencies/pom.xml
index 5e39126ea8..461329cb3d 100644
--- a/java-shared-dependencies/third-party-dependencies/pom.xml
+++ b/java-shared-dependencies/third-party-dependencies/pom.xml
@@ -45,8 +45,6 @@
 
   <dependencyManagement>
     <dependencies>
-
-      <!-- org.apache.arrow:arrow-memory-core, org.threeten:threeten-extra, org.apache.arrow:arrow-memory-netty, org.apache.arrow:arrow-vector, org.apache.arrow:arrow-format -->
       <dependency>
         <groupId>org.apache.arrow</groupId>
         <artifactId>arrow-memory-core</artifactId>
@@ -62,7 +60,6 @@
         <artifactId>arrow-vector</artifactId>
         <version>${arrow.version}</version>
       </dependency>
-
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpcore</artifactId>
@@ -104,7 +101,7 @@
         <artifactId>error_prone_annotations</artifactId>
         <version>${errorprone.version}</version>
       </dependency>
-      <!-- Grandfathering java-pubsublite's flogger dependencies.
+      <!-- Legacy exemption of java-pubsublite's flogger dependencies.
       In general, let's avoid declaring logging backend dependencies -->
       <dependency>
         <groupId>com.google.flogger</groupId>