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:44:17 UTC
[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 <st...@apache.org>
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 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
</plugin>
+ <!-- If this is configured in the top-level dependencyManagement,
+ it will run on the compat module even if the plugin is not enabled.
+ Sounds like another maven bug -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>${maven-enforcer-plugin.version}</version>
+ <configuration>
+ <rules>
+ <evaluateBeanshell>
+ <condition>
+ 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)
+ )
+ </condition>
+ </evaluateBeanshell>
+ </rules>
+ </configuration>
+ <executions>
+ <execution>
+ <id>check-hbase-compatibility</id>
+ <phase>validate</phase>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
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">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>21</version>
+ <parent>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix</artifactId>
+ <version>5.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.phoenix</groupId>
+
<artifactId>phoenix-hbase-compat-2.1.6</artifactId>
- <version>5.1.0-SNAPSHOT</version>
+
<name>Phoenix Hbase 2.1.6 compatibility</name>
<description>Compatibility module for HBase 2.1.6+</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.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <hbase.version>2.1.6</hbase.version>
+ </properties>
<dependencies>
- <!-- HBase dependencies -->
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- <version>2.1.6</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
- <version>2.1.6</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- <version>2.1.6</version>
- <scope>provided</scope>
- </dependency>
+ <!-- HBase dependencies -->
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
+
</project>
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">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>21</version>
+ <parent>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix</artifactId>
+ <version>5.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.phoenix</groupId>
+
<artifactId>phoenix-hbase-compat-2.2.1</artifactId>
- <version>5.1.0-SNAPSHOT</version>
<name>Phoenix Hbase 2.2.1 compatibility</name>
<description>Compatibility module for HBase 2.2.1+</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.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <hbase.version>2.2.1</hbase.version>
+ </properties>
<dependencies>
- <!-- HBase dependencies -->
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-client</artifactId>
- <version>2.2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-common</artifactId>
- <version>2.2.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.hbase</groupId>
- <artifactId>hbase-server</artifactId>
- <version>2.2.1</version>
- <scope>provided</scope>
- </dependency>
+ <!-- HBase dependencies -->
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-client</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-common</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>hbase-server</artifactId>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/phoenix-hbase-compat-2.3.0/pom.xml b/phoenix-hbase-compat-2.3.0/pom.xml
index e69cea1..7ea1827 100644
--- a/phoenix-hbase-compat-2.3.0/pom.xml
+++ b/phoenix-hbase-compat-2.3.0/pom.xml
@@ -20,55 +20,35 @@
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>
+ <parent>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix</artifactId>
+ <version>5.1.0-SNAPSHOT</version>
</parent>
- <groupId>org.apache.phoenix</groupId>
+
<artifactId>phoenix-hbase-compat-2.3.0</artifactId>
- <version>5.1.0-SNAPSHOT</version>
<name>Phoenix Hbase 2.3.0 compatibility</name>
<description>Compatibility module for HBase 2.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.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <hbase.version>2.3.0</hbase.version>
+ </properties>
<dependencies>
<!-- HBase dependencies -->
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-client</artifactId>
- <version>2.3.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-common</artifactId>
- <version>2.3.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-server</artifactId>
- <version>2.3.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index dc116e1..8c8f9e9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,11 +166,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.8</source>
@@ -447,49 +442,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>
- 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)
- )
- </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>