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 <[email protected]> Authored: Mon Nov 27 14:08:39 2017 -0800 Committer: Peter Johnson <[email protected]> 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();
