This is an automated email from the ASF dual-hosted git repository.
mmerli 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 30f78353895 [fix][build] Add re2/j dependency to pulsar-common and
client shading (#22884)
30f78353895 is described below
commit 30f78353895818785b3fa09adef96a9b45057af2
Author: Lari Hotari <lhot...@users.noreply.github.com>
AuthorDate: Mon Jun 10 01:39:11 2024 +0300
[fix][build] Add re2/j dependency to pulsar-common and client shading
(#22884)
---
pulsar-client-admin-shaded/pom.xml | 1 +
pulsar-client-all/pom.xml | 1 +
pulsar-client-shaded/pom.xml | 1 +
pulsar-common/pom.xml | 5 +++++
.../src/main/java-templates/org/apache/pulsar/PulsarVersion.java | 4 ++--
5 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/pulsar-client-admin-shaded/pom.xml
b/pulsar-client-admin-shaded/pom.xml
index 7370ea42a4a..96ca2f8de9f 100644
--- a/pulsar-client-admin-shaded/pom.xml
+++ b/pulsar-client-admin-shaded/pom.xml
@@ -122,6 +122,7 @@
<include>com.google.protobuf:protobuf-java</include>
<include>com.google.guava:guava</include>
<include>com.google.code.gson:gson</include>
+ <include>com.google.re2j:re2j</include>
<include>com.fasterxml.jackson.*:*</include>
<include>io.netty:*</include>
<include>io.netty.incubator:*</include>
diff --git a/pulsar-client-all/pom.xml b/pulsar-client-all/pom.xml
index b73c495ec1b..27abc1a24c3 100644
--- a/pulsar-client-all/pom.xml
+++ b/pulsar-client-all/pom.xml
@@ -166,6 +166,7 @@
<include>com.google.errorprone:*</include>
<include>com.google.j2objc:*</include>
<include>com.google.code.gson:gson</include>
+ <include>com.google.re2j:re2j</include>
<include>com.fasterxml.jackson.*:*</include>
<include>io.netty:netty</include>
<include>io.netty:netty-all</include>
diff --git a/pulsar-client-shaded/pom.xml b/pulsar-client-shaded/pom.xml
index be2dc028498..ca018308731 100644
--- a/pulsar-client-shaded/pom.xml
+++ b/pulsar-client-shaded/pom.xml
@@ -144,6 +144,7 @@
<include>com.google.errorprone:*</include>
<include>com.google.j2objc:*</include>
<include>com.google.code.gson:gson</include>
+ <include>com.google.re2j:re2j</include>
<include>com.fasterxml.jackson.*:*</include>
<include>io.netty:*</include>
<include>io.netty.incubator:*</include>
diff --git a/pulsar-common/pom.xml b/pulsar-common/pom.xml
index cdc30dac289..62e7bde2560 100644
--- a/pulsar-common/pom.xml
+++ b/pulsar-common/pom.xml
@@ -206,6 +206,11 @@
<artifactId>protobuf-java</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.re2j</groupId>
+ <artifactId>re2j</artifactId>
+ </dependency>
+
<!-- test -->
<dependency>
<groupId>org.bouncycastle</groupId>
diff --git
a/pulsar-common/src/main/java-templates/org/apache/pulsar/PulsarVersion.java
b/pulsar-common/src/main/java-templates/org/apache/pulsar/PulsarVersion.java
index c597dd327f6..119e46b9536 100644
--- a/pulsar-common/src/main/java-templates/org/apache/pulsar/PulsarVersion.java
+++ b/pulsar-common/src/main/java-templates/org/apache/pulsar/PulsarVersion.java
@@ -18,8 +18,8 @@
*/
package org.apache.pulsar;
-import com.google.re2j.Matcher;
-import com.google.re2j.Pattern;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
public class PulsarVersion {
