[phoenix] 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.git
The following commit(s) were added to refs/heads/master by this push:
new 6e019dd PHOENIX-6261 Reorganise project structure to make mvn
versions:set work
6e019dd is described below
commit 6e019dd50c03c884308494e6c888be427f272b26
Author: Istvan Toth
AuthorDate: Fri Dec 11 10:45:41 2020 +0100
PHOENIX-6261 Reorganise project structure to make mvn versions:set work
---
phoenix-core/pom.xml | 47 +
phoenix-hbase-compat-2.1.6/pom.xml | 70 ++
phoenix-hbase-compat-2.2.1/pom.xml | 68 +---
phoenix-hbase-compat-2.3.0/pom.xml | 36 +---
pom.xml| 48 --
5 files changed, 105 insertions(+), 164 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index b7762ea..a6e60c3 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -38,6 +38,53 @@
org.apache.maven.plugins
maven-site-plugin
+
+
+ org.apache.maven.plugins
+ maven-enforcer-plugin
+ ${maven-enforcer-plugin.version}
+
+
+
+
+ import java.util.regex.Pattern;
+ import java.lang.Integer;
+
+ versionPattern =
Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)[^.]*$");
+ versionMatcher = versionPattern.matcher("${hbase.version}");
+ versionMatcher.find();
+
+ hbaseMajor = Integer.parseInt(versionMatcher.group(1));
+ hbaseMinor = Integer.parseInt(versionMatcher.group(2));
+ hbasePatch = Integer.parseInt(versionMatcher.group(3));
+
+ hbaseMajor == 2 && (
+("${hbase.compat.version}".equals("2.1.6")
+ && hbaseMinor == 1
+ && hbasePatch >=6)
+|| ("${hbase.compat.version}".equals("2.2.1")
+ && hbaseMinor == 2
+ && hbasePatch >=1)
+|| ("${hbase.compat.version}".equals("2.3.0")
+ && hbaseMinor == 3
+ && hbasePatch >=0)
+ )
+
+
+
+
+
+
+ check-hbase-compatibility
+ validate
+
+ enforce
+
+
+
+
org.codehaus.mojo
build-helper-maven-plugin
diff --git a/phoenix-hbase-compat-2.1.6/pom.xml
b/phoenix-hbase-compat-2.1.6/pom.xml
index e5a8d0d..119c31b 100644
--- a/phoenix-hbase-compat-2.1.6/pom.xml
+++ b/phoenix-hbase-compat-2.1.6/pom.xml
@@ -20,57 +20,39 @@
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
4.0.0
-
-org.apache
-apache
-21
+
+org.apache.phoenix
+phoenix
+5.1.0-SNAPSHOT
- org.apache.phoenix
+
phoenix-hbase-compat-2.1.6
- 5.1.0-SNAPSHOT
+
Phoenix Hbase 2.1.6 compatibility
Compatibility module for HBase 2.1.6+
-
-
-
-
-org.apache.maven.plugins
-maven-eclipse-plugin
-2.9
-
-
-org.eclipse.jdt.core.javabuilder
-
-
-
-
-org.apache.rat
-apache-rat-plugin
-
-
-
+
+2.1.6
+
-
-
-org.apache.hbase
-hbase-client
-2.1.6
-provided
-
-
-org.apache.hbase
-hbase-common
-2.1.6
-provided
-
-
-org.apache.hbase
-hbase-server
-2.1.6
-provided
-
+
+
+ org.apache.hbase
+ hbase-client
+ provided
+
+
+ org.apache.hbase
+ hbase-common
+ provided
+
+
+ org.apache.hbase
+ hbase-server
+ provided
+
+
diff --git a/phoenix-hbase-compat-2.2.1/pom.xml
b/phoenix-hbase-compat-2.2.1/pom.xml
index efb3160..d54cebf 100644
--- a/phoenix-hbase-compat-2.2.1/pom.xml
+++ b/phoenix-hbase-compat-2.2.1/pom.xml
@@ -20,57 +20,37 @@
xsi:schemaLocation=
"http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
4.0.0
-
-org.apache
-apache
-21
+
+org.apache.phoenix
+phoenix
+5.1.0-SNAPSHOT
- org.apache.phoenix
+
phoenix-hbase-compat-2.2.1
- 5.1.0-SNAPSHOT
Phoenix Hbase 2.2.1 compatibility
Compatibility module for HBase 2.2.1+
-
-
-
-
-org.apache.maven.plugins
-maven-eclipse-plugin
-2.9
-
-
-org.eclipse.jdt.core.javabuilder
-
-
-
-
-org.apache.rat
-apache-rat-plu
[phoenix] branch master updated: PHOENIX-6261 Reorganise project structure to make mvn versions:set work (addendum: fix regression with -Dhbase.version)
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.git
The following commit(s) were added to refs/heads/master by this push:
new 541246a PHOENIX-6261 Reorganise project structure to make mvn
versions:set work (addendum: fix regression with -Dhbase.version)
541246a is described below
commit 541246a673e6b89e589bd5247cff6e7c35ab071b
Author: Istvan Toth
AuthorDate: Thu Dec 24 07:08:40 2020 +0100
PHOENIX-6261 Reorganise project structure to make mvn versions:set work
(addendum: fix regression with -Dhbase.version)
---
phoenix-hbase-compat-2.1.6/pom.xml | 5 -
phoenix-hbase-compat-2.2.1/pom.xml | 5 -
phoenix-hbase-compat-2.3.0/pom.xml | 5 -
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/phoenix-hbase-compat-2.1.6/pom.xml
b/phoenix-hbase-compat-2.1.6/pom.xml
index 119c31b..0794dd5 100644
--- a/phoenix-hbase-compat-2.1.6/pom.xml
+++ b/phoenix-hbase-compat-2.1.6/pom.xml
@@ -32,7 +32,7 @@
Compatibility module for HBase 2.1.6+
-2.1.6
+2.1.6
@@ -40,16 +40,19 @@
org.apache.hbase
hbase-client
+ ${hbase21.compat.version}
provided
org.apache.hbase
hbase-common
+ ${hbase21.compat.version}
provided
org.apache.hbase
hbase-server
+ ${hbase21.compat.version}
provided
diff --git a/phoenix-hbase-compat-2.2.1/pom.xml
b/phoenix-hbase-compat-2.2.1/pom.xml
index d54cebf..34f8105 100644
--- a/phoenix-hbase-compat-2.2.1/pom.xml
+++ b/phoenix-hbase-compat-2.2.1/pom.xml
@@ -31,7 +31,7 @@
Compatibility module for HBase 2.2.1+
-2.2.1
+2.2.1
@@ -39,16 +39,19 @@
org.apache.hbase
hbase-client
+ ${hbase22.compat.version}
provided
org.apache.hbase
hbase-common
+ ${hbase22.compat.version}
provided
org.apache.hbase
hbase-server
+ ${hbase22.compat.version}
provided
diff --git a/phoenix-hbase-compat-2.3.0/pom.xml
b/phoenix-hbase-compat-2.3.0/pom.xml
index 7ea1827..4300624 100644
--- a/phoenix-hbase-compat-2.3.0/pom.xml
+++ b/phoenix-hbase-compat-2.3.0/pom.xml
@@ -31,7 +31,7 @@
Compatibility module for HBase 2.3.0+
-2.3.0
+2.3.0
@@ -39,16 +39,19 @@
org.apache.hbase
hbase-client
+${hbase23.compat.version}
provided
org.apache.hbase
hbase-common
+${hbase23.compat.version}
provided
org.apache.hbase
hbase-server
+${hbase23.compat.version}
provided
[phoenix] branch master updated: PHOENIX-6261 Reorganise project structure to make mvn versions:set work (addendum: override parent depenencyManagement for all HBase compat dependencies)
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.git
The following commit(s) were added to refs/heads/master by this push:
new 2b68e84 PHOENIX-6261 Reorganise project structure to make mvn
versions:set work (addendum: override parent depenencyManagement for all HBase
compat dependencies)
2b68e84 is described below
commit 2b68e84c1867ad07960a09d6527f13106138262b
Author: Istvan Toth
AuthorDate: Thu Dec 24 08:34:40 2020 +0100
PHOENIX-6261 Reorganise project structure to make mvn versions:set work
(addendum: override parent depenencyManagement for all HBase compat
dependencies)
---
phoenix-hbase-compat-2.1.6/pom.xml | 43
phoenix-hbase-compat-2.2.1/pom.xml | 43
phoenix-hbase-compat-2.3.0/pom.xml | 81 +-
3 files changed, 148 insertions(+), 19 deletions(-)
diff --git a/phoenix-hbase-compat-2.1.6/pom.xml
b/phoenix-hbase-compat-2.1.6/pom.xml
index 0794dd5..6e64195 100644
--- a/phoenix-hbase-compat-2.1.6/pom.xml
+++ b/phoenix-hbase-compat-2.1.6/pom.xml
@@ -55,6 +55,49 @@
${hbase21.compat.version}
provided
+
+
+ org.apache.hbase
+ hbase-hadoop-compat
+ ${hbase21.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-hadoop2-compat
+ ${hbase21.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-protocol
+ ${hbase21.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-protocol-shaded
+ ${hbase21.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-zookeeper
+ ${hbase21.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-metrics
+ ${hbase21.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-metrics-api
+ ${hbase21.compat.version}
+ provided
+
diff --git a/phoenix-hbase-compat-2.2.1/pom.xml
b/phoenix-hbase-compat-2.2.1/pom.xml
index 34f8105..b5bb8b6 100644
--- a/phoenix-hbase-compat-2.2.1/pom.xml
+++ b/phoenix-hbase-compat-2.2.1/pom.xml
@@ -54,6 +54,49 @@
${hbase22.compat.version}
provided
+
+
+ org.apache.hbase
+ hbase-hadoop-compat
+ ${hbase22.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-hadoop2-compat
+ ${hbase22.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-protocol
+ ${hbase22.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-protocol-shaded
+ ${hbase22.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-zookeeper
+ ${hbase22.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-metrics
+ ${hbase22.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-metrics-api
+ ${hbase22.compat.version}
+ provided
+
diff --git a/phoenix-hbase-compat-2.3.0/pom.xml
b/phoenix-hbase-compat-2.3.0/pom.xml
index 4300624..a969193 100644
--- a/phoenix-hbase-compat-2.3.0/pom.xml
+++ b/phoenix-hbase-compat-2.3.0/pom.xml
@@ -35,25 +35,68 @@
-
-
-org.apache.hbase
-hbase-client
-${hbase23.compat.version}
-provided
-
-
-org.apache.hbase
-hbase-common
-${hbase23.compat.version}
-provided
-
-
-org.apache.hbase
-hbase-server
-${hbase23.compat.version}
-provided
-
+
+
+ org.apache.hbase
+ hbase-client
+ ${hbase23.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-common
+ ${hbase23.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-server
+ ${hbase23.compat.version}
+ provided
+
+
+
+ org.apache.hbase
+ hbase-hadoop-compat
+ ${hbase23.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-hadoop2-compat
+ ${hbase23.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-protocol
+ ${hbase23.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-protocol-shaded
+ ${hbase23.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-zookeeper
+ ${hbase23.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-metrics
+ ${hbase23.compat.version}
+ provided
+
+
+ org.apache.hbase
+ hbase-metrics-api
+ ${hbase23.compat.version}
+ provided
+
