This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-thirdparty.git
The following commit(s) were added to refs/heads/master by this push:
new 6211fd9 PHOENIX-7693 Add shaded protobuf module to phoenix-thirdparty
(#14)
6211fd9 is described below
commit 6211fd9fe83e13d6522439bf862078ef1794bea7
Author: Norbert Meszaros <[email protected]>
AuthorDate: Mon Oct 13 09:47:18 2025 +0200
PHOENIX-7693 Add shaded protobuf module to phoenix-thirdparty (#14)
---
phoenix-shaded-commons-cli/pom.xml | 2 +-
phoenix-shaded-guava/pom.xml | 2 +-
phoenix-shaded-protobuf/pom.xml | 88 ++++++++++++++++++++++++++++++++++++++
pom.xml | 4 +-
4 files changed, 93 insertions(+), 3 deletions(-)
diff --git a/phoenix-shaded-commons-cli/pom.xml
b/phoenix-shaded-commons-cli/pom.xml
index 8fed0ce..378c70f 100644
--- a/phoenix-shaded-commons-cli/pom.xml
+++ b/phoenix-shaded-commons-cli/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.phoenix.thirdparty</groupId>
<artifactId>phoenix-thirdparty</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>phoenix-shaded-commons-cli</artifactId>
<name>Apache Phoenix Patched and Relocated (Shaded) Commons-CLI</name>
diff --git a/phoenix-shaded-guava/pom.xml b/phoenix-shaded-guava/pom.xml
index 57d1b3f..1dd819f 100644
--- a/phoenix-shaded-guava/pom.xml
+++ b/phoenix-shaded-guava/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.phoenix.thirdparty</groupId>
<artifactId>phoenix-thirdparty</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
</parent>
<artifactId>phoenix-shaded-guava</artifactId>
diff --git a/phoenix-shaded-protobuf/pom.xml b/phoenix-shaded-protobuf/pom.xml
new file mode 100644
index 0000000..d7abf7f
--- /dev/null
+++ b/phoenix-shaded-protobuf/pom.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.phoenix.thirdparty</groupId>
+ <artifactId>phoenix-thirdparty</artifactId>
+ <version>2.2.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>phoenix-shaded-protobuf</artifactId>
+ <name>Apache Phoenix Relocated (Shaded) Protobuf-Java</name>
+ <description>
+ Intended for Apache Omid, not for Apache Phoenix.
+ Pulls down protobuf-java, relocates it and then makes a new jar with
it.
+ </description>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>${basedir}</directory>
+ <includes>
+ <include>dependency-reduced-pom.xml</include>
+ </includes>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <shadeSourcesContent>true</shadeSourcesContent>
+ <createSourcesJar>true</createSourcesJar>
+ <minimizeJar>false</minimizeJar>
+ <relocations>
+ <relocation>
+ <pattern>com.google.protobuf</pattern>
+
<shadedPattern>${rename.offset}.com.google.protobuf</shadedPattern>
+ </relocation>
+ <!-- relocate the proto files, like any.proto
-->
+ <relocation>
+ <pattern>google.protobuf</pattern>
+
<shadedPattern>${rename.offset}.google.protobuf</shadedPattern>
+ </relocation>
+ </relocations>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>${protobuf.version}</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 1ac2bad..74c1e28 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<groupId>org.apache.phoenix.thirdparty</groupId>
<artifactId>phoenix-thirdparty</artifactId>
- <version>2.1.1-SNAPSHOT</version>
+ <version>2.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Phoenix Third-Party Libs</name>
<description>Packaging of relocated (renamed, shaded) third-party libraries
used by Phoenix.</description>
@@ -51,6 +51,7 @@
<modules>
<module>phoenix-shaded-guava</module>
<module>phoenix-shaded-commons-cli</module>
+ <module>phoenix-shaded-protobuf</module>
</modules>
<scm>
@@ -63,6 +64,7 @@
<rename.offset>org.apache.phoenix.thirdparty</rename.offset>
<guava.version>32.1.3-jre</guava.version>
<commons-cli.version>1.9.0</commons-cli.version>
+ <protobuf.version>4.32.0</protobuf.version>
</properties>
<build>
