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/11/13 06:37:40 UTC
[phoenix-tephra] branch master updated: TEPHRA-314 Clean up lib dir
in distribution assembly
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-tephra.git
The following commit(s) were added to refs/heads/master by this push:
new 07f50d1 TEPHRA-314 Clean up lib dir in distribution assembly
07f50d1 is described below
commit 07f50d1c85f4cb6196ec85d64850c4a025d9d7f7
Author: Istvan Toth <st...@apache.org>
AuthorDate: Thu Nov 12 14:38:00 2020 +0100
TEPHRA-314 Clean up lib dir in distribution assembly
* Remove examples from tephra-distibution
* Add all compat libraries to distribution
* Use dependencyset instead of moduleSet in assembly descriptor
---
tephra-distribution/pom.xml | 46 +++++++++++++++++------
{src => tephra-distribution/src}/assemble/bin.xml | 17 ++-------
2 files changed, 39 insertions(+), 24 deletions(-)
diff --git a/tephra-distribution/pom.xml b/tephra-distribution/pom.xml
index 787b8d0..d660e8d 100644
--- a/tephra-distribution/pom.xml
+++ b/tephra-distribution/pom.xml
@@ -31,12 +31,6 @@
<description>Apache Tephra Transaction System Distribution Module</description>
<packaging>pom</packaging>
- <!-- NOTE: These dependency declarations are only required to sort this project to the
- end of the line in the multimodule build.
-
- Since we only include the child1 module in our assembly, we only need to ensure this
- distribution project builds AFTER that one...
- -->
<dependencies>
<dependency>
<groupId>org.apache.tephra</groupId>
@@ -50,27 +44,57 @@
</dependency>
<dependency>
<groupId>org.apache.tephra</groupId>
- <artifactId>tephra-core-shaded</artifactId>
+ <artifactId>tephra-hbase-compat-1.1</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tephra</groupId>
+ <artifactId>tephra-hbase-compat-1.2</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tephra</groupId>
+ <artifactId>tephra-hbase-compat-1.2-cdh</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tephra</groupId>
+ <artifactId>tephra-hbase-compat-1.3</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tephra</groupId>
+ <artifactId>tephra-hbase-compat-1.4</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tephra</groupId>
+ <artifactId>tephra-hbase-compat-1.5</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tephra</groupId>
+ <artifactId>tephra-hbase-compat-1.6</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tephra</groupId>
- <artifactId>tephra-examples-hbase-1.1</artifactId>
+ <artifactId>tephra-hbase-compat-2.0</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tephra</groupId>
- <artifactId>tephra-examples-hbase-1.2</artifactId>
+ <artifactId>tephra-hbase-compat-2.1</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tephra</groupId>
- <artifactId>tephra-examples-cdh-5.7</artifactId>
+ <artifactId>tephra-hbase-compat-2.2</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.tephra</groupId>
- <artifactId>tephra-examples-cdh-5.8</artifactId>
+ <artifactId>tephra-hbase-compat-2.3</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/src/assemble/bin.xml b/tephra-distribution/src/assemble/bin.xml
similarity index 89%
rename from src/assemble/bin.xml
rename to tephra-distribution/src/assemble/bin.xml
index b9655ed..fe9037d 100644
--- a/src/assemble/bin.xml
+++ b/tephra-distribution/src/assemble/bin.xml
@@ -25,21 +25,12 @@
<format>tar.gz</format>
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
- <moduleSets>
- <moduleSet>
-
- <!-- Enable access to all projects in the current multimodule build! -->
- <useAllReactorProjects>true</useAllReactorProjects>
-
- <binaries>
+ <dependencySets>
+ <dependencySet>
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
- <dependencySets>
- <dependencySet/>
- </dependencySets>
- </binaries>
- </moduleSet>
- </moduleSets>
+ </dependencySet>
+ </dependencySets>
<fileSets>
<!-- Include top level bin directory -->
<!-- First copy all but the *.cmd files-->