Merge pull request #3601 from danielburrell/release-21

Migrate deprecated Bucket4J class usage to Bucket class to unblock upgrades

extended/pom.xml

@@ -39,7 +39,7 @@
             <artifactId>commons-lang3</artifactId>
         </dependency>
         <dependency>
-            <groupId>com.github.vladimir-bukhtoyarov</groupId>
+            <groupId>com.bucket4j</groupId>
             <artifactId>bucket4j-core</artifactId>
         </dependency>
         <dependency>

extended/src/main/java/io/kubernetes/client/extended/event/legacy/EventSpamFilter.java

@@ -15,7 +15,7 @@
 import com.github.benmanes.caffeine.cache.Cache;
 import com.github.benmanes.caffeine.cache.Caffeine;
 import io.github.bucket4j.Bandwidth;
-import io.github.bucket4j.Bucket4j;
+import io.github.bucket4j.Bucket;
 import io.github.bucket4j.Refill;
 import io.github.bucket4j.local.LocalBucket;
 import io.github.bucket4j.local.SynchronizationStrategy;
@@ -65,7 +65,7 @@ public boolean filter(CoreV1Event event) {
 
   private class SpamRecord {
     private LocalBucket tokenBucket =
-        Bucket4j.builder()
+        Bucket.builder()
             .addLimit(
                 Bandwidth.classic(
                     capacity, Refill.greedy(refillingTokensPerPeriod, refillingPeriod)))

extended/src/main/java/io/kubernetes/client/extended/workqueue/ratelimiter/BucketRateLimiter.java

@@ -14,7 +14,6 @@
 
 import io.github.bucket4j.Bandwidth;
 import io.github.bucket4j.Bucket;
-import io.github.bucket4j.Bucket4j;
 import io.github.bucket4j.Refill;
 import io.github.bucket4j.local.SynchronizationStrategy;
 import java.time.Duration;
@@ -32,7 +31,7 @@ public BucketRateLimiter(long capacity, long tokensGeneratedInPeriod, Duration p
     Bandwidth bandwidth =
         Bandwidth.classic(capacity, Refill.greedy(tokensGeneratedInPeriod, period));
     this.bucket =
-        Bucket4j.builder()
+        Bucket.builder()
             .addLimit(bandwidth)
             .withSynchronizationStrategy(SynchronizationStrategy.SYNCHRONIZED)
             .build();

pom.xml

@@ -51,7 +51,7 @@
     <caffeine.version>2.9.3</caffeine.version>
     <protobuf.version>4.27.1</protobuf.version>
     <junit-jupiter.version>5.10.2</junit-jupiter.version>
-    <bucket4j.version>8.0.1</bucket4j.version>
+    <bucket4j.version>8.10.1</bucket4j.version>
     <bouncycastle.version>1.78.1</bouncycastle.version>
     <gson.version>2.11.0</gson.version>
     <jackson.version>2.17.1</jackson.version>
@@ -157,7 +157,7 @@
         <version>0.9.6</version>
       </dependency>
       <dependency>
-        <groupId>com.github.vladimir-bukhtoyarov</groupId>
+        <groupId>com.bucket4j</groupId>
         <artifactId>bucket4j-core</artifactId>
         <version>${bucket4j.version}</version>
       </dependency>