From d7984cdb2407e1c5873a1c51cc4e859d3cb8cdd6 Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Tue, 19 Nov 2024 13:04:30 -0500
Subject: [PATCH 1/6] feat: introduce `java.time`

---
 .../google/cloud/logging/logback/LogbackBatchingSettings.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/google/cloud/logging/logback/LogbackBatchingSettings.java b/src/main/java/com/google/cloud/logging/logback/LogbackBatchingSettings.java
index 48e8b7b9a..c7f0f1c72 100644
--- a/src/main/java/com/google/cloud/logging/logback/LogbackBatchingSettings.java
+++ b/src/main/java/com/google/cloud/logging/logback/LogbackBatchingSettings.java
@@ -19,7 +19,7 @@
 import com.google.api.gax.batching.BatchingSettings;
 import com.google.api.gax.batching.FlowControlSettings;
 import com.google.api.gax.batching.FlowController.LimitExceededBehavior;
-import org.threeten.bp.Duration;
+import java.time.Duration;
 
 /**
  * This class is used only to provide batch settings configuration in logback.xml since {@link
@@ -69,7 +69,7 @@ public BatchingSettings build() {
       settings.setRequestByteThreshold(requestByteThreshold);
     }
     if (delayThreshold != null) {
-      settings.setDelayThreshold(Duration.ofMillis(delayThreshold));
+      settings.setDelayThresholdDuration(Duration.ofMillis(delayThreshold));
     }
     if (maxOutstandingElementCount != null
         || maxOutstandingRequestBytes != null

From deed38c808386470c15b2564a578e04c31342dfa Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Tue, 19 Nov 2024 15:20:58 -0500
Subject: [PATCH 2/6] declare threeten as test-scoped

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index fd9a46d9a..824fb8f43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,6 +155,7 @@
     <dependency>
       <groupId>org.threeten</groupId>
       <artifactId>threetenbp</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 

From 71ba81e2359f08d2897df012dd7d2680cae17f4c Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Wed, 20 Nov 2024 14:45:54 -0500
Subject: [PATCH 3/6] completely remove threeten

---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 824fb8f43..2275e4a6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,11 +152,6 @@
       <groupId>com.google.api</groupId>
       <artifactId>gax</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.threeten</groupId>
-      <artifactId>threetenbp</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <reporting>

From a9a5959e82b230ecc47be97d055471cd2d0da388 Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Wed, 20 Nov 2024 14:49:37 -0500
Subject: [PATCH 4/6] reset tests


From 58a261d0852b7b6a311e49bbd36521ae2d55b9a5 Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Wed, 20 Nov 2024 15:13:25 -0500
Subject: [PATCH 5/6] fix ignore

---
 pom.xml | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2275e4a6e..409aafd1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -229,13 +229,24 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>flatten-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <configuration>
+          <ignoredDependencies>
+            <!--We ignore threeten because its usage has been migrated to java.time and there are no public methods-->
+            <!--exposing this class-->
+            <ignoredDependency>org.threeten:threetenbp</ignoredDependency>
+          </ignoredDependencies>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
-      <profiles>
+  <profiles>
     <profile>
       <id>native</id>
       <properties>
-      <!-- Skip native image tests that use mocking libs to avoid loading classes at runtime. -->
+        <!-- Skip native image tests that use mocking libs to avoid loading classes at runtime. -->
         <test>!LoggingAppenderTest</test>
       </properties>
     </profile>

From 8cf56da21b83c4db869c4c41cb3f9d12bd717c1c Mon Sep 17 00:00:00 2001
From: Diego Alonso Marquez Palacios <diegomarquezp@google.com>
Date: Thu, 21 Nov 2024 17:17:34 -0500
Subject: [PATCH 6/6] fix dependency:analyze

---
 pom.xml | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/pom.xml b/pom.xml
index 409aafd1a..824fb8f43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,6 +152,11 @@
       <groupId>com.google.api</groupId>
       <artifactId>gax</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.threeten</groupId>
+      <artifactId>threetenbp</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <reporting>
@@ -229,24 +234,13 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>flatten-maven-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <configuration>
-          <ignoredDependencies>
-            <!--We ignore threeten because its usage has been migrated to java.time and there are no public methods-->
-            <!--exposing this class-->
-            <ignoredDependency>org.threeten:threetenbp</ignoredDependency>
-          </ignoredDependencies>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
-  <profiles>
+      <profiles>
     <profile>
       <id>native</id>
       <properties>
-        <!-- Skip native image tests that use mocking libs to avoid loading classes at runtime. -->
+      <!-- Skip native image tests that use mocking libs to avoid loading classes at runtime. -->
         <test>!LoggingAppenderTest</test>
       </properties>
     </profile>