PHOENIX-6253 Change shaded connector jar naming convention
diff --git a/phoenix-hive-base/pom.xml b/phoenix-hive-base/pom.xml
index 5120a07..0bcd6c3 100644
--- a/phoenix-hive-base/pom.xml
+++ b/phoenix-hive-base/pom.xml
@@ -375,8 +375,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
- <finalName>phoenix${phoenix.main.version}-${project.version}-hive</finalName>
<shadedArtifactAttached>true</shadedArtifactAttached>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<filters>
<filter>
<artifact>*:*</artifact>
diff --git a/phoenix-kafka-base/pom.xml b/phoenix-kafka-base/pom.xml
index 7b61e60..717cee4 100644
--- a/phoenix-kafka-base/pom.xml
+++ b/phoenix-kafka-base/pom.xml
@@ -204,8 +204,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
- <finalName>phoenix${phoenix.main.version}-kafka-${project.version}-minimal</finalName>
+ <shadedArtifactAttached>true</shadedArtifactAttached>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+ <shadedClassifierName>shaded-minimal</shadedClassifierName>
<shadeTestJar>false</shadeTestJar>
<artifactSet>
<includes>
@@ -215,6 +216,14 @@
</includes>
</artifactSet>
</configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</pluginManagement>
diff --git a/phoenix-pig-base/pom.xml b/phoenix-pig-base/pom.xml
index a80225e..d0aebbe 100644
--- a/phoenix-pig-base/pom.xml
+++ b/phoenix-pig-base/pom.xml
@@ -178,8 +178,7 @@
<goal>shade</goal>
</goals>
<configuration>
- <finalName>phoenix${phoenix.main.version}-${project.version}-pig</finalName>
- <shadedArtifactAttached>false</shadedArtifactAttached>
+ <shadedArtifactAttached>true</shadedArtifactAttached>
<promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<shadeTestJar>false</shadeTestJar>
<transformers>
diff --git a/phoenix-spark-base/pom.xml b/phoenix-spark-base/pom.xml
index 00fe45c..bff52fb 100644
--- a/phoenix-spark-base/pom.xml
+++ b/phoenix-spark-base/pom.xml
@@ -619,8 +619,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<configuration>
- <finalName>phoenix${phoenix.main.version}-${project.version}-spark</finalName>
<shadedArtifactAttached>true</shadedArtifactAttached>
+ <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
<filters>
<filter>
<artifact>*:*</artifact>
diff --git a/phoenix4-connectors-assembly/pom.xml b/phoenix4-connectors-assembly/pom.xml
index 7f8bd88..bde5ce9 100644
--- a/phoenix4-connectors-assembly/pom.xml
+++ b/phoenix4-connectors-assembly/pom.xml
@@ -73,10 +73,10 @@
<arguments>
<argument>-fnsv</argument>
<argument>
- phoenix4-flume-${project.version}.jar
+ phoenix4-flume-${project.version}-shaded.jar
</argument>
<argument>
- phoenix4-flume.jar
+ phoenix4-flume-shaded.jar
</argument>
</arguments>
</configuration>
@@ -93,10 +93,10 @@
<arguments>
<argument>-fnsv</argument>
<argument>
- phoenix4-${project.version}-hive.jar
+ phoenix4-hive-${project.version}-shaded.jar
</argument>
<argument>
- phoenix4-hive.jar
+ phoenix4-hive-shaded.jar
</argument>
</arguments>
</configuration>
@@ -113,10 +113,10 @@
<arguments>
<argument>-fnsv</argument>
<argument>
- phoenix4-${project.version}-pig.jar
+ phoenix4-pig-${project.version}-shaded.jar
</argument>
<argument>
- phoenix4-pig.jar
+ phoenix4-pig-shaded.jar
</argument>
</arguments>
</configuration>
@@ -133,10 +133,10 @@
<arguments>
<argument>-fnsv</argument>
<argument>
- phoenix4-${project.version}-spark.jar
+ phoenix4-spark-${project.version}-shaded.jar
</argument>
<argument>
- phoenix4-spark.jar
+ phoenix4-spark-shaded.jar
</argument>
</arguments>
</configuration>
@@ -153,10 +153,10 @@
<arguments>
<argument>-fnsv</argument>
<argument>
- phoenix4-kafka-${project.version}-minimal.jar
+ phoenix4-kafka-${project.version}-shaded-minimal.jar
</argument>
<argument>
- phoenix4-kafka.jar
+ phoenix4-kafka-shaded-minimal.jar
</argument>
</arguments>
</configuration>
@@ -173,7 +173,6 @@
<goal>single</goal>
</goals>
<configuration>
- <skipAssembly>${skip-phoenix4}</skipAssembly>
<descriptors>
<descriptor>src/build/package-phoenix4-connectors-to-tar-all.xml</descriptor>
</descriptors>
diff --git a/phoenix4-connectors-assembly/src/build/components/phoenix4-jars.xml b/phoenix4-connectors-assembly/src/build/components/phoenix4-jars.xml
index 5c509d5..643e321 100644
--- a/phoenix4-connectors-assembly/src/build/components/phoenix4-jars.xml
+++ b/phoenix4-connectors-assembly/src/build/components/phoenix4-jars.xml
@@ -21,46 +21,46 @@
-->
<component>
<fileSets>
- <!-- Add the client & mapreduce jars. Expects the client jar packaging phase to already be run,
- which is determined by specification order in the pom. -->
+ <!-- We don't actually have shaded flume JARs ATM,
+ but there's no point in packaging the unshaded ones. -->
<fileSet>
<directory>${project.basedir}/../phoenix-flume-base/phoenix4-flume/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>phoenix4-flume-${project.version}.jar</include>
- <include>phoenix4-flume.jar</include>
+ <include>phoenix4-flume-${project.version}-shaded.jar</include>
+ <include>phoenix4-flume-shaded.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/../phoenix-kafka-base/phoenix4-kafka/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>phoenix4-kafka-${project.version}-minimal.jar</include>
- <include>phoenix4-kafka.jar</include>
+ <include>phoenix4-kafka-${project.version}-shaded-minimal.jar</include>
+ <include>phoenix4-kafka-shaded-minimal.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/../phoenix-pig-base/phoenix4-pig/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>phoenix4-${project.version}-pig.jar</include>
- <include>phoenix4-pig.jar</include>
+ <include>phoenix4-pig-${project.version}-shaded.jar</include>
+ <include>phoenix4-pig-shaded.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/../phoenix-spark-base/phoenix4-spark/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>phoenix4-${project.version}-spark.jar</include>
- <include>phoenix4-spark.jar</include>
+ <include>phoenix4-spark-${project.version}-shaded.jar</include>
+ <include>phoenix4-spark-shaded.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/../phoenix-hive-base/phoenix4-hive/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>phoenix4-${project.version}-hive.jar</include>
- <include>phoenix4-hive.jar</include>
+ <include>phoenix4-hive-${project.version}-shaded.jar</include>
+ <include>phoenix4-hive-shaded.jar</include>
</includes>
</fileSet>
</fileSets>
diff --git a/phoenix5-connectors-assembly/pom.xml b/phoenix5-connectors-assembly/pom.xml
index ec2bdb5..e8c9ef0 100644
--- a/phoenix5-connectors-assembly/pom.xml
+++ b/phoenix5-connectors-assembly/pom.xml
@@ -80,10 +80,10 @@
<arguments>
<argument>-fnsv</argument>
<argument>
- phoenix5-flume-${project.version}.jar
+ phoenix5-flume-${project.version}-shaded.jar
</argument>
<argument>
- phoenix5-flume.jar
+ phoenix5-flume-shaded.jar
</argument>
</arguments>
</configuration>
@@ -100,10 +100,10 @@
<arguments>
<argument>-fnsv</argument>
<argument>
- phoenix5-${project.version}-hive.jar
+ phoenix5-hive-${project.version}-shaded.jar
</argument>
<argument>
- phoenix5-hive.jar
+ phoenix5-hive-shaded.jar
</argument>
</arguments>
</configuration>
@@ -120,10 +120,10 @@
<arguments>
<argument>-fnsv</argument>
<argument>
- phoenix5-${project.version}-pig.jar
+ phoenix5-pig-${project.version}-shaded.jar
</argument>
<argument>
- phoenix5-pig.jar
+ phoenix5-pig-shaded.jar
</argument>
</arguments>
</configuration>
@@ -140,10 +140,10 @@
<arguments>
<argument>-fnsv</argument>
<argument>
- phoenix5-${project.version}-spark.jar
+ phoenix5-spark-${project.version}-shaded.jar
</argument>
<argument>
- phoenix5-spark.jar
+ phoenix5-spark-shaded.jar
</argument>
</arguments>
</configuration>
@@ -160,10 +160,10 @@
<arguments>
<argument>-fnsv</argument>
<argument>
- phoenix5-kafka-${project.version}-minimal.jar
+ phoenix5-kafka-${project.version}-shaded-minimal.jar
</argument>
<argument>
- phoenix5-kafka.jar
+ phoenix5-kafka-shaded-minimal.jar
</argument>
</arguments>
</configuration>
diff --git a/phoenix5-connectors-assembly/src/build/components/phoenix5-jars.xml b/phoenix5-connectors-assembly/src/build/components/phoenix5-jars.xml
index ac1630e..b0dbc5c 100644
--- a/phoenix5-connectors-assembly/src/build/components/phoenix5-jars.xml
+++ b/phoenix5-connectors-assembly/src/build/components/phoenix5-jars.xml
@@ -21,46 +21,46 @@
-->
<component>
<fileSets>
- <!-- Add the client & mapreduce jars. Expects the client jar packaging phase to already be run,
- which is determined by specification order in the pom. -->
<fileSet>
+ <!-- We don't actually have shaded flume JARs ATM,
+ but there's no point in packaging the unshaded ones. -->
<directory>${project.basedir}/../phoenix-flume-base/phoenix5-flume/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>phoenix5-flume-${project.version}.jar</include>
- <include>phoenix5-flume.jar</include>
+ <include>phoenix5-flume-${project.version}-shaded.jar</include>
+ <include>phoenix5-flume-shaded.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/../phoenix-kafka-base/phoenix5-kafka/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>phoenix5-kafka-${project.version}-minimal.jar</include>
- <include>phoenix5-kafka.jar</include>
+ <include>phoenix5-kafka-${project.version}-shaded-minimal.jar</include>
+ <include>phoenix5-kafka-shaded-minimal.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/../phoenix-pig-base/phoenix5-pig/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>phoenix5-${project.version}-pig.jar</include>
- <include>phoenix5-pig.jar</include>
+ <include>phoenix5-pig-${project.version}-shaded.jar</include>
+ <include>phoenix5-pig-shaded.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/../phoenix-spark-base/phoenix5-spark/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>phoenix5-${project.version}-spark.jar</include>
- <include>phoenix5-spark.jar</include>
+ <include>phoenix5-spark-${project.version}-shaded.jar</include>
+ <include>phoenix5-spark-shaded.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${project.basedir}/../phoenix-hive-base/phoenix5-hive/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>phoenix5-${project.version}-hive.jar</include>
- <include>phoenix5-hive.jar</include>
+ <include>phoenix5-hive-${project.version}-shaded.jar</include>
+ <include>phoenix5-hive-shaded.jar</include>
</includes>
</fileSet>
</fileSets>
diff --git a/pom.xml b/pom.xml
index 2b538d4..2b8f136 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,8 +125,6 @@
<numForkedIT>7</numForkedIT>
<it.failIfNoSpecifiedTests>false</it.failIfNoSpecifiedTests>
<surefire.failIfNoSpecifiedTests>false</surefire.failIfNoSpecifiedTests>
- <skip-phoenix5>false</skip-phoenix5>
- <skip-phoenix4>false</skip-phoenix4>
<!-- Set default encoding so multi-byte tests work correctly on the Mac -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
