You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by md...@apache.org on 2017/11/28 00:51:58 UTC
[1/2] usergrid git commit: Fix netty and jackson dependency problems
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 <pj...@apigee.com>
Authored: Sun Nov 26 18:56:19 2017 -0800
Committer: Peter Johnson <pj...@apigee.com>
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>
[2/2] usergrid git commit: Fix jackson dependency problems in tests
Posted by md...@apache.org.
Fix jackson dependency problems in tests
Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/a9281016
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/a9281016
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/a9281016
Branch: refs/heads/3.0.0_experimental
Commit: a9281016b5b81b19279da738d81eb149fd550b8e
Parents: 03366d4
Author: Peter Johnson <pj...@apigee.com>
Authored: Mon Nov 27 14:08:39 2017 -0800
Committer: Peter Johnson <pj...@apigee.com>
Committed: Mon Nov 27 15:31:29 2017 -0800
----------------------------------------------------------------------
stack/corepersistence/common/pom.xml | 17 +++++++++++++++++
stack/corepersistence/pom.xml | 2 +-
stack/rest/pom.xml | 6 ++++++
.../rest/test/resource/AbstractRestIT.java | 4 ----
.../java/org/apache/usergrid/tools/Export.java | 2 +-
5 files changed, 25 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a9281016/stack/corepersistence/common/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/common/pom.xml b/stack/corepersistence/common/pom.xml
index 546d8fc..9c2242a 100644
--- a/stack/corepersistence/common/pom.xml
+++ b/stack/corepersistence/common/pom.xml
@@ -231,8 +231,25 @@
<version>1.3.0</version>
</dependency>
+ <!-- Just the annotations; use this dependency if you want to attach annotations
+ to classes without connecting them to the code. -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson-2-version}</version>
+ </dependency>
+
+ <!-- databinding; ObjectMapper, JsonNode and related classes are here -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson-2-version}</version>
+ </dependency>
+
</dependencies>
+
+
<profiles>
<profile>
<id>jacoco</id>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a9281016/stack/corepersistence/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml
index ff09cf2..fc1074a 100644
--- a/stack/corepersistence/pom.xml
+++ b/stack/corepersistence/pom.xml
@@ -88,7 +88,7 @@ limitations under the License.
<guice.version>4.0-beta5</guice.version>
<guicyfig.version>3.2</guicyfig.version>
<hystrix.version>1.4.0</hystrix.version>
- <jackson-2-version>2.4.1</jackson-2-version>
+ <jackson-2-version>2.8.6</jackson-2-version>
<mockito.version>1.10.8</mockito.version>
<junit.version>4.11</junit.version>
<kryo-serializers.version>0.26</kryo-serializers.version>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a9281016/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index e7aa68a..400160b 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -310,6 +310,12 @@
<version>${jackson-2-version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.jaxrs</groupId>
+ <artifactId>jackson-jaxrs-base</artifactId>
+ <version>${jackson-2-version}</version>
+ </dependency>
+
<!-- for mocking the Apigee SSO Service -->
<dependency>
<groupId>org.mockito</groupId>
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a9281016/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/AbstractRestIT.java
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/AbstractRestIT.java b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/AbstractRestIT.java
index 4799b0c..4d9930c 100644
--- a/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/AbstractRestIT.java
+++ b/stack/rest/src/test/java/org/apache/usergrid/rest/test/resource/AbstractRestIT.java
@@ -19,7 +19,6 @@ package org.apache.usergrid.rest.test.resource;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.usergrid.cassandra.ClearShiroSubject;
import org.apache.usergrid.rest.TomcatRuntime;
import org.apache.usergrid.rest.test.resource.endpoints.ApplicationsResource;
import org.apache.usergrid.rest.test.resource.endpoints.NamedResource;
@@ -30,15 +29,12 @@ import org.apache.usergrid.rest.test.resource.model.Token;
import org.apache.usergrid.rest.test.resource.state.ClientContext;
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.jackson.JacksonFeature;
-import org.glassfish.jersey.test.DeploymentContext;
import org.glassfish.jersey.test.JerseyTest;
-import org.glassfish.jersey.test.external.ExternalTestContainerFactory;
import org.glassfish.jersey.test.spi.TestContainer;
import org.glassfish.jersey.test.spi.TestContainerFactory;
import org.junit.Rule;
import javax.ws.rs.ClientErrorException;
-import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Application;
import java.net.URI;
import java.net.URISyntaxException;
http://git-wip-us.apache.org/repos/asf/usergrid/blob/a9281016/stack/tools/src/main/java/org/apache/usergrid/tools/Export.java
----------------------------------------------------------------------
diff --git a/stack/tools/src/main/java/org/apache/usergrid/tools/Export.java b/stack/tools/src/main/java/org/apache/usergrid/tools/Export.java
index 821d011..99e43cb 100644
--- a/stack/tools/src/main/java/org/apache/usergrid/tools/Export.java
+++ b/stack/tools/src/main/java/org/apache/usergrid/tools/Export.java
@@ -403,7 +403,7 @@ public class Export extends ExportingToolBase {
JsonFactory jsonFactory = new JsonFactory();
// or, for data binding,
// org.codehaus.jackson.mapper.MappingJsonFactory
- JsonGenerator jg = jsonFactory.createJsonGenerator( file, JsonEncoding.UTF8 );
+ JsonGenerator jg = jsonFactory.createGenerator( file, JsonEncoding.UTF8 );
// or Stream, Reader
jg.writeStartArray();