Repository: usergrid Updated Branches: refs/heads/3.0.0_experimental a9281016b -> ae14dc911
Fix dependency conflict between two version of netty used by pushy and ES Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/298c70f4 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/298c70f4 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/298c70f4 Branch: refs/heads/3.0.0_experimental Commit: 298c70f4489d858dafdb1afc4dbb9e52539f8b0e Parents: a928101 Author: Peter Johnson <[email protected]> Authored: Wed Nov 29 14:40:40 2017 -0800 Committer: Peter Johnson <[email protected]> Committed: Wed Nov 29 14:40:40 2017 -0800 ---------------------------------------------------------------------- stack/pom.xml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/298c70f4/stack/pom.xml ---------------------------------------------------------------------- diff --git a/stack/pom.xml b/stack/pom.xml index f93cd23..53e3732 100644 --- a/stack/pom.xml +++ b/stack/pom.xml @@ -1240,7 +1240,18 @@ <groupId>com.relayrides</groupId> <artifactId>pushy</artifactId> <!-- The sha in the version is the git commit used in this build. Check out the pushy source, then this commit to build the library locally --> - <version>0.4</version> + <version>0.5.2</version> + <!-- pushy 0.5.2 uses netty 4.1.0.CR2 where as ES uses 4.1.13 we need to keep major version the same--> + <exclusions> + <exclusion> + <groupId>io.netty</groupId> + <artifactId>*</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>*</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>
