This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 01dd7e56c88 [improve] Update to Oxia 0.6.0 and use new group-id
(#24438)
01dd7e56c88 is described below
commit 01dd7e56c889b3567ea522dfe3f909659faf539c
Author: Matteo Merli <[email protected]>
AuthorDate: Sat Jun 21 04:57:00 2025 -0700
[improve] Update to Oxia 0.6.0 and use new group-id (#24438)
---
distribution/server/src/assemble/LICENSE.bin.txt | 4 ++--
pom.xml | 6 +++---
pulsar-broker/pom.xml | 2 +-
pulsar-metadata/pom.xml | 4 ++--
.../pulsar/metadata/impl/oxia/OxiaMetadataStore.java | 20 ++++++++++----------
.../pulsar/metadata/BaseMetadataStoreTest.java | 2 +-
.../apache/pulsar/metadata/MetadataStoreTest.java | 8 ++++----
7 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt
b/distribution/server/src/assemble/LICENSE.bin.txt
index f2f2f52bf41..2123129512e 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -481,8 +481,8 @@ The Apache Software License, Version 2.0
* Prometheus
- io.prometheus-simpleclient_httpserver-0.16.0.jar
* Oxia
- - io.streamnative.oxia-oxia-client-api-0.5.0.jar
- - io.streamnative.oxia-oxia-client-0.5.0.jar
+ - io.github.oxia-db-oxia-client-api-0.6.0.jar
+ - io.github.oxia-db-oxia-client-0.6.0.jar
* OpenHFT
- net.openhft-zero-allocation-hashing-0.16.jar
* Java JSON WebTokens
diff --git a/pom.xml b/pom.xml
index 7e9781b0253..fe0aa974327 100644
--- a/pom.xml
+++ b/pom.xml
@@ -289,7 +289,7 @@ flexible messaging model and an intuitive client
API.</description>
<apache-http-client.version>4.5.13</apache-http-client.version>
<apache-httpcomponents.version>4.4.15</apache-httpcomponents.version>
<jetcd.version>0.7.7</jetcd.version>
- <oxia.version>0.5.0</oxia.version>
+ <oxia.version>0.6.0</oxia.version>
<snakeyaml.version>2.0</snakeyaml.version>
<ant.version>1.10.12</ant.version>
<seancfoley.ipaddress.version>5.5.0</seancfoley.ipaddress.version>
@@ -1335,12 +1335,12 @@ flexible messaging model and an intuitive client
API.</description>
</dependency>
<dependency>
- <groupId>io.streamnative.oxia</groupId>
+ <groupId>io.github.oxia-db</groupId>
<artifactId>oxia-client</artifactId>
<version>${oxia.version}</version>
</dependency>
<dependency>
- <groupId>io.streamnative.oxia</groupId>
+ <groupId>io.github.oxia-db</groupId>
<artifactId>oxia-testcontainers</artifactId>
<version>${oxia.version}</version>
</dependency>
diff --git a/pulsar-broker/pom.xml b/pulsar-broker/pom.xml
index 9b48233685c..9a903a38570 100644
--- a/pulsar-broker/pom.xml
+++ b/pulsar-broker/pom.xml
@@ -182,7 +182,7 @@
</dependency>
<dependency>
- <groupId>io.streamnative.oxia</groupId>
+ <groupId>io.github.oxia-db</groupId>
<artifactId>oxia-testcontainers</artifactId>
<scope>test</scope>
</dependency>
diff --git a/pulsar-metadata/pom.xml b/pulsar-metadata/pom.xml
index 229dd5ba610..d53a426de69 100644
--- a/pulsar-metadata/pom.xml
+++ b/pulsar-metadata/pom.xml
@@ -62,12 +62,12 @@
</dependency>
<dependency>
- <groupId>io.streamnative.oxia</groupId>
+ <groupId>io.github.oxia-db</groupId>
<artifactId>oxia-client</artifactId>
</dependency>
<dependency>
- <groupId>io.streamnative.oxia</groupId>
+ <groupId>io.github.oxia-db</groupId>
<artifactId>oxia-testcontainers</artifactId>
<scope>test</scope>
</dependency>
diff --git
a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/oxia/OxiaMetadataStore.java
b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/oxia/OxiaMetadataStore.java
index cfe4528a7a5..e0415f0ef52 100644
---
a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/oxia/OxiaMetadataStore.java
+++
b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/oxia/OxiaMetadataStore.java
@@ -19,15 +19,15 @@
package org.apache.pulsar.metadata.impl.oxia;
import io.opentelemetry.api.OpenTelemetry;
-import io.streamnative.oxia.client.api.AsyncOxiaClient;
-import io.streamnative.oxia.client.api.DeleteOption;
-import io.streamnative.oxia.client.api.Notification;
-import io.streamnative.oxia.client.api.OxiaClientBuilder;
-import io.streamnative.oxia.client.api.PutOption;
-import io.streamnative.oxia.client.api.PutResult;
-import io.streamnative.oxia.client.api.Version;
-import io.streamnative.oxia.client.api.exceptions.KeyAlreadyExistsException;
-import io.streamnative.oxia.client.api.exceptions.UnexpectedVersionIdException;
+import io.oxia.client.api.AsyncOxiaClient;
+import io.oxia.client.api.DeleteOption;
+import io.oxia.client.api.Notification;
+import io.oxia.client.api.OxiaClientBuilder;
+import io.oxia.client.api.PutOption;
+import io.oxia.client.api.PutResult;
+import io.oxia.client.api.Version;
+import io.oxia.client.api.exceptions.KeyAlreadyExistsException;
+import io.oxia.client.api.exceptions.UnexpectedVersionIdException;
import java.time.Duration;
import java.util.Collections;
import java.util.EnumSet;
@@ -125,7 +125,7 @@ public class OxiaMetadataStore extends
AbstractMetadataStore {
}
Optional<GetResult> convertGetResult(
- String path, io.streamnative.oxia.client.api.GetResult result) {
+ String path, io.oxia.client.api.GetResult result) {
if (result == null) {
return Optional.empty();
}
diff --git
a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java
b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java
index 4bdb379d823..90a4c13244e 100644
---
a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java
+++
b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/BaseMetadataStoreTest.java
@@ -22,7 +22,7 @@ import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import io.etcd.jetcd.launcher.EtcdCluster;
import io.etcd.jetcd.test.EtcdClusterExtension;
-import io.streamnative.oxia.testcontainers.OxiaContainer;
+import io.oxia.testcontainers.OxiaContainer;
import java.io.File;
import java.net.URI;
import java.util.Arrays;
diff --git
a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreTest.java
b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreTest.java
index 7a333391dc9..93eaf66c538 100644
---
a/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreTest.java
+++
b/pulsar-metadata/src/test/java/org/apache/pulsar/metadata/MetadataStoreTest.java
@@ -42,10 +42,10 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Supplier;
-import io.streamnative.oxia.client.ClientConfig;
-import io.streamnative.oxia.client.api.AsyncOxiaClient;
-import io.streamnative.oxia.client.session.SessionFactory;
-import io.streamnative.oxia.client.session.SessionManager;
+import io.oxia.client.ClientConfig;
+import io.oxia.client.api.AsyncOxiaClient;
+import io.oxia.client.session.SessionFactory;
+import io.oxia.client.session.SessionManager;
import lombok.Cleanup;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
