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/16 07:59:58 UTC
[phoenix] branch 4.x 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 4.x
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x by this push:
new aa468e3 PHOENIX-6261 Reorganise project structure to make mvn versions:set work
aa468e3 is described below
commit aa468e3ad6ab869bd0c646867c12c0603392eb7f
Author: Istvan Toth <st...@apache.org>
AuthorDate: Fri Dec 11 11:20:57 2020 +0100
PHOENIX-6261 Reorganise project structure to make mvn versions:set work
---
phoenix-core/pom.xml | 47 +++++++++++++++++++++++
phoenix-hbase-compat-1.3.0/pom.xml | 44 +++++----------------
phoenix-hbase-compat-1.4.0/pom.xml | 44 +++++----------------
phoenix-hbase-compat-1.5.0/pom.xml | 45 +++++-----------------
pom.xml | 79 +-------------------------------------
5 files changed, 75 insertions(+), 184 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 809f745..de08a2d 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -34,6 +34,48 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${maven-enforcer-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>check-hbase-compatibility</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <evaluateBeanshell>
+ <condition>
+ <!-- Add check for any know incompatibilies in the below code -->
+ 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 == 1 && (
+ ("${hbase.compat.version}".equals("1.5.0")
+ && (hbaseMinor == 5 || hbaseMinor == 6))
+ || ("${hbase.compat.version}".equals("1.4.0")
+ && hbaseMinor == 4)
+ || ("${hbase.compat.version}".equals("1.3.0")
+ && hbaseMinor == 3)
+ )
+ </condition>
+ </evaluateBeanshell>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
@@ -147,6 +189,11 @@
</build>
<dependencies>
+ <!-- HBase compat dependency -->
+ <dependency>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.omid</groupId>
<artifactId>omid-hbase-client-hbase1.x</artifactId>
diff --git a/phoenix-hbase-compat-1.3.0/pom.xml b/phoenix-hbase-compat-1.3.0/pom.xml
index 7f86378..1725cd6 100644
--- a/phoenix-hbase-compat-1.3.0/pom.xml
+++ b/phoenix-hbase-compat-1.3.0/pom.xml
@@ -17,53 +17,27 @@
-->
<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">
+ 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</groupId>
- <artifactId>apache</artifactId>
- <version>21</version>
+ <artifactId>phoenix</artifactId>
+ <groupId>org.apache.phoenix</groupId>
+ <version>4.16.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.phoenix</groupId>
+
<artifactId>phoenix-hbase-compat-1.3.0</artifactId>
- <version>4.16.0-SNAPSHOT</version>
<name>Phoenix Hbase 1.3.0 compatibility</name>
<description>Compatibility module for HBase 1.3.0+</description>
- <build>
- <plugins>
- <!-- Setup eclipse -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <buildcommands>
- <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
- </buildcommands>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <hbase.version>1.3.0</hbase.version>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
- <version>1.3.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/phoenix-hbase-compat-1.4.0/pom.xml b/phoenix-hbase-compat-1.4.0/pom.xml
index 0faebdb..a4c3b59 100644
--- a/phoenix-hbase-compat-1.4.0/pom.xml
+++ b/phoenix-hbase-compat-1.4.0/pom.xml
@@ -17,53 +17,27 @@
-->
<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">
+ 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</groupId>
- <artifactId>apache</artifactId>
- <version>21</version>
+ <artifactId>phoenix</artifactId>
+ <groupId>org.apache.phoenix</groupId>
+ <version>4.16.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.phoenix</groupId>
+
<artifactId>phoenix-hbase-compat-1.4.0</artifactId>
- <version>4.16.0-SNAPSHOT</version>
<name>Phoenix Hbase 1.4.0 compatibility</name>
<description>Compatibility module for HBase 1.4.0+</description>
- <build>
- <plugins>
- <!-- Setup eclipse -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <buildcommands>
- <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
- </buildcommands>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <hbase.version>1.4.0</hbase.version>
+ </properties>
<dependencies>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
- <version>1.4.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/phoenix-hbase-compat-1.5.0/pom.xml b/phoenix-hbase-compat-1.5.0/pom.xml
index c388190..6234239 100644
--- a/phoenix-hbase-compat-1.5.0/pom.xml
+++ b/phoenix-hbase-compat-1.5.0/pom.xml
@@ -17,54 +17,27 @@
-->
<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">
+ 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</groupId>
- <artifactId>apache</artifactId>
- <version>21</version>
+ <artifactId>phoenix</artifactId>
+ <groupId>org.apache.phoenix</groupId>
+ <version>4.16.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.phoenix</groupId>
+
<artifactId>phoenix-hbase-compat-1.5.0</artifactId>
- <version>4.16.0-SNAPSHOT</version>
<name>Phoenix Hbase 1.5.0 compatibility</name>
<description>Compatibility module for HBase 1.5.0+</description>
- <build>
- <plugins>
- <!-- Setup eclipse -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-eclipse-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <buildcommands>
- <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand>
- </buildcommands>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.7</source>
- <target>1.7</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <hbase.version>1.5.0</hbase.version>
+ </properties>
<dependencies>
- <!-- HBase dependencies -->
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
- <version>1.5.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index f65e14d..1058d76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -172,11 +172,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>${maven-enforcer-plugin.version}</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.7</source>
@@ -412,47 +407,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <executions>
- <execution>
- <id>check-hbase-compatibility</id>
- <phase>validate</phase>
- <goals>
- <goal>enforce</goal>
- </goals>
- <configuration>
- <rules>
- <evaluateBeanshell>
- <condition>
- <!-- Add check for any know incompatibilies in the below code -->
- 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 == 1 && (
- ("${hbase.compat.version}".equals("1.5.0")
- && (hbaseMinor == 5 || hbaseMinor == 6))
- || ("${hbase.compat.version}".equals("1.4.0")
- && hbaseMinor == 4)
- || ("${hbase.compat.version}".equals("1.3.0")
- && hbaseMinor == 3)
- )
- </condition>
- </evaluateBeanshell>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.0</version>
<executions>
@@ -1169,7 +1123,7 @@
<scala.binary.version>2.10</scala.binary.version>
</properties>
</profile>
- <!-- See BUILDING.md for profile selection -->
+ <!-- See BUILDING.md for profile selection-->
<profile>
<id>phoenix-hbase-compat-1.5.0-default</id>
<activation>
@@ -1177,12 +1131,6 @@
<name>!hbase.profile</name>
</property>
</activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-hbase-compat-1.5.0</artifactId>
- </dependency>
- </dependencies>
<properties>
<hbase.profile>1.5</hbase.profile>
<hbase.compat.version>1.5.0</hbase.compat.version>
@@ -1197,12 +1145,6 @@
<value>1.3</value>
</property>
</activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-hbase-compat-1.3.0</artifactId>
- </dependency>
- </dependencies>
<properties>
<hbase.profile>1.3</hbase.profile>
<hbase.compat.version>1.3.0</hbase.compat.version>
@@ -1217,12 +1159,6 @@
<value>1.4</value>
</property>
</activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-hbase-compat-1.4.0</artifactId>
- </dependency>
- </dependencies>
<properties>
<hbase.profile>1.4</hbase.profile>
<hbase.compat.version>1.4.0</hbase.compat.version>
@@ -1237,12 +1173,6 @@
<value>1.5</value>
</property>
</activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-hbase-compat-1.5.0</artifactId>
- </dependency>
- </dependencies>
<properties>
<hbase.profile>1.5</hbase.profile>
<hbase.compat.version>1.5.0</hbase.compat.version>
@@ -1257,12 +1187,6 @@
<value>1.6</value>
</property>
</activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-hbase-compat-1.5.0</artifactId>
- </dependency>
- </dependencies>
<properties>
<hbase.profile>1.6</hbase.profile>
<hadoop-two.version>2.8.5</hadoop-two.version>
@@ -1271,7 +1195,6 @@
<hbase.version>1.6.0</hbase.version>
</properties>
</profile>
-
<profile>
<id>codecoverage</id>
<activation>