Repository: storm Updated Branches: refs/heads/1.x-branch b64b69f76 -> 67a5cecca
Move the org.apache.thrift7 namespace to something correct/sensible Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/ab11ce97 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/ab11ce97 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/ab11ce97 Branch: refs/heads/1.x-branch Commit: ab11ce97786c2eef523c04684b86b67b7902dca8 Parents: 3db9680 Author: Kyle Nusbaum <[email protected]> Authored: Tue Jan 12 16:58:17 2016 -0600 Committer: Kyle Nusbaum <[email protected]> Committed: Tue Jan 12 16:58:17 2016 -0600 ---------------------------------------------------------------------- storm-core/pom.xml | 2 +- .../src/main/java/org/apache/storm/hack/StormShadeRequest.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/ab11ce97/storm-core/pom.xml ---------------------------------------------------------------------- diff --git a/storm-core/pom.xml b/storm-core/pom.xml index 6534a85..f6e529a 100644 --- a/storm-core/pom.xml +++ b/storm-core/pom.xml @@ -618,7 +618,7 @@ <relocation> <pattern>org.apache.thrift</pattern> <!-- This pattern is inconsistent for backwards compatibility purposes. --> - <shadedPattern>org.apache.thrift7</shadedPattern> + <shadedPattern>org.apache.storm.thrift</shadedPattern> </relocation> <relocation> <pattern>org.jboss.netty</pattern> http://git-wip-us.apache.org/repos/asf/storm/blob/ab11ce97/storm-rename-hack/src/main/java/org/apache/storm/hack/StormShadeRequest.java ---------------------------------------------------------------------- diff --git a/storm-rename-hack/src/main/java/org/apache/storm/hack/StormShadeRequest.java b/storm-rename-hack/src/main/java/org/apache/storm/hack/StormShadeRequest.java index ee63244..03d60b7 100644 --- a/storm-rename-hack/src/main/java/org/apache/storm/hack/StormShadeRequest.java +++ b/storm-rename-hack/src/main/java/org/apache/storm/hack/StormShadeRequest.java @@ -30,7 +30,8 @@ public class StormShadeRequest { ShadeRequest request = new ShadeRequest(); request.setRelocators(Arrays.asList( (Relocator)new SimpleRelocator("backtype.storm", "org.apache.storm"), - (Relocator)new SimpleRelocator("storm.trident", "org.apache.storm.trident") + (Relocator)new SimpleRelocator("storm.trident", "org.apache.storm.trident"), + (Relocator)new SimpleRelocator("org.apache.thrift7", "org.apache.storm.thrift") )); request.setResourceTransformers(Arrays.asList( (ResourceTransformer)new ClojureTransformer()
