Repository: oozie Updated Branches: refs/heads/master cb52b495f -> 797da0198
OOZIE-3172 Upgrade non-transitive Jackson dependencies from org.codehaus.jackson to com.fasterxml.jackson (andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/797da019 Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/797da019 Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/797da019 Branch: refs/heads/master Commit: 797da019821f1eb043d343ba206f6f5568e33260 Parents: cb52b49 Author: Andras Piros <andras.pi...@cloudera.com> Authored: Wed Feb 14 11:03:45 2018 -0300 Committer: Andras Piros <andras.pi...@cloudera.com> Committed: Wed Feb 14 11:03:45 2018 -0300 ---------------------------------------------------------------------- client/pom.xml | 15 +++++++++------ .../org/apache/oozie/client/OozieClient.java | 4 ++-- .../event/jms/JSONMessageDeserializer.java | 6 +++--- .../event/message/CoordinatorActionMessage.java | 4 ++-- .../client/event/message/EventMessage.java | 5 +---- .../oozie/client/event/message/JobMessage.java | 6 +++--- .../oozie/client/event/message/SLAMessage.java | 7 +++---- .../event/message/WorkflowJobMessage.java | 4 ++-- .../event/messaging/MessageSerializer.java | 3 ++- .../oozie/util/FixedJsonInstanceSerializer.java | 20 ++++++++++---------- .../java/org/apache/oozie/util/TestZKUtils.java | 3 +-- minitest/pom.xml | 15 +++++++++------ pom.xml | 16 +++++++++++----- release-log.txt | 1 + sharelib/oozie/pom.xml | 6 ++++++ .../oozie/action/hadoop/TestPasswordMasker.java | 2 +- 16 files changed, 66 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 3b67d12..31cd43f 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -57,17 +57,20 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> <scope>compile</scope> </dependency> - <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> <scope>compile</scope> </dependency> - <dependency> <groupId>org.apache.activemq</groupId> <artifactId>activemq-client</artifactId> http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/client/src/main/java/org/apache/oozie/client/OozieClient.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/OozieClient.java b/client/src/main/java/org/apache/oozie/client/OozieClient.java index e581e50..4c81756 100644 --- a/client/src/main/java/org/apache/oozie/client/OozieClient.java +++ b/client/src/main/java/org/apache/oozie/client/OozieClient.java @@ -18,6 +18,8 @@ package org.apache.oozie.client; +import com.fasterxml.jackson.core.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Lists; import org.apache.oozie.BuildInfo; import org.apache.oozie.cli.ValidationUtil; @@ -61,8 +63,6 @@ import java.util.Map.Entry; import java.util.Properties; import java.util.Set; import java.util.concurrent.Callable; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.type.TypeReference; /** http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/client/src/main/java/org/apache/oozie/client/event/jms/JSONMessageDeserializer.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/event/jms/JSONMessageDeserializer.java b/client/src/main/java/org/apache/oozie/client/event/jms/JSONMessageDeserializer.java index aad2407..b8dd415 100644 --- a/client/src/main/java/org/apache/oozie/client/event/jms/JSONMessageDeserializer.java +++ b/client/src/main/java/org/apache/oozie/client/event/jms/JSONMessageDeserializer.java @@ -18,9 +18,9 @@ package org.apache.oozie.client.event.jms; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; /** * Message deserializer to convert from JSON to java object @@ -30,7 +30,7 @@ public class JSONMessageDeserializer extends MessageDeserializer { static ObjectMapper mapper = new ObjectMapper(); // Thread-safe. static { - mapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); + mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); } @Override http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/client/src/main/java/org/apache/oozie/client/event/message/CoordinatorActionMessage.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/event/message/CoordinatorActionMessage.java b/client/src/main/java/org/apache/oozie/client/event/message/CoordinatorActionMessage.java index 19429ec..8166b23 100644 --- a/client/src/main/java/org/apache/oozie/client/event/message/CoordinatorActionMessage.java +++ b/client/src/main/java/org/apache/oozie/client/event/message/CoordinatorActionMessage.java @@ -20,11 +20,11 @@ package org.apache.oozie.client.event.message; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.apache.oozie.AppType; import org.apache.oozie.client.CoordinatorAction; import org.apache.oozie.client.event.JobEvent.EventStatus; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; /** * Class holding attributes related to Coordinator action message http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/client/src/main/java/org/apache/oozie/client/event/message/EventMessage.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/event/message/EventMessage.java b/client/src/main/java/org/apache/oozie/client/event/message/EventMessage.java index 1e392db..b4d1880 100644 --- a/client/src/main/java/org/apache/oozie/client/event/message/EventMessage.java +++ b/client/src/main/java/org/apache/oozie/client/event/message/EventMessage.java @@ -18,17 +18,14 @@ package org.apache.oozie.client.event.message; -import java.util.Map; - import javax.jms.JMSException; import javax.jms.Message; +import com.fasterxml.jackson.annotation.JsonIgnore; import org.apache.oozie.client.event.Event; import org.apache.oozie.client.event.Event.MessageType; -import org.apache.oozie.client.event.JobEvent.EventStatus; import org.apache.oozie.client.event.jms.JMSHeaderConstants; import org.apache.oozie.AppType; -import org.codehaus.jackson.annotate.JsonIgnore; /** * Base class which holds attributes for event message http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/client/src/main/java/org/apache/oozie/client/event/message/JobMessage.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/event/message/JobMessage.java b/client/src/main/java/org/apache/oozie/client/event/message/JobMessage.java index 4458075..c9645c2 100644 --- a/client/src/main/java/org/apache/oozie/client/event/message/JobMessage.java +++ b/client/src/main/java/org/apache/oozie/client/event/message/JobMessage.java @@ -25,14 +25,14 @@ import java.util.Map; import javax.jms.JMSException; import javax.jms.Message; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.apache.oozie.AppType; import org.apache.oozie.client.event.Event.MessageType; import org.apache.oozie.client.event.JobEvent.EventStatus; import org.apache.oozie.client.event.JobEvent; import org.apache.oozie.client.event.jms.JMSHeaderConstants; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; /** http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/client/src/main/java/org/apache/oozie/client/event/message/SLAMessage.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/event/message/SLAMessage.java b/client/src/main/java/org/apache/oozie/client/event/message/SLAMessage.java index 5462705..8b97fd1 100644 --- a/client/src/main/java/org/apache/oozie/client/event/message/SLAMessage.java +++ b/client/src/main/java/org/apache/oozie/client/event/message/SLAMessage.java @@ -23,14 +23,13 @@ import java.util.Date; import javax.jms.JMSException; import javax.jms.Message; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.apache.oozie.AppType; import org.apache.oozie.client.event.Event.MessageType; import org.apache.oozie.client.event.SLAEvent; import org.apache.oozie.client.event.jms.JMSHeaderConstants; -import org.apache.oozie.client.event.message.EventMessage; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL) public class SLAMessage extends EventMessage { http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/client/src/main/java/org/apache/oozie/client/event/message/WorkflowJobMessage.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/oozie/client/event/message/WorkflowJobMessage.java b/client/src/main/java/org/apache/oozie/client/event/message/WorkflowJobMessage.java index 90ced2e..e4ce940 100644 --- a/client/src/main/java/org/apache/oozie/client/event/message/WorkflowJobMessage.java +++ b/client/src/main/java/org/apache/oozie/client/event/message/WorkflowJobMessage.java @@ -20,11 +20,11 @@ package org.apache.oozie.client.event.message; import java.util.Date; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import org.apache.oozie.AppType; import org.apache.oozie.client.WorkflowJob; import org.apache.oozie.client.event.JobEvent.EventStatus; -import org.codehaus.jackson.annotate.JsonProperty; -import org.codehaus.jackson.map.annotate.JsonSerialize; /** * Class holding attributes related to a workflow job message http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/core/src/main/java/org/apache/oozie/event/messaging/MessageSerializer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/event/messaging/MessageSerializer.java b/core/src/main/java/org/apache/oozie/event/messaging/MessageSerializer.java index a3798b8..6d61057 100644 --- a/core/src/main/java/org/apache/oozie/event/messaging/MessageSerializer.java +++ b/core/src/main/java/org/apache/oozie/event/messaging/MessageSerializer.java @@ -18,7 +18,8 @@ package org.apache.oozie.event.messaging; -import org.codehaus.jackson.map.ObjectMapper; + +import com.fasterxml.jackson.databind.ObjectMapper; /** * Message Serializer to serialize the java object http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/core/src/main/java/org/apache/oozie/util/FixedJsonInstanceSerializer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/util/FixedJsonInstanceSerializer.java b/core/src/main/java/org/apache/oozie/util/FixedJsonInstanceSerializer.java index 4e6f794..f319fb9 100644 --- a/core/src/main/java/org/apache/oozie/util/FixedJsonInstanceSerializer.java +++ b/core/src/main/java/org/apache/oozie/util/FixedJsonInstanceSerializer.java @@ -23,12 +23,12 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.JsonParseException; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.JsonMappingException; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.core.JsonParseException; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Preconditions; import org.apache.curator.x.discovery.ServiceInstance; import org.apache.curator.x.discovery.ServiceInstanceBuilder; @@ -56,7 +56,7 @@ public class FixedJsonInstanceSerializer<T> implements InstanceSerializer<T> public FixedJsonInstanceSerializer(final Class<T> pPayloadClass, final ObjectMapper pMapper) { mPayloadClass = pPayloadClass; mMapper = pMapper; - mMapper.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, false); + mMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); } @Override @@ -70,20 +70,20 @@ public class FixedJsonInstanceSerializer<T> implements InstanceSerializer<T> private String getTextField(final JsonNode pNode, final String pFieldName) { Preconditions.checkNotNull(pNode); Preconditions.checkNotNull(pFieldName); - return pNode.get(pFieldName) != null ? pNode.get(pFieldName).getTextValue() : null; + return pNode.get(pFieldName) != null ? pNode.get(pFieldName).textValue() : null; } private Integer getIntegerField(final JsonNode pNode, final String pFieldName) { Preconditions.checkNotNull(pNode); Preconditions.checkNotNull(pFieldName); return (pNode.get(pFieldName) != null && pNode.get(pFieldName).isNumber()) ? pNode.get(pFieldName) - .getIntValue() : null; + .intValue() : null; } private Long getLongField(final JsonNode pNode, final String pFieldName) { Preconditions.checkNotNull(pNode); Preconditions.checkNotNull(pFieldName); - return (pNode.get(pFieldName) != null && pNode.get(pFieldName).isLong()) ? pNode.get(pFieldName).getLongValue() + return (pNode.get(pFieldName) != null && pNode.get(pFieldName).isLong()) ? pNode.get(pFieldName).longValue() : null; } @@ -93,7 +93,7 @@ public class FixedJsonInstanceSerializer<T> implements InstanceSerializer<T> Preconditions.checkNotNull(pFieldName); Preconditions.checkNotNull(pObjectClass); if (pNode.get(pFieldName) != null && pNode.get(pFieldName).isObject()) { - return mMapper.readValue(pNode.get(pFieldName), pObjectClass); + return mMapper.readValue(pNode.get(pFieldName).toString(), pObjectClass); } else { return null; } http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/core/src/test/java/org/apache/oozie/util/TestZKUtils.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/util/TestZKUtils.java b/core/src/test/java/org/apache/oozie/util/TestZKUtils.java index 4d1656e..530f5b9 100644 --- a/core/src/test/java/org/apache/oozie/util/TestZKUtils.java +++ b/core/src/test/java/org/apache/oozie/util/TestZKUtils.java @@ -88,11 +88,10 @@ public class TestZKUtils extends ZKXTestCase { assertEquals(ZK_ID, meta.getId()); assertEquals("servers", meta.getName()); Map<String, String> data = meta.getPayload(); - assertEquals(3, data.size()); + assertEquals(2, data.size()); assertEquals(ZK_ID, data.get("OOZIE_ID")); String url = ConfigUtils.getOozieURL(false); assertEquals(url, data.get("OOZIE_URL")); - assertEquals("java.util.HashMap", data.get("@class")); } finally { du.unregister(); http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/minitest/pom.xml ---------------------------------------------------------------------- diff --git a/minitest/pom.xml b/minitest/pom.xml index 82c27b6..220cdfd 100644 --- a/minitest/pom.xml +++ b/minitest/pom.xml @@ -46,15 +46,18 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> - <version>1.8.8</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> - <version>1.8.8</version> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7391059..274a047 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ <openjpa.version>2.4.2</openjpa.version> <xerces.version>2.11.0</xerces.version> <curator.version>2.5.0</curator.version> - <jackson.version>1.9.13</jackson.version> + <jackson.version>2.4.2</jackson.version> <log4j.version>1.2.17</log4j.version> <activemq.version>5.13.3</activemq.version> <httpcore.version>4.3.3</httpcore.version> @@ -295,14 +295,20 @@ </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-mapper-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-annotations</artifactId> <version>${jackson.version}</version> </dependency> <dependency> - <groupId>org.codehaus.jackson</groupId> - <artifactId>jackson-core-asl</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-core</artifactId> + <version>${jackson.version}</version> + </dependency> + + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> <version>${jackson.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index d7a6ed1..c58f6c4 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-3172 Upgrade non-transitive Jackson dependencies from org.codehaus.jackson to com.fasterxml.jackson (andras.piros) OOZIE-3173 Coordinator job with frequency using cron syntax creates only one action in catchup mode (andras.piros) OOZIE-3121 bump all maven plugins to latest versions (dbist13 via gezapeti) OOZIE-3163 Improve documentation rendering: use fluido skin and better config (hboutemy via andras.piros) http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/sharelib/oozie/pom.xml ---------------------------------------------------------------------- diff --git a/sharelib/oozie/pom.xml b/sharelib/oozie/pom.xml index e34f88f..4787612 100644 --- a/sharelib/oozie/pom.xml +++ b/sharelib/oozie/pom.xml @@ -67,6 +67,12 @@ <artifactId>mockito-all</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/oozie/blob/797da019/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestPasswordMasker.java ---------------------------------------------------------------------- diff --git a/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestPasswordMasker.java b/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestPasswordMasker.java index e362759..293f66a 100644 --- a/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestPasswordMasker.java +++ b/sharelib/oozie/src/test/java/org/apache/oozie/action/hadoop/TestPasswordMasker.java @@ -18,7 +18,7 @@ package org.apache.oozie.action.hadoop; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Before; import org.junit.Test;
