Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 d2f2bade0 -> bb8d7cd0d refs/heads/4.x-HBase-1.0 a5caaeb89 -> 88c380925 refs/heads/4.x-HBase-1.1 7b9c34980 -> 61ea48c16 refs/heads/master 557197ed6 -> 3e69b90d8
PHOENIX-3020 Bulk load tool is not working with new jars Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3e69b90d Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3e69b90d Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3e69b90d Branch: refs/heads/master Commit: 3e69b90d8666ffb8017cf5537d987522ef485d57 Parents: 557197e Author: Sergey Soldatov <s...@apache.org> Authored: Wed Jun 22 23:45:54 2016 -0700 Committer: Sergey Soldatov <s...@apache.org> Committed: Wed Jun 22 23:45:54 2016 -0700 ---------------------------------------------------------------------- phoenix-client/pom.xml | 36 +++++++++++++++++--------------- phoenix-queryserver-client/pom.xml | 32 ++++++++++++++++++++++++++++ phoenix-queryserver/pom.xml | 30 ++++++++++++++++++++++++++ phoenix-server/pom.xml | 37 ++++++++++++++++++++------------- 4 files changed, 104 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/3e69b90d/phoenix-client/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-client/pom.xml b/phoenix-client/pom.xml index 655b0fd..2448d1f 100644 --- a/phoenix-client/pom.xml +++ b/phoenix-client/pom.xml @@ -98,18 +98,6 @@ <promoteTransitiveDependencies>true</promoteTransitiveDependencies> <shadeTestJar>false</shadeTestJar> <transformers> - <!--<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">--> - <!--</transformer>--> - <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> - <resources> - <resource>LICENSE.txt</resource> - <resource>ASL2.0</resource> - </resources> - </transformer> - <transformer - implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> - <addHeader>false</addHeader> - </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> @@ -126,7 +114,12 @@ <transformer implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> <resource>LICENSE.txt</resource> - <file>${project.basedir}/../LICENSE.txt</file> + <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> <artifactSet> @@ -137,6 +130,19 @@ <exclude>org.apache.phoenix:phoenix-client</exclude> </excludes> </artifactSet> + <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>LICENSE.*</exclude> + <exclude>NOTICE.*</exclude> + </excludes> + </filter> + </filters> <relocations> @@ -172,10 +178,6 @@ <shadedPattern>${shaded.package}.com.thoughtworks</shadedPattern> </relocation> <relocation> - <pattern>com.sun.jersey</pattern> - <shadedPattern>${shaded.package}.com.sun.jersey</shadedPattern> - </relocation> - <relocation> <pattern>com.yammer</pattern> <shadedPattern>${shaded.package}.com.yammer</shadedPattern> </relocation> http://git-wip-us.apache.org/repos/asf/phoenix/blob/3e69b90d/phoenix-queryserver-client/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml index 3fba5aa..c761251 100644 --- a/phoenix-queryserver-client/pom.xml +++ b/phoenix-queryserver-client/pom.xml @@ -72,6 +72,38 @@ </goals> <configuration> <finalName>phoenix-${project.version}-thin-client</finalName> + + <transformers> + <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> + <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>LICENSE.*</exclude> + <exclude>NOTICE.*</exclude> + </excludes> + </filter> + </filters> + <relocations> <!-- COM relocation --> http://git-wip-us.apache.org/repos/asf/phoenix/blob/3e69b90d/phoenix-queryserver/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-queryserver/pom.xml b/phoenix-queryserver/pom.xml index 365f950..d4162ce 100644 --- a/phoenix-queryserver/pom.xml +++ b/phoenix-queryserver/pom.xml @@ -63,6 +63,23 @@ <shadedArtifactAttached>false</shadedArtifactAttached> <promoteTransitiveDependencies>true</promoteTransitiveDependencies> <shadeTestJar>false</shadeTestJar> + <transformers> + <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> <artifactSet> <includes> <include>org.apache.calcite.avatica:*</include> @@ -70,6 +87,19 @@ <include>javax.servlet:*</include> </includes> </artifactSet> + <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>LICENSE.*</exclude> + <exclude>NOTICE.*</exclude> + </excludes> + </filter> + </filters> <relocations> <relocation> <pattern>com.google</pattern> http://git-wip-us.apache.org/repos/asf/phoenix/blob/3e69b90d/phoenix-server/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index a6eb36b..3d94406 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -103,24 +103,20 @@ <promoteTransitiveDependencies>true</promoteTransitiveDependencies> <shadeTestJar>false</shadeTestJar> <transformers> - <!--<transformer implementation="org.apache.maven.plugins.shade.resource.ApacheLicenseResourceTransformer">--> - <!--</transformer>--> - <transformer implementation="org.apache.maven.plugins.shade.resource.DontIncludeResourceTransformer"> - <resources> - <resource>LICENSE.txt</resource> - <resource>ASL2.0</resource> - </resources> - </transformer> <transformer implementation="org.apache.maven.plugins.shade.resource.ApacheNoticeResourceTransformer"> <addHeader>false</addHeader> </transformer> - <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/> - <transformer - implementation="org.apache.maven.plugins.shade.resource.IncludeResourceTransformer"> - <resource>LICENSE.txt</resource> - <file>${project.basedir}/../LICENSE.txt</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> <artifactSet> <includes> @@ -142,6 +138,19 @@ <exclude>org.apache.phoenix:phoenix-server</exclude> </excludes> </artifactSet> + <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>LICENSE.*</exclude> + <exclude>NOTICE.*</exclude> + </excludes> + </filter> + </filters> </configuration> </execution> </executions>