[CDAP-20909] Move protobuf to cdap-hbase-compat child modules instead…

… of cdap-hbase-compat-base
cdapio · Nov 29, 2023 · ad1b3f0 · ad1b3f0
1 parent a5e5673
commit ad1b3f0
Show file tree

Hide file tree

Showing 6 changed files with 56 additions and 10 deletions.
diff --git a/cdap-hbase-compat-1.0-cdh/pom.xml b/cdap-hbase-compat-1.0-cdh/pom.xml
@@ -38,6 +38,12 @@
     </repository>
   </repositories>
 
+  <properties>
+    <!-- Not set at the parent pom level to avoid impacting other child modules. -->
+    <!-- Not set in cdap-hbase-compat-base to avoid protobuf being pulled into cdap-data-fabric. -->
+    <protobuf.version>2.5.0</protobuf.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>io.cdap.cdap</groupId>
@@ -161,6 +167,11 @@
       <version>3.0.4</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>${protobuf.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/cdap-hbase-compat-1.0-cdh5.5.0/pom.xml b/cdap-hbase-compat-1.0-cdh5.5.0/pom.xml
@@ -38,6 +38,12 @@
     </repository>
   </repositories>
 
+  <properties>
+    <!-- Not set at the parent pom level to avoid impacting other child modules. -->
+    <!-- Not set in cdap-hbase-compat-base to avoid protobuf being pulled into cdap-data-fabric. -->
+    <protobuf.version>2.5.0</protobuf.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>io.cdap.cdap</groupId>
@@ -161,6 +167,11 @@
       <version>3.0.4</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>${protobuf.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/cdap-hbase-compat-1.0/pom.xml b/cdap-hbase-compat-1.0/pom.xml
@@ -31,6 +31,12 @@
   <name>CDAP HBase 1.0 Compatibility</name>
   <packaging>jar</packaging>
 
+  <properties>
+    <!-- Not set at the parent pom level to avoid impacting other child modules. -->
+    <!-- Not set in cdap-hbase-compat-base to avoid protobuf being pulled into cdap-data-fabric. -->
+    <protobuf.version>2.5.0</protobuf.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>io.cdap.cdap</groupId>
@@ -147,6 +153,11 @@
       <artifactId>hadoop-hdfs</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>${protobuf.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/cdap-hbase-compat-1.1/pom.xml b/cdap-hbase-compat-1.1/pom.xml
@@ -31,6 +31,12 @@
   <name>CDAP HBase 1.1 Compatibility</name>
   <packaging>jar</packaging>
 
+  <properties>
+    <!-- Not set at the parent pom level to avoid impacting other child modules. -->
+    <!-- Not set in cdap-hbase-compat-base to avoid protobuf being pulled into cdap-data-fabric. -->
+    <protobuf.version>2.5.0</protobuf.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>io.cdap.cdap</groupId>
@@ -147,6 +153,11 @@
       <artifactId>hadoop-hdfs</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>${protobuf.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/cdap-hbase-compat-1.2-cdh5.7.0/pom.xml b/cdap-hbase-compat-1.2-cdh5.7.0/pom.xml
@@ -35,6 +35,12 @@
     </repository>
   </repositories>
 
+  <properties>
+    <!-- Not set at the parent pom level to avoid impacting other child modules. -->
+    <!-- Not set in cdap-hbase-compat-base to avoid protobuf being pulled into cdap-data-fabric. -->
+    <protobuf.version>2.5.0</protobuf.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>io.cdap.cdap</groupId>
@@ -160,6 +166,11 @@
       <artifactId>hadoop-hdfs</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>${protobuf.version}</version>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/cdap-hbase-compat-base/pom.xml b/cdap-hbase-compat-base/pom.xml
@@ -29,11 +29,6 @@
   <name>CDAP HBase Compactability Base</name>
   <packaging>jar</packaging>
 
-  <properties>
-    <!-- Not set at the parent pom level to avoid impacting other child modules. -->
-    <protobuf.version>2.5.0</protobuf.version>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>io.cdap.cdap</groupId>
@@ -143,11 +138,7 @@
       <groupId>org.slf4j</groupId>
       <artifactId>jcl-over-slf4j</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-      <version>${protobuf.version}</version>
-    </dependency>
+
   </dependencies>
 
   <build>