Repository: incubator-streams Updated Branches: refs/heads/master 8073c7d20 -> b7d47c0bf
STREAMS-500: Remove jackson-datatype-json-org from project Remove jackson-datatype-json-org from project Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/a460c8e4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/a460c8e4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/a460c8e4 Branch: refs/heads/master Commit: a460c8e4b0bce3d3acea38829593301108f586a8 Parents: 19caf33 Author: Steve Blackmon @steveblackmon <sblack...@apache.org> Authored: Mon Apr 3 16:03:53 2017 -0500 Committer: Steve Blackmon @steveblackmon <sblack...@apache.org> Committed: Mon Apr 3 16:03:53 2017 -0500 ---------------------------------------------------------------------- pom.xml | 5 ----- .../processor/DatumFromMetadataAsDocumentProcessor.java | 2 -- .../elasticsearch/processor/DocumentToMetadataProcessor.java | 2 -- .../elasticsearch/processor/MetadataFromDocumentProcessor.java | 2 -- .../streams/jackson/CleanAdditionalPropertiesProcessor.java | 2 -- .../main/java/org/apache/streams/json/JsonPathExtractor.java | 2 -- .../src/main/java/org/apache/streams/json/JsonPathFilter.java | 3 --- streams-contrib/streams-provider-moreover/pom.xml | 4 ---- streams-core/pom.xml | 5 ----- 9 files changed, 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/a460c8e4/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e83dab2..f5c6280 100644 --- a/pom.xml +++ b/pom.xml @@ -1120,11 +1120,6 @@ <version>${jackson.version}</version> </dependency> <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-json-org</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> <groupId>com.fasterxml</groupId> <artifactId>aalto-xml</artifactId> <version>${aalto.version}</version> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/a460c8e4/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DatumFromMetadataAsDocumentProcessor.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DatumFromMetadataAsDocumentProcessor.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DatumFromMetadataAsDocumentProcessor.java index 1b988f5..d025e14 100644 --- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DatumFromMetadataAsDocumentProcessor.java +++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DatumFromMetadataAsDocumentProcessor.java @@ -29,7 +29,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule; import com.typesafe.config.Config; import org.elasticsearch.action.get.GetRequestBuilder; import org.elasticsearch.action.get.GetResponse; @@ -117,7 +116,6 @@ public class DatumFromMetadataAsDocumentProcessor implements StreamsProcessor, S public void prepare(Object configurationObject) { this.elasticsearchClientManager = ElasticsearchClientManager.getInstance(config); mapper = StreamsJacksonMapper.getInstance(); - mapper.registerModule(new JsonOrgModule()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/a460c8e4/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DocumentToMetadataProcessor.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DocumentToMetadataProcessor.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DocumentToMetadataProcessor.java index 105c453..f1dc04a 100644 --- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DocumentToMetadataProcessor.java +++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/DocumentToMetadataProcessor.java @@ -25,7 +25,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -87,7 +86,6 @@ public class DocumentToMetadataProcessor implements StreamsProcessor, Serializab @Override public void prepare(Object configurationObject) { mapper = StreamsJacksonMapper.getInstance(); - mapper.registerModule(new JsonOrgModule()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/a460c8e4/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/MetadataFromDocumentProcessor.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/MetadataFromDocumentProcessor.java b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/MetadataFromDocumentProcessor.java index 1260d20..4bed3d4 100644 --- a/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/MetadataFromDocumentProcessor.java +++ b/streams-contrib/streams-persist-elasticsearch/src/main/java/org/apache/streams/elasticsearch/processor/MetadataFromDocumentProcessor.java @@ -24,7 +24,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -121,7 +120,6 @@ public class MetadataFromDocumentProcessor implements StreamsProcessor, Serializ @Override public void prepare(Object configurationObject) { mapper = StreamsJacksonMapper.getInstance(); - mapper.registerModule(new JsonOrgModule()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/a460c8e4/streams-contrib/streams-processor-jackson/src/main/java/org/apache/streams/jackson/CleanAdditionalPropertiesProcessor.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-processor-jackson/src/main/java/org/apache/streams/jackson/CleanAdditionalPropertiesProcessor.java b/streams-contrib/streams-processor-jackson/src/main/java/org/apache/streams/jackson/CleanAdditionalPropertiesProcessor.java index 718e0f3..21a1d49 100644 --- a/streams-contrib/streams-processor-jackson/src/main/java/org/apache/streams/jackson/CleanAdditionalPropertiesProcessor.java +++ b/streams-contrib/streams-processor-jackson/src/main/java/org/apache/streams/jackson/CleanAdditionalPropertiesProcessor.java @@ -25,7 +25,6 @@ import org.apache.streams.core.StreamsProcessor; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -67,7 +66,6 @@ public class CleanAdditionalPropertiesProcessor implements StreamsProcessor { @Override public void prepare(Object configurationObject) { this.mapper = StreamsJacksonMapper.getInstance(); - this.mapper.registerModule(new JsonOrgModule()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/a460c8e4/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathExtractor.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathExtractor.java b/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathExtractor.java index cbe2424..d72d794 100644 --- a/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathExtractor.java +++ b/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathExtractor.java @@ -25,7 +25,6 @@ import org.apache.streams.jackson.StreamsJacksonMapper; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule; import com.jayway.jsonpath.JsonPath; import net.minidev.json.JSONArray; import net.minidev.json.JSONObject; @@ -143,7 +142,6 @@ public class JsonPathExtractor implements StreamsProcessor { } else if ( configurationObject instanceof String[] ) { jsonPath = JsonPath.compile(((String[]) (configurationObject))[0]); } - mapper.registerModule(new JsonOrgModule()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/a460c8e4/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathFilter.java ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathFilter.java b/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathFilter.java index dfeb8a2..1e3a5bf 100644 --- a/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathFilter.java +++ b/streams-contrib/streams-processor-json/src/main/java/org/apache/streams/json/JsonPathFilter.java @@ -28,7 +28,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; -import com.fasterxml.jackson.datatype.jsonorg.JsonOrgModule; import com.jayway.jsonpath.JsonPath; import net.minidev.json.JSONArray; import net.minidev.json.JSONObject; @@ -165,8 +164,6 @@ public class JsonPathFilter implements StreamsProcessor { jsonPath = JsonPath.compile(pathExpression); destNodeName = pathExpression.substring(pathExpression.lastIndexOf(".") + 1); } - - mapper.registerModule(new JsonOrgModule()); } @Override http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/a460c8e4/streams-contrib/streams-provider-moreover/pom.xml ---------------------------------------------------------------------- diff --git a/streams-contrib/streams-provider-moreover/pom.xml b/streams-contrib/streams-provider-moreover/pom.xml index 0d8b6b6..de9a1a8 100644 --- a/streams-contrib/streams-provider-moreover/pom.xml +++ b/streams-contrib/streams-provider-moreover/pom.xml @@ -52,10 +52,6 @@ <artifactId>jackson-annotations</artifactId> </dependency> <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-json-org</artifactId> - </dependency> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/incubator-streams/blob/a460c8e4/streams-core/pom.xml ---------------------------------------------------------------------- diff --git a/streams-core/pom.xml b/streams-core/pom.xml index 1a6b403..29bd2cb 100644 --- a/streams-core/pom.xml +++ b/streams-core/pom.xml @@ -53,11 +53,6 @@ <artifactId>jackson-core</artifactId> </dependency> <dependency> - <groupId>com.fasterxml.jackson.datatype</groupId> - <artifactId>jackson-datatype-json-org</artifactId> - <version>${jackson.version}</version> - </dependency> - <dependency> <groupId>org.apache.streams</groupId> <artifactId>streams-pojo</artifactId> <version>${project.version}</version>
