PHOENIX-4788 Shade Joda libraries in phoenix-server to avoid conflict with hbase shell
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/aa2f12db Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/aa2f12db Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/aa2f12db Branch: refs/heads/master Commit: aa2f12db9ac7e90fbc26f7906e184131f4917782 Parents: 69b50f6 Author: Ankit Singhal <[email protected]> Authored: Fri Jun 22 15:57:04 2018 -0700 Committer: Ankit Singhal <[email protected]> Committed: Fri Jun 22 15:57:04 2018 -0700 ---------------------------------------------------------------------- phoenix-server/pom.xml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/aa2f12db/phoenix-server/pom.xml ---------------------------------------------------------------------- diff --git a/phoenix-server/pom.xml b/phoenix-server/pom.xml index e06eba9..2dbbb2b 100644 --- a/phoenix-server/pom.xml +++ b/phoenix-server/pom.xml @@ -40,6 +40,7 @@ <source.skip>true</source.skip> <license.bundles.dependencies>true</license.bundles.dependencies> <top.dir>${project.basedir}/..</top.dir> + <shaded.package>org.apache.phoenix.shaded</shaded.package> </properties> <build> @@ -124,11 +125,11 @@ <include>org.apache.phoenix:phoenix-core</include> <include>org.iq80.snappy:snappy</include> <include>org.antlr:antlr*</include> + <include>joda-time:joda-time</include> <include>org.apache.tephra:tephra*</include> <include>com.google.code.gson:gson</include> <include>org.jruby.joni:joni</include> <include>org.jruby.jcodings:jcodings</include> - <include>joda-time:joda-time</include> <include>org.apache.twill:twill*</include> <include>com.google.inject.extensions:guice-assistedinject</include> <include>it.unimi.dsi:fastutil</include> @@ -157,6 +158,12 @@ </excludes> </filter> </filters> + <relocations> + <relocation> + <pattern>org.joda</pattern> + <shadedPattern>${shaded.package}.org.joda</shadedPattern> + </relocation> + </relocations> </configuration> </execution> </executions>
