[2/2] usergrid git commit: Remove dependency conflicts Upgrade jersey from 2.1 to 2.25.1 to avoid a fasterxml-jackson conflict Upgrade google.cloud.storage to avoid a netty conflict Upgrade antlr to 3

2017-11-29 Thread mdunker
Remove dependency conflicts Upgrade jersey from 2.1 to 2.25.1 to avoid a fasterxml-jackson conflict Upgrade google.cloud.storage to avoid a netty conflict Upgrade antlr to 3.5.2 to have a one common version. Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-u

[1/2] usergrid git commit: Fix dependency conflict between two version of netty used by pushy and ES

2017-11-29 Thread mdunker
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/2