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 2021/02/11 14:57:25 UTC
[phoenix] branch 4.x updated: PHOENIX-6377 phoenix-client has
erronous maven dependecies
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 b626e35 PHOENIX-6377 phoenix-client has erronous maven dependecies
b626e35 is described below
commit b626e35877fb5350bae02b1b34ca7f0d43022bfe
Author: Istvan Toth <st...@apache.org>
AuthorDate: Wed Feb 10 21:48:10 2021 +0100
PHOENIX-6377 phoenix-client has erronous maven dependecies
---
.../phoenix-client-embedded/pom.xml | 18 +
phoenix-client-parent/phoenix-client/pom.xml | 23 +
phoenix-client-parent/pom.xml | 478 ++++++++++-----------
3 files changed, 270 insertions(+), 249 deletions(-)
diff --git a/phoenix-client-parent/phoenix-client-embedded/pom.xml b/phoenix-client-parent/phoenix-client-embedded/pom.xml
index d175704..a99c3ef 100644
--- a/phoenix-client-parent/phoenix-client-embedded/pom.xml
+++ b/phoenix-client-parent/phoenix-client-embedded/pom.xml
@@ -65,4 +65,22 @@
</plugins>
</build>
+ <dependencies>
+ <!-- These must not be moved to phoenix-client-parent, see PHOENIX-6377 -->
+ <!-- Depend on all other internal projects -->
+ <dependency>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId>
+ <optional>false</optional>
+ </dependency>
+ <dependency>
+ <groupId>sqlline</groupId>
+ <artifactId>sqlline</artifactId>
+ </dependency>
+ </dependencies>
+
</project>
diff --git a/phoenix-client-parent/phoenix-client/pom.xml b/phoenix-client-parent/phoenix-client/pom.xml
index a5ed9bb..08b9128 100644
--- a/phoenix-client-parent/phoenix-client/pom.xml
+++ b/phoenix-client-parent/phoenix-client/pom.xml
@@ -64,4 +64,27 @@
</plugins>
</build>
+ <dependencies>
+ <!-- These must not be moved to phoenix-client-parent, see PHOENIX-6377 -->
+ <!-- Depend on all other internal projects -->
+ <dependency>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.phoenix</groupId>
+ <artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId>
+ <optional>false</optional>
+ </dependency>
+ <dependency>
+ <groupId>sqlline</groupId>
+ <artifactId>sqlline</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.7.7</version>
+ </dependency>
+ </dependencies>
+
</project>
diff --git a/phoenix-client-parent/pom.xml b/phoenix-client-parent/pom.xml
index 7fe031a..d9ea146 100644
--- a/phoenix-client-parent/pom.xml
+++ b/phoenix-client-parent/pom.xml
@@ -40,254 +40,234 @@
</properties>
<build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <!-- RAT gets really confused on the phoenix-client subprojects,
- and there is nothing to audit here -->
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <configuration>
- <filters>
- <filter>
- <artifact>*:*</artifact>
- <excludes>
- <exclude>META-INF/*.SF</exclude>
- <exclude>META-INF/*.DSA</exclude>
- <exclude>META-INF/*.RSA</exclude>
- <exclude>META-INF/license/*</exclude>
- <exclude>META-INF/NOTICE</exclude>
- <exclude>LICENSE.*</exclude>
- <exclude>NOTICE.*</exclude>
- <exclude>NOTICE</exclude>
- <exclude>README*</exclude>
- </excludes>
- </filter>
- <filter>
- <artifact>org.apache.hadoop:hadoop-yarn-common</artifact>
- <excludes>
- <exclude>org/apache/hadoop/yarn/factories/package-info.class</exclude>
- <exclude>org/apache/hadoop/yarn/util/package-info.class</exclude>
- <exclude>org/apache/hadoop/yarn/factory/providers/package-info.class</exclude>
- <exclude>org/apache/hadoop/yarn/client/api/impl/package-info.class</exclude>
- <exclude>org/apache/hadoop/yarn/client/api/package-info.class</exclude>
- <exclude>webapps/**</exclude>
- </excludes>
- </filter>
- <!-- Phoenix specific -->
- <filter>
- <artifact>org.apache.commons:commons-math3</artifact>
- <excludes>
- <exclude>assets/**</exclude>
- </excludes>
- </filter>
- <filter>
- <artifact>org.apache.hbase:hbase-server</artifact>
- <excludes>
- <exclude>hbase-webapps/**</exclude>
- </excludes>
- </filter>
- <!-- Phoenix specific -->
- </filters>
- <transformers>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>csv-bulk-load-config.properties</resource>
- <file>
- ${project.basedir}/../config/csv-bulk-load-config.properties
- </file>
- </transformer>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>README.md</resource>
- <file>${project.basedir}/../README.md</file>
- </transformer>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>LICENSE.txt</resource>
- <file>${project.basedir}/../LICENSE</file>
- </transformer>
- <transformer
- implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
- <resource>NOTICE</resource>
- <file>${project.basedir}/../NOTICE</file>
- </transformer>
- </transformers>
- <relocations>
- <relocation>
- <pattern>org/</pattern>
- <shadedPattern>${shaded.package}.org.</shadedPattern>
- <excludes>
- <exclude>org/apache/hadoop/**</exclude>
- <!-- Our non-shaded htrace and logging libraries -->
- <exclude>org/apache/htrace/**</exclude>
- <exclude>org/slf4j/**</exclude>
- <exclude>org/apache/commons/logging/**</exclude>
- <exclude>org/apache/log4j/**</exclude>
- <!-- Not the org/ packages that are a part of the jdk -->
- <exclude>org/ietf/jgss/**</exclude>
- <exclude>org/omg/**</exclude>
- <exclude>org/w3c/dom/**</exclude>
- <exclude>org/xml/sax/**</exclude>
-
- <!-- Extras compared to Hadoop -->
- <!-- Hbase classes - Maybe these could be shaded as well ? -->
- <exclude>org/apache/hbase/**</exclude>
- <!-- Phoenix classes -->
- <exclude>org/apache/phoenix/**</exclude>
- <exclude>org/apache/omid/**</exclude>
- <!-- Do want/need to expose Tephra as well ? -->
- </excludes>
- </relocation>
- <relocation>
- <pattern>com/</pattern>
- <shadedPattern>${shaded.package}.com.</shadedPattern>
- <excludes>
- <!-- Not the com/ packages that are a part of particular jdk implementations -->
- <exclude>com/sun/tools/**</exclude>
- <exclude>com/sun/javadoc/**</exclude>
- <exclude>com/sun/security/**</exclude>
- <exclude>com/sun/jndi/**</exclude>
- <exclude>com/sun/management/**</exclude>
- </excludes>
- </relocation>
- <relocation>
- <!-- Some classes from jets3t, which we should probably just exclude anyway -->
- <pattern>contribs/</pattern>
- <shadedPattern>${shaded.package}.contribs.</shadedPattern>
- </relocation>
- <relocation>
- <pattern>io/</pattern>
- <shadedPattern>${shaded.package}.io.</shadedPattern>
- <excludes>
- <!-- Exclude config keys for Hadoop that look like package names -->
- <exclude>io/compression/**</exclude>
- <exclude>io/mapfile/**</exclude>
- <exclude>io/map/index/*</exclude>
- <exclude>io/seqfile/**</exclude>
- <exclude>io/file/buffer/size</exclude>
- <exclude>io/skip/checksum/errors</exclude>
- <exclude>io/sort/*</exclude>
- <exclude>io/serializations</exclude>
- </excludes>
- </relocation>
- <!-- JSRs that haven't made it to inclusion in J2SE -->
- <relocation>
- <pattern>javax/el/</pattern>
- <shadedPattern>${shaded.package}.javax.el.</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax/cache/</pattern>
- <shadedPattern>${shaded.package}.javax.cache.</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax/servlet/</pattern>
- <shadedPattern>${shaded.package}.javax.servlet.</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax/ws/</pattern>
- <shadedPattern>${shaded.package}.javax.ws.</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax/annotation/</pattern>
- <shadedPattern>${shaded.package}.javax.annotation.</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax/inject/</pattern>
- <shadedPattern>${shaded.package}.javax.inject.</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javax/validation/</pattern>
- <shadedPattern>${shaded.package}.javax.validation.</shadedPattern>
- </relocation>
- <relocation>
- <pattern>net/</pattern>
- <shadedPattern>${shaded.package}.net.</shadedPattern>
- <excludes>
- <!-- Exclude config keys for Hadoop that look like package names -->
- <exclude>net/topology/**</exclude>
- </excludes>
- </relocation>
- <!-- okio declares a top level package instead of nested -->
- <relocation>
- <pattern>okio/</pattern>
- <shadedPattern>${shaded.package}.okio.</shadedPattern>
- </relocation>
- <!-- Phoenix specific relocations -->
- <relocation>
- <!-- Tephra -->
- <pattern>co/</pattern>
- <shadedPattern>${shaded.package}.co.</shadedPattern>
- </relocation>
- <relocation>
- <pattern>it/</pattern>
- <shadedPattern>${shaded.package}.it.</shadedPattern>
- </relocation>
- <relocation>
- <pattern>javassist/</pattern>
- <shadedPattern>${shaded.package}.javassist.</shadedPattern>
- </relocation>
- <relocation>
- <pattern>jersey/</pattern>
- <shadedPattern>${shaded.package}.jersey.</shadedPattern>
- </relocation>
- <relocation>
- <pattern>jline/</pattern>
- <shadedPattern>${shaded.package}.jline.</shadedPattern>
- </relocation>
- <relocation>
- <pattern>mozilla/</pattern>
- <shadedPattern>${shaded.package}.mozilla.</shadedPattern>
- </relocation>
- <relocation>
- <pattern>tables/</pattern>
- <shadedPattern>${shaded.package}.tables.</shadedPattern>
- </relocation>
- <!-- Phoenix specific relocations end -->
- </relocations>
- </configuration>
- </plugin>
- </plugins>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <!-- RAT gets really confused on the phoenix-client subprojects,
+ and there is nothing to audit here -->
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <configuration>
+ <filters>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>META-INF/*.SF</exclude>
+ <exclude>META-INF/*.DSA</exclude>
+ <exclude>META-INF/*.RSA</exclude>
+ <exclude>META-INF/license/*</exclude>
+ <exclude>META-INF/NOTICE</exclude>
+ <exclude>LICENSE.*</exclude>
+ <exclude>NOTICE.*</exclude>
+ <exclude>NOTICE</exclude>
+ <exclude>README*</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>org.apache.hadoop:hadoop-yarn-common</artifact>
+ <excludes>
+ <exclude>org/apache/hadoop/yarn/factories/package-info.class</exclude>
+ <exclude>org/apache/hadoop/yarn/util/package-info.class</exclude>
+ <exclude>org/apache/hadoop/yarn/factory/providers/package-info.class</exclude>
+ <exclude>org/apache/hadoop/yarn/client/api/impl/package-info.class</exclude>
+ <exclude>org/apache/hadoop/yarn/client/api/package-info.class</exclude>
+ <exclude>webapps/**</exclude>
+ </excludes>
+ </filter>
+ <!-- Phoenix specific -->
+ <filter>
+ <artifact>org.apache.commons:commons-math3</artifact>
+ <excludes>
+ <exclude>assets/**</exclude>
+ </excludes>
+ </filter>
+ <filter>
+ <artifact>org.apache.hbase:hbase-server</artifact>
+ <excludes>
+ <exclude>hbase-webapps/**</exclude>
+ </excludes>
+ </filter>
+ <!-- Phoenix specific -->
+ </filters>
+ <transformers>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>csv-bulk-load-config.properties</resource>
+ <file>
+ ${project.basedir}/../config/csv-bulk-load-config.properties
+ </file>
+ </transformer>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>README.md</resource>
+ <file>${project.basedir}/../README.md</file>
+ </transformer>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>LICENSE.txt</resource>
+ <file>${project.basedir}/../LICENSE</file>
+ </transformer>
+ <transformer
+ implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer">
+ <resource>NOTICE</resource>
+ <file>${project.basedir}/../NOTICE</file>
+ </transformer>
+ </transformers>
+ <relocations>
+ <relocation>
+ <pattern>org/</pattern>
+ <shadedPattern>${shaded.package}.org.</shadedPattern>
+ <excludes>
+ <exclude>org/apache/hadoop/**</exclude>
+ <!-- Our non-shaded htrace and logging libraries -->
+ <exclude>org/apache/htrace/**</exclude>
+ <exclude>org/slf4j/**</exclude>
+ <exclude>org/apache/commons/logging/**</exclude>
+ <exclude>org/apache/log4j/**</exclude>
+ <!-- Not the org/ packages that are a part of the jdk -->
+ <exclude>org/ietf/jgss/**</exclude>
+ <exclude>org/omg/**</exclude>
+ <exclude>org/w3c/dom/**</exclude>
+ <exclude>org/xml/sax/**</exclude>
+
+ <!-- Extras compared to Hadoop -->
+ <!-- Hbase classes - Maybe these could be shaded as well ? -->
+ <exclude>org/apache/hbase/**</exclude>
+ <!-- Phoenix classes -->
+ <exclude>org/apache/phoenix/**</exclude>
+ <exclude>org/apache/omid/**</exclude>
+ <!-- Do want/need to expose Tephra as well ? -->
+ </excludes>
+ </relocation>
+ <relocation>
+ <pattern>com/</pattern>
+ <shadedPattern>${shaded.package}.com.</shadedPattern>
+ <excludes>
+ <!-- Not the com/ packages that are a part of particular jdk implementations -->
+ <exclude>com/sun/tools/**</exclude>
+ <exclude>com/sun/javadoc/**</exclude>
+ <exclude>com/sun/security/**</exclude>
+ <exclude>com/sun/jndi/**</exclude>
+ <exclude>com/sun/management/**</exclude>
+ </excludes>
+ </relocation>
+ <relocation>
+ <!-- Some classes from jets3t, which we should probably just exclude anyway -->
+ <pattern>contribs/</pattern>
+ <shadedPattern>${shaded.package}.contribs.</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>io/</pattern>
+ <shadedPattern>${shaded.package}.io.</shadedPattern>
+ <excludes>
+ <!-- Exclude config keys for Hadoop that look like package names -->
+ <exclude>io/compression/**</exclude>
+ <exclude>io/mapfile/**</exclude>
+ <exclude>io/map/index/*</exclude>
+ <exclude>io/seqfile/**</exclude>
+ <exclude>io/file/buffer/size</exclude>
+ <exclude>io/skip/checksum/errors</exclude>
+ <exclude>io/sort/*</exclude>
+ <exclude>io/serializations</exclude>
+ </excludes>
+ </relocation>
+ <!-- JSRs that haven't made it to inclusion in J2SE -->
+ <relocation>
+ <pattern>javax/el/</pattern>
+ <shadedPattern>${shaded.package}.javax.el.</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax/cache/</pattern>
+ <shadedPattern>${shaded.package}.javax.cache.</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax/servlet/</pattern>
+ <shadedPattern>${shaded.package}.javax.servlet.</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax/ws/</pattern>
+ <shadedPattern>${shaded.package}.javax.ws.</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax/annotation/</pattern>
+ <shadedPattern>${shaded.package}.javax.annotation.</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax/inject/</pattern>
+ <shadedPattern>${shaded.package}.javax.inject.</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javax/validation/</pattern>
+ <shadedPattern>${shaded.package}.javax.validation.</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>net/</pattern>
+ <shadedPattern>${shaded.package}.net.</shadedPattern>
+ <excludes>
+ <!-- Exclude config keys for Hadoop that look like package names -->
+ <exclude>net/topology/**</exclude>
+ </excludes>
+ </relocation>
+ <!-- okio declares a top level package instead of nested -->
+ <relocation>
+ <pattern>okio/</pattern>
+ <shadedPattern>${shaded.package}.okio.</shadedPattern>
+ </relocation>
+ <!-- Phoenix specific relocations -->
+ <relocation>
+ <!-- Tephra -->
+ <pattern>co/</pattern>
+ <shadedPattern>${shaded.package}.co.</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>it/</pattern>
+ <shadedPattern>${shaded.package}.it.</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>javassist/</pattern>
+ <shadedPattern>${shaded.package}.javassist.</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>jersey/</pattern>
+ <shadedPattern>${shaded.package}.jersey.</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>jline/</pattern>
+ <shadedPattern>${shaded.package}.jline.</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>mozilla/</pattern>
+ <shadedPattern>${shaded.package}.mozilla.</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>tables/</pattern>
+ <shadedPattern>${shaded.package}.tables.</shadedPattern>
+ </relocation>
+ <!-- Phoenix specific relocations end -->
+ </relocations>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
</build>
-
- <dependencies>
- <!-- Depend on all other internal projects -->
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-hbase-compat-${hbase.compat.version}</artifactId>
- <optional>false</optional>
- </dependency>
- <dependency>
- <groupId>sqlline</groupId>
- <artifactId>sqlline</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.7</version>
- </dependency>
- </dependencies>
</project>