Repository: usergrid Updated Branches: refs/heads/3.0.0_experimental 356251723 -> a9281016b
Fix netty and jackson dependency problems Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/03366d47 Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/03366d47 Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/03366d47 Branch: refs/heads/3.0.0_experimental Commit: 03366d4745993ac7f05c74341f18490287600848 Parents: 3562517 Author: Peter Johnson <[email protected]> Authored: Sun Nov 26 18:56:19 2017 -0800 Committer: Peter Johnson <[email protected]> Committed: Sun Nov 26 18:56:19 2017 -0800 ---------------------------------------------------------------------- stack/core/pom.xml | 2 +- stack/corepersistence/collection/pom.xml | 2 +- stack/corepersistence/common/pom.xml | 4 ++-- stack/pom.xml | 4 ++-- stack/services/pom.xml | 2 +- .../org/apache/usergrid/management/export/ExportServiceImpl.java | 3 +-- stack/test-utils/pom.xml | 2 +- 7 files changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/usergrid/blob/03366d47/stack/core/pom.xml ---------------------------------------------------------------------- diff --git a/stack/core/pom.xml b/stack/core/pom.xml index 658320e..713ca60 100644 --- a/stack/core/pom.xml +++ b/stack/core/pom.xml @@ -133,7 +133,7 @@ <artifactId>lz4</artifactId> </exclusion> <exclusion> - <artifactId>netty-all</artifactId> + <artifactId>*</artifactId> <groupId>io.netty</groupId> </exclusion> </exclusions> http://git-wip-us.apache.org/repos/asf/usergrid/blob/03366d47/stack/corepersistence/collection/pom.xml ---------------------------------------------------------------------- diff --git a/stack/corepersistence/collection/pom.xml b/stack/corepersistence/collection/pom.xml index 5e4f365..b059b1a 100644 --- a/stack/corepersistence/collection/pom.xml +++ b/stack/corepersistence/collection/pom.xml @@ -41,7 +41,7 @@ <version>${project.version}</version> <exclusions> <exclusion> - <artifactId>netty-all</artifactId> + <artifactId>*</artifactId> <groupId>io.netty</groupId> </exclusion> </exclusions> http://git-wip-us.apache.org/repos/asf/usergrid/blob/03366d47/stack/corepersistence/common/pom.xml ---------------------------------------------------------------------- diff --git a/stack/corepersistence/common/pom.xml b/stack/corepersistence/common/pom.xml index e1b0430..546d8fc 100644 --- a/stack/corepersistence/common/pom.xml +++ b/stack/corepersistence/common/pom.xml @@ -77,7 +77,7 @@ <artifactId>lz4</artifactId> </exclusion> <exclusion> - <artifactId>netty-all</artifactId> + <artifactId>*</artifactId> <groupId>io.netty</groupId> </exclusion> <exclusion> @@ -219,7 +219,7 @@ <exclusions> <exclusion> <groupId>io.netty</groupId> - <artifactId>netty-all</artifactId> + <artifactId>*</artifactId> </exclusion> </exclusions> </dependency> http://git-wip-us.apache.org/repos/asf/usergrid/blob/03366d47/stack/pom.xml ---------------------------------------------------------------------- diff --git a/stack/pom.xml b/stack/pom.xml index c98c72d..f93cd23 100644 --- a/stack/pom.xml +++ b/stack/pom.xml @@ -108,7 +108,7 @@ <hector-test-version>1.1-4</hector-test-version> <jacoco.version>0.7.5.201505241946</jacoco.version> <jackson-version>1.9.9</jackson-version> - <jackson-2-version>2.3.3</jackson-2-version> + <jackson-2-version>2.8.6</jackson-2-version> <jclouds.version>1.9.0</jclouds.version> <jersey-version>2.21</jersey-version> <junit-version>4.12</junit-version> @@ -352,7 +352,7 @@ <exclusions> <exclusion> - <artifactId>netty-all</artifactId> + <artifactId>*</artifactId> <groupId>io.netty</groupId> </exclusion> <exclusion> http://git-wip-us.apache.org/repos/asf/usergrid/blob/03366d47/stack/services/pom.xml ---------------------------------------------------------------------- diff --git a/stack/services/pom.xml b/stack/services/pom.xml index 29fa311..a60579b 100644 --- a/stack/services/pom.xml +++ b/stack/services/pom.xml @@ -302,7 +302,7 @@ <artifactId>jclouds-netty</artifactId> <exclusions> <exclusion> - <artifactId>netty-all</artifactId> + <artifactId>*</artifactId> <groupId>io.netty</groupId> </exclusion> </exclusions> http://git-wip-us.apache.org/repos/asf/usergrid/blob/03366d47/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java ---------------------------------------------------------------------- diff --git a/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java b/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java index eadc925..ca9ccfe 100644 --- a/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java +++ b/stack/services/src/main/java/org/apache/usergrid/management/export/ExportServiceImpl.java @@ -527,8 +527,7 @@ public class ExportServiceImpl implements ExportService { protected JsonGenerator getJsonGenerator( File ephermal ) throws IOException { //TODO:shouldn't the below be UTF-16? - - JsonGenerator jg = jsonFactory.createJsonGenerator( ephermal, JsonEncoding.UTF8 ); + JsonGenerator jg = jsonFactory.createGenerator( ephermal, JsonEncoding.UTF8 ); jg.setPrettyPrinter( new DefaultPrettyPrinter( ) ); jg.setCodec( new ObjectMapper() ); return jg; http://git-wip-us.apache.org/repos/asf/usergrid/blob/03366d47/stack/test-utils/pom.xml ---------------------------------------------------------------------- diff --git a/stack/test-utils/pom.xml b/stack/test-utils/pom.xml index f99d43a..e396b67 100644 --- a/stack/test-utils/pom.xml +++ b/stack/test-utils/pom.xml @@ -106,7 +106,7 @@ <artifactId>lz4</artifactId> </exclusion> <exclusion> - <artifactId>netty-all</artifactId> + <artifactId>*</artifactId> <groupId>io.netty</groupId> </exclusion> </exclusions>
