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 2022/03/21 16:03:08 UTC
[phoenix] branch master updated: PHOENIX-6626 Make the without.tephra profile behaviour the default in 4.x and master, and remove the profile
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 d6bf8df PHOENIX-6626 Make the without.tephra profile behaviour the default in 4.x and master, and remove the profile
d6bf8df is described below
commit d6bf8df2e1e2e5b664c3de123f85cf6c99889532
Author: Istvan Toth <st...@apache.org>
AuthorDate: Mon Jan 31 19:58:55 2022 +0100
PHOENIX-6626 Make the without.tephra profile behaviour the default in 4.x and master, and remove the profile
---
phoenix-core/pom.xml | 81 +++++++++++++++-------------------------------------
pom.xml | 52 +++++++++------------------------
2 files changed, 37 insertions(+), 96 deletions(-)
diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index db6008c..ba772a4 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -412,6 +412,29 @@
<artifactId>omid-common</artifactId>
</dependency>
+ <!-- Tephra dependencies (not included in shaded artifacts -->
+ <dependency>
+ <groupId>org.apache.tephra</groupId>
+ <artifactId>tephra-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tephra</groupId>
+ <artifactId>tephra-core-shaded</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.tephra</groupId>
+ <artifactId>tephra-hbase-compat-${tephra.hbase.compat.version}</artifactId>
+ <classifier>shaded</classifier>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Omid test dependencies -->
<dependency>
<groupId>org.apache.omid</groupId>
@@ -561,64 +584,6 @@
<profiles>
<profile>
- <id>exclude-tephra</id>
- <activation>
- <property>
- <name>without.tephra</name>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.tephra</groupId>
- <artifactId>tephra-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tephra</groupId>
- <artifactId>tephra-core-shaded</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tephra</groupId>
- <artifactId>tephra-hbase-compat-${tephra.hbase.compat.version}</artifactId>
- <classifier>shaded</classifier>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>include-tephra</id>
- <activation>
- <property>
- <name>!without.tephra</name>
- </property>
- </activation>
- <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>
- <dependency>
- <groupId>org.apache.thrift</groupId>
- <artifactId>libthrift</artifactId>
- </dependency>
- </dependencies>
- </profile>
- <profile>
<id>phoenix-hbase-compat-2.3.0</id>
<!-- keep dependency plugin happy -->
<activation>
diff --git a/pom.xml b/pom.xml
index 00a2381..078e9ad 100644
--- a/pom.xml
+++ b/pom.xml
@@ -316,6 +316,13 @@
<trimStackTrace>false</trimStackTrace>
<!-- https://www.orpiske.net/2021/04/test-woes-with-maven-failsafe-3-0-0-m5 -->
<useModulePath>false</useModulePath>
+ <classpathDependencyExcludes>
+ <classpathDependencyExclude>org.apache.tephra:tephra-api</classpathDependencyExclude>
+ <classpathDependencyExclude>org.apache.tephra:tephra-core-shaded</classpathDependencyExclude>
+ <classpathDependencyExclude>org.apache.tephra:tephra-core</classpathDependencyExclude>
+ <classpathDependencyExclude>org.apache.tephra:tephra-hbase-compat-${tephra.hbase.compat.version}</classpathDependencyExclude>
+ <classpathDependencyExclude>org.apache.thrift:libthrift</classpathDependencyExclude>
+ </classpathDependencyExcludes>
</configuration>
<executions>
<execution>
@@ -558,6 +565,13 @@
<redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
<shutdown>exit</shutdown>
<trimStackTrace>false</trimStackTrace>
+ <classpathDependencyExcludes>
+ <classpathDependencyExclude>org.apache.tephra:tephra-api</classpathDependencyExclude>
+ <classpathDependencyExclude>org.apache.tephra:tephra-core-shaded</classpathDependencyExclude>
+ <classpathDependencyExclude>org.apache.tephra:tephra-core</classpathDependencyExclude>
+ <classpathDependencyExclude>org.apache.tephra:tephra-hbase-compat-${tephra.hbase.compat.version}</classpathDependencyExclude>
+ <classpathDependencyExclude>org.apache.thrift:libthrift</classpathDependencyExclude>
+ </classpathDependencyExcludes>
</configuration>
</plugin>
<!-- All projects create a test jar -->
@@ -1539,44 +1553,6 @@
</plugins>
</build>
</profile>
- <profile>
- <id>exclude-tephra</id>
- <activation>
- <property>
- <name>without.tephra</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <classpathDependencyExcludes>
- <classpathDependencyExclude>org.apache.tephra:tephra-api</classpathDependencyExclude>
- <classpathDependencyExclude>org.apache.tephra:tephra-core-shaded</classpathDependencyExclude>
- <classpathDependencyExclude>org.apache.tephra:tephra-core</classpathDependencyExclude>
- <classpathDependencyExclude>org.apache.tephra:tephra-hbase-compat-${tephra.hbase.compat.version}</classpathDependencyExclude>
- <classpathDependencyExclude>org.apache.thrift:libthrift</classpathDependencyExclude>
- </classpathDependencyExcludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <classpathDependencyExcludes>
- <classpathDependencyExclude>org.apache.tephra:tephra-api</classpathDependencyExclude>
- <classpathDependencyExclude>org.apache.tephra:tephra-core-shaded</classpathDependencyExclude>
- <classpathDependencyExclude>org.apache.tephra:tephra-core</classpathDependencyExclude>
- <classpathDependencyExclude>org.apache.tephra:tephra-hbase-compat-${tephra.hbase.compat.version}</classpathDependencyExclude>
- <classpathDependencyExclude>org.apache.thrift:libthrift</classpathDependencyExclude>
- </classpathDependencyExcludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
<!-- See BUILDING.md for profile selection-->
<!-- The dependencies should be defined only in phoenix-core
,but maven doesn't seem to support that -->