This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch 4.16
in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.16 by this push:
new e61df3c PHOENIX-6064 Make Tephra support optional (addendum: fix
backport)
e61df3c is described below
commit e61df3cc802e6b2494c3b7640bd4123fa3c3c325
Author: Istvan Toth <st...@apache.org>
AuthorDate: Mon Jan 31 21:01:46 2022 +0100
PHOENIX-6064 Make Tephra support optional (addendum: fix backport)
---
phoenix-core/pom.xml | 15 ---------------
phoenix-server/pom.xml | 45 +++++++++++++++++++++++++++++++++++----------
2 files changed, 35 insertions(+), 25 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index b2e7fab..77e9395 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -302,21 +302,6 @@
</exclusions>
</dependency>
- <!-- Transaction dependencies -->
- <dependency>
- <groupId>org.apache.tephra</groupId>
- <artifactId>tephra-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tephra</groupId>
- <artifactId>tephra-core-shaded</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.tephra</groupId>
-
<artifactId>tephra-hbase-compat-${tephra.hbase.compat.version}</artifactId>
- <classifier>shaded</classifier>
- </dependency>
-
<!-- Make sure we have all the antlr dependencies -->
<dependency>
<groupId>org.antlr</groupId>
diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml
index 9e82a62..021a08f 100644
--- a/phoenix-server/pom.xml
+++ b/phoenix-server/pom.xml
@@ -101,7 +101,6 @@
<include>org.apache.phoenix:phoenix-hbase-compat-${hbase.compat.version}</include>
<include>org.iq80.snappy:snappy</include>
<include>org.antlr:antlr*</include>
- <include>org.apache.tephra:tephra*</include>
<include>org.apache.omid:omid*</include>
<include>org.apache.commons:commons-collections4</include>
<include>org.jboss.netty:netty</include>
@@ -113,7 +112,6 @@
<include>com.google.inject.extensions:guice-assistedinject</include>
<include>it.unimi.dsi:fastutil</include>
<include>io.dropwizard.metrics:metrics-core</include>
- <include>org.apache.thrift:libthrift</include>
<include>com.clearspring.analytics:stream</include>
<include>com.salesforce.i18n:i18n-util</include>
<include>com.ibm.icu:icu4j</include>
@@ -162,7 +160,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-auth</artifactId>
- <version>2.7.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -170,12 +167,40 @@
<artifactId>hbase-testing-util</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.tephra</groupId>
- <artifactId>tephra-core</artifactId>
- <version>${tephra.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>include-tephra</id>
+ <activation>
+ <property>
+ <name>!without.tephra</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ <configuration>
+ <artifactSet>
+ <includes>
+ <include>org.apache.tephra:tephra*</include>
+ <include>org.apache.thrift:libthrift</include>
+ </includes>
+ </artifactSet>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
