You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by st...@apache.org on 2020/12/11 12:50:29 UTC

[phoenix-connectors] branch master updated: PHOENIX-6261 Reorganise project structure to make mvn versions:set work

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-connectors.git


The following commit(s) were added to refs/heads/master by this push:
     new aff86a2  PHOENIX-6261 Reorganise project structure to make mvn versions:set work
aff86a2 is described below

commit aff86a2e0846cb69e83ea1d6d441a6c2f21354aa
Author: Richard Antal <an...@gmail.com>
AuthorDate: Fri Dec 11 10:14:54 2020 +0100

    PHOENIX-6261 Reorganise project structure to make mvn versions:set work
---
 phoenix-connectors-phoenix4-compat/pom.xml | 14 +++-----------
 phoenix-connectors-phoenix5-compat/pom.xml |  8 +++-----
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/phoenix-connectors-phoenix4-compat/pom.xml b/phoenix-connectors-phoenix4-compat/pom.xml
index de1dbdc..c5e3443 100644
--- a/phoenix-connectors-phoenix4-compat/pom.xml
+++ b/phoenix-connectors-phoenix4-compat/pom.xml
@@ -23,14 +23,12 @@
   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">
   <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <version>23</version>
+    <groupId>org.apache.phoenix</groupId>
+    <artifactId>phoenix-connectors</artifactId>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <version>6.0.0-SNAPSHOT</version>
 
-  <groupId>org.apache.phoenix</groupId>
   <artifactId>phoenix-connectors-phoenix4-compat</artifactId>
   <name>Compatibility util for Phoenix 4</name>
 
@@ -49,12 +47,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
-      <artifactId>hbase-common</artifactId>
-      <version>${hbase.version}</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-server</artifactId>
       <version>${hbase.version}</version>
     </dependency>
diff --git a/phoenix-connectors-phoenix5-compat/pom.xml b/phoenix-connectors-phoenix5-compat/pom.xml
index 4910b82..781338a 100644
--- a/phoenix-connectors-phoenix5-compat/pom.xml
+++ b/phoenix-connectors-phoenix5-compat/pom.xml
@@ -23,14 +23,12 @@
   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">
   <parent>
-    <groupId>org.apache</groupId>
-    <artifactId>apache</artifactId>
-    <version>23</version>
+    <groupId>org.apache.phoenix</groupId>
+    <artifactId>phoenix-connectors</artifactId>
+    <version>6.0.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-  <version>6.0.0-SNAPSHOT</version>
 
-  <groupId>org.apache.phoenix</groupId>
   <artifactId>phoenix-connectors-phoenix5-compat</artifactId>
   <name>Compatibility util for Phoenix 5</name>