From 82c1177d043b0549bcf4c6b0aee10550dec49ac8 Mon Sep 17 00:00:00 2001 From: objectiser Date: Wed, 7 Jan 2015 17:02:09 +0000 Subject: [PATCH] RTGOV-639 Change from jackson 1.9 to fasterxml jackson 2.x --- content/acs-jee/pom.xml | 8 ++++---- content/acs-osgi/pom.xml | 8 ++++---- content/epn-jee/pom.xml | 8 ++++---- content/epn-osgi/pom.xml | 8 ++++---- content/services/call-trace-rests/pom.xml | 8 ++++---- integration/client/pom.xml | 8 ++++---- integration/switchyard/pom.xml | 8 ++++---- modules/active-queries/acs-epn/pom.xml | 8 ++++---- modules/active-queries/acs-loader-jee/pom.xml | 8 ++++---- .../active-queries/acs-loader-osgi/pom.xml | 8 ++++---- .../active-collection-infinispan/pom.xml | 8 ++++---- .../active-collection-jee/pom.xml | 8 ++++---- .../active-collection-rests/pom.xml | 8 ++++---- .../rest/RESTActiveCollectionServer.java | 2 +- .../active-collection-wss/pom.xml | 8 ++++---- .../ws/WSActiveCollectionServer.java | 2 +- .../active-queries/active-collection/pom.xml | 17 ++++++++++++---- .../AbstractActiveChangeListener.java | 2 +- .../collection/ActiveCollectionFactory.java | 2 +- .../collection/ActiveCollectionSource.java | 4 ++-- .../collection/predicate/Predicate.java | 6 +++--- .../collection/util/ActiveCollectionUtil.java | 11 +++++----- modules/activity-analysis/analytics/pom.xml | 12 +++++++---- .../rtgov/analytics/situation/Situation.java | 4 ++-- .../analytics/util/ServiceDefinitionUtil.java | 20 +++++++------------ .../rtgov/analytics/util/SituationUtil.java | 18 ++++------------- modules/activity-analysis/call-trace/pom.xml | 13 ++++++++---- .../rtgov/call/trace/model/TraceNode.java | 6 +++--- .../rtgov/call/trace/util/CallTraceUtil.java | 13 +++++------- modules/activity-analysis/reports-jee/pom.xml | 8 ++++---- .../reports-loader-jee/pom.xml | 8 ++++---- modules/activity-analysis/reports/pom.xml | 13 ++++++++---- .../rtgov/reports/ReportGenerator.java | 2 +- .../overlord/rtgov/reports/model/Section.java | 6 +++--- .../rtgov/reports/util/ReportsUtil.java | 15 ++++++-------- .../service-dependency-svg/pom.xml | 8 ++++---- .../service-dependency/pom.xml | 8 ++++---- .../situation-manager/pom.xml | 8 ++++---- .../situation-store-elasticsearch/pom.xml | 17 ++++++++++++++++ .../activity-server-jmsc/pom.xml | 8 ++++---- .../activity-server-restc/pom.xml | 8 ++++---- .../activity-server-rests/pom.xml | 8 ++++---- .../activity-store-elasticsearch/pom.xml | 8 ++++---- .../activity-store-jpa/pom.xml | 12 +++++++---- .../activity-store-mem/pom.xml | 8 ++++---- .../activity-management/activity/.gitignore | 1 + modules/activity-management/activity/pom.xml | 18 +++++++++++++---- .../rtgov/activity/model/ActivityType.java | 6 +++--- .../activity/model/soa/RPCActivityType.java | 2 +- .../activity/model/soa/RequestReceived.java | 2 +- .../rtgov/activity/model/soa/RequestSent.java | 2 +- .../activity/model/soa/ResponseReceived.java | 2 +- .../activity/model/soa/ResponseSent.java | 2 +- .../processor/ExpressionEvaluator.java | 6 +++--- .../processor/InformationTransformer.java | 6 +++--- .../activity/processor/ScriptEvaluator.java | 6 +++--- .../rtgov/activity/util/ActivityUtil.java | 16 ++++++--------- .../activity/util/ActivityValidatorUtil.java | 17 +++++++--------- .../util/InformationProcessorUtil.java | 17 +++++++--------- .../rtgov/activity/util/ActivityUtilTest.java | 3 ++- modules/common/rtgov-common/pom.xml | 13 ++++++++---- .../rtgov/common/service/Service.java | 2 +- modules/common/rtgov-elasticsearch/pom.xml | 13 ++++++++---- .../elasticsearch/ElasticsearchClient.java | 14 ++++++------- modules/common/rtgov-infinispan/pom.xml | 8 ++++---- .../epn-container-embedded/pom.xml | 8 ++++---- .../event-processor-network/epn-core/pom.xml | 8 ++++---- .../overlord/rtgov/epn/util/NetworkUtil.java | 9 ++++----- modules/event-processor/ep-core/pom.xml | 13 ++++++++---- .../org/overlord/rtgov/ep/EventProcessor.java | 4 ++-- .../java/org/overlord/rtgov/ep/Predicate.java | 2 +- .../overlord/rtgov/ep/EventProcessorTest.java | 2 +- modules/event-processor/ep-drools/pom.xml | 13 ++++++++---- .../rtgov/ep/drools/DroolsEventProcessor.java | 2 +- modules/event-processor/ep-jpa/pom.xml | 8 ++++---- .../event-processor/ep-keyvaluestore/pom.xml | 8 ++++---- modules/event-processor/ep-mail/pom.xml | 8 ++++---- modules/event-processor/ep-mvel/pom.xml | 8 ++++---- pom.xml | 7 +++++++ samples/jbossas/activityclient/pom.xml | 8 ++++---- .../activityclient/ActivityClient.java | 15 ++++++-------- samples/jbossas/policy/async-av/pom.xml | 8 ++++---- samples/jbossas/policy/async-epn/pom.xml | 8 ++++---- samples/jbossas/policy/sync/pom.xml | 8 ++++---- samples/jbossas/pom.xml | 4 ++-- samples/jbossas/sla/monitor/pom.xml | 8 ++++---- tests/with-rtgov/activity_server/pom.xml | 8 ++++---- tests/with-rtgov/calltrace/pom.xml | 8 ++++---- .../custom_events/custom_events_av/pom.xml | 8 ++++---- .../custom_events/custom_events_data/pom.xml | 8 ++++---- .../custom_events/custom_events_epn/pom.xml | 8 ++++---- .../custom_events_tester/pom.xml | 8 ++++---- .../JBossASCustomEventsResultsTest.java | 2 +- tests/with-rtgov/service_dependency/pom.xml | 8 ++++---- tests/with-rtgov/situation_manager/pom.xml | 8 ++++---- .../JBossASSituationManagerServiceTest.java | 2 +- tests/with-rtgov/sla_monitor/pom.xml | 8 ++++---- .../slamonitor/JBossASSLAMonitorTest.java | 2 +- .../activity-analysis/call-trace-rest/pom.xml | 14 ++++++++----- .../calltracerest/CallTraceRESTTest.java | 5 +++-- .../activity-server-rest/pom.xml | 10 +++++----- .../actsvrrest/ActivityServerRESTTest.java | 14 ++++++------- .../event-processor-network/ep-mail/pom.xml | 10 +++++----- .../jbossas/tests/ep/mail/EPMailTest.java | 4 ++-- .../test-network/pom.xml | 10 +++++----- .../epn/jbossas/jee/NetworkLoaderTest.java | 4 ++-- 106 files changed, 451 insertions(+), 402 deletions(-) diff --git a/content/acs-jee/pom.xml b/content/acs-jee/pom.xml index de1b5b9d..6920b991 100644 --- a/content/acs-jee/pom.xml +++ b/content/acs-jee/pom.xml @@ -54,13 +54,13 @@ test - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core test - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind test diff --git a/content/acs-osgi/pom.xml b/content/acs-osgi/pom.xml index 7c07c5fb..a8272ed4 100644 --- a/content/acs-osgi/pom.xml +++ b/content/acs-osgi/pom.xml @@ -54,13 +54,13 @@ test - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core test - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind test diff --git a/content/epn-jee/pom.xml b/content/epn-jee/pom.xml index 22641096..0cfaf0e8 100644 --- a/content/epn-jee/pom.xml +++ b/content/epn-jee/pom.xml @@ -44,13 +44,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/content/epn-osgi/pom.xml b/content/epn-osgi/pom.xml index ee38628d..1040d980 100644 --- a/content/epn-osgi/pom.xml +++ b/content/epn-osgi/pom.xml @@ -44,13 +44,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/content/services/call-trace-rests/pom.xml b/content/services/call-trace-rests/pom.xml index 85a5ab69..d6dc7e25 100644 --- a/content/services/call-trace-rests/pom.xml +++ b/content/services/call-trace-rests/pom.xml @@ -27,13 +27,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/integration/client/pom.xml b/integration/client/pom.xml index 3fd99b36..0ade89f3 100644 --- a/integration/client/pom.xml +++ b/integration/client/pom.xml @@ -39,13 +39,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/integration/switchyard/pom.xml b/integration/switchyard/pom.xml index f0ad3371..f3e24d3b 100644 --- a/integration/switchyard/pom.xml +++ b/integration/switchyard/pom.xml @@ -40,13 +40,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/active-queries/acs-epn/pom.xml b/modules/active-queries/acs-epn/pom.xml index 8b7e7e7f..fdf35555 100644 --- a/modules/active-queries/acs-epn/pom.xml +++ b/modules/active-queries/acs-epn/pom.xml @@ -31,13 +31,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/active-queries/acs-loader-jee/pom.xml b/modules/active-queries/acs-loader-jee/pom.xml index e23bf199..afd3d9f0 100644 --- a/modules/active-queries/acs-loader-jee/pom.xml +++ b/modules/active-queries/acs-loader-jee/pom.xml @@ -34,13 +34,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/active-queries/acs-loader-osgi/pom.xml b/modules/active-queries/acs-loader-osgi/pom.xml index a5f8752d..e909d04d 100644 --- a/modules/active-queries/acs-loader-osgi/pom.xml +++ b/modules/active-queries/acs-loader-osgi/pom.xml @@ -30,13 +30,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/active-queries/active-collection-infinispan/pom.xml b/modules/active-queries/active-collection-infinispan/pom.xml index 2ea6c4b4..bee15eb8 100644 --- a/modules/active-queries/active-collection-infinispan/pom.xml +++ b/modules/active-queries/active-collection-infinispan/pom.xml @@ -23,13 +23,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/active-queries/active-collection-jee/pom.xml b/modules/active-queries/active-collection-jee/pom.xml index a19abc79..04d7596a 100644 --- a/modules/active-queries/active-collection-jee/pom.xml +++ b/modules/active-queries/active-collection-jee/pom.xml @@ -23,13 +23,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/active-queries/active-collection-rests/pom.xml b/modules/active-queries/active-collection-rests/pom.xml index 625e0654..8e762649 100644 --- a/modules/active-queries/active-collection-rests/pom.xml +++ b/modules/active-queries/active-collection-rests/pom.xml @@ -43,13 +43,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/active-queries/active-collection-rests/src/main/java/org/overlord/rtgov/active/collection/rest/RESTActiveCollectionServer.java b/modules/active-queries/active-collection-rests/src/main/java/org/overlord/rtgov/active/collection/rest/RESTActiveCollectionServer.java index 90bea993..77d8c76d 100644 --- a/modules/active-queries/active-collection-rests/src/main/java/org/overlord/rtgov/active/collection/rest/RESTActiveCollectionServer.java +++ b/modules/active-queries/active-collection-rests/src/main/java/org/overlord/rtgov/active/collection/rest/RESTActiveCollectionServer.java @@ -18,7 +18,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.overlord.commons.services.ServiceRegistryUtil; import org.overlord.rtgov.active.collection.ActiveCollection; import org.overlord.rtgov.active.collection.ActiveCollectionManager; diff --git a/modules/active-queries/active-collection-wss/pom.xml b/modules/active-queries/active-collection-wss/pom.xml index 492c9599..158d1a1c 100644 --- a/modules/active-queries/active-collection-wss/pom.xml +++ b/modules/active-queries/active-collection-wss/pom.xml @@ -34,13 +34,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/active-queries/active-collection-wss/src/main/java/org/overlord/rtgov/active/collection/ws/WSActiveCollectionServer.java b/modules/active-queries/active-collection-wss/src/main/java/org/overlord/rtgov/active/collection/ws/WSActiveCollectionServer.java index d72b0328..43f23666 100644 --- a/modules/active-queries/active-collection-wss/src/main/java/org/overlord/rtgov/active/collection/ws/WSActiveCollectionServer.java +++ b/modules/active-queries/active-collection-wss/src/main/java/org/overlord/rtgov/active/collection/ws/WSActiveCollectionServer.java @@ -18,7 +18,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.overlord.commons.services.ServiceRegistryUtil; import org.overlord.rtgov.active.collection.command.ActiveChangeNotification; import org.overlord.rtgov.active.collection.command.ActiveChangeNotification.ActiveChangeType; diff --git a/modules/active-queries/active-collection/pom.xml b/modules/active-queries/active-collection/pom.xml index d4d7dee7..1eecefb3 100644 --- a/modules/active-queries/active-collection/pom.xml +++ b/modules/active-queries/active-collection/pom.xml @@ -23,12 +23,16 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations @@ -58,6 +62,11 @@ org.osgi.compendium provided + + + org.overlord + overlord-commons-config + junit junit diff --git a/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/AbstractActiveChangeListener.java b/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/AbstractActiveChangeListener.java index e5174014..ac9f7ca9 100644 --- a/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/AbstractActiveChangeListener.java +++ b/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/AbstractActiveChangeListener.java @@ -15,7 +15,7 @@ */ package org.overlord.rtgov.active.collection; -import org.codehaus.jackson.annotate.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeInfo; /** * This class defines an abstract active change listener. The diff --git a/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/ActiveCollectionFactory.java b/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/ActiveCollectionFactory.java index 951a4459..c92e533e 100644 --- a/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/ActiveCollectionFactory.java +++ b/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/ActiveCollectionFactory.java @@ -15,7 +15,7 @@ */ package org.overlord.rtgov.active.collection; -import org.codehaus.jackson.annotate.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeInfo; /** * This class represents a factory for creating active collections. diff --git a/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/ActiveCollectionSource.java b/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/ActiveCollectionSource.java index 9c31e0d8..76da2449 100644 --- a/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/ActiveCollectionSource.java +++ b/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/ActiveCollectionSource.java @@ -20,8 +20,8 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import org.mvel2.MVEL; import org.overlord.rtgov.active.collection.predicate.Predicate; diff --git a/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/predicate/Predicate.java b/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/predicate/Predicate.java index 63679a80..636aed8b 100644 --- a/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/predicate/Predicate.java +++ b/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/predicate/Predicate.java @@ -15,9 +15,9 @@ */ package org.overlord.rtgov.active.collection.predicate; -import org.codehaus.jackson.annotate.JsonSubTypes; -import org.codehaus.jackson.annotate.JsonTypeInfo; -import org.codehaus.jackson.annotate.JsonSubTypes.Type; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import org.overlord.rtgov.active.collection.ActiveCollectionContext; /** diff --git a/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/util/ActiveCollectionUtil.java b/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/util/ActiveCollectionUtil.java index 0ddb39ef..cf0d2b8c 100644 --- a/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/util/ActiveCollectionUtil.java +++ b/modules/active-queries/active-collection/src/main/java/org/overlord/rtgov/active/collection/util/ActiveCollectionUtil.java @@ -15,9 +15,10 @@ */ package org.overlord.rtgov.active.collection.util; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.core.type.TypeReference; + import org.overlord.rtgov.active.collection.ActiveCollectionSource; import org.overlord.rtgov.active.collection.QuerySpec; @@ -34,9 +35,7 @@ public final class ActiveCollectionUtil { new TypeReference>() { }; static { - SerializationConfig config=MAPPER.getSerializationConfig().with(SerializationConfig.Feature.INDENT_OUTPUT); - - MAPPER.setSerializationConfig(config); + MAPPER.enable(SerializationFeature.INDENT_OUTPUT); } /** diff --git a/modules/activity-analysis/analytics/pom.xml b/modules/activity-analysis/analytics/pom.xml index 42c70388..446f08d5 100644 --- a/modules/activity-analysis/analytics/pom.xml +++ b/modules/activity-analysis/analytics/pom.xml @@ -19,12 +19,16 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations diff --git a/modules/activity-analysis/analytics/src/main/java/org/overlord/rtgov/analytics/situation/Situation.java b/modules/activity-analysis/analytics/src/main/java/org/overlord/rtgov/analytics/situation/Situation.java index 51d4da7b..50e0cd97 100644 --- a/modules/activity-analysis/analytics/src/main/java/org/overlord/rtgov/analytics/situation/Situation.java +++ b/modules/activity-analysis/analytics/src/main/java/org/overlord/rtgov/analytics/situation/Situation.java @@ -32,8 +32,8 @@ import javax.persistence.Table; import javax.persistence.Transient; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import org.overlord.rtgov.activity.model.ActivityTypeId; import org.overlord.rtgov.activity.model.Context; diff --git a/modules/activity-analysis/analytics/src/main/java/org/overlord/rtgov/analytics/util/ServiceDefinitionUtil.java b/modules/activity-analysis/analytics/src/main/java/org/overlord/rtgov/analytics/util/ServiceDefinitionUtil.java index af69e6e8..f0235a09 100644 --- a/modules/activity-analysis/analytics/src/main/java/org/overlord/rtgov/analytics/util/ServiceDefinitionUtil.java +++ b/modules/activity-analysis/analytics/src/main/java/org/overlord/rtgov/analytics/util/ServiceDefinitionUtil.java @@ -18,11 +18,10 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.DeserializationConfig.Feature; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; + import org.overlord.rtgov.activity.model.ActivityType; import org.overlord.rtgov.activity.model.ActivityTypeId; import org.overlord.rtgov.activity.model.ActivityUnit; @@ -55,15 +54,10 @@ public final class ServiceDefinitionUtil { private static final ObjectMapper MAPPER=new ObjectMapper(); static { - SerializationConfig config=MAPPER.getSerializationConfig() - .withSerializationInclusion(JsonSerialize.Inclusion.NON_NULL) - .withSerializationInclusion(JsonSerialize.Inclusion.NON_DEFAULT); - - DeserializationConfig config2=MAPPER.getDeserializationConfig() - .without(Feature.FAIL_ON_UNKNOWN_PROPERTIES); + MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL); + MAPPER.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT); - MAPPER.setSerializationConfig(config); - MAPPER.setDeserializationConfig(config2); + MAPPER.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); } /** diff --git a/modules/activity-analysis/analytics/src/main/java/org/overlord/rtgov/analytics/util/SituationUtil.java b/modules/activity-analysis/analytics/src/main/java/org/overlord/rtgov/analytics/util/SituationUtil.java index 10ad87fd..9f4262bc 100644 --- a/modules/activity-analysis/analytics/src/main/java/org/overlord/rtgov/analytics/util/SituationUtil.java +++ b/modules/activity-analysis/analytics/src/main/java/org/overlord/rtgov/analytics/util/SituationUtil.java @@ -15,11 +15,9 @@ */ package org.overlord.rtgov.analytics.util; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.DeserializationConfig.Feature; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; + import org.overlord.rtgov.analytics.situation.IgnoreSubject; import org.overlord.rtgov.analytics.situation.Situation; @@ -32,15 +30,7 @@ public final class SituationUtil { private static final ObjectMapper MAPPER=new ObjectMapper(); static { - SerializationConfig config=MAPPER.getSerializationConfig() - .withSerializationInclusion(JsonSerialize.Inclusion.NON_NULL) - .withSerializationInclusion(JsonSerialize.Inclusion.NON_DEFAULT); - - DeserializationConfig config2=MAPPER.getDeserializationConfig() - .without(Feature.FAIL_ON_UNKNOWN_PROPERTIES); - - MAPPER.setSerializationConfig(config); - MAPPER.setDeserializationConfig(config2); + MAPPER.enable(SerializationFeature.INDENT_OUTPUT); } /** diff --git a/modules/activity-analysis/call-trace/pom.xml b/modules/activity-analysis/call-trace/pom.xml index 04712178..a1a143a1 100644 --- a/modules/activity-analysis/call-trace/pom.xml +++ b/modules/activity-analysis/call-trace/pom.xml @@ -19,13 +19,18 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind + provided + + + com.fasterxml.jackson.core + jackson-annotations provided diff --git a/modules/activity-analysis/call-trace/src/main/java/org/overlord/rtgov/call/trace/model/TraceNode.java b/modules/activity-analysis/call-trace/src/main/java/org/overlord/rtgov/call/trace/model/TraceNode.java index dc86c135..83ce0cdf 100644 --- a/modules/activity-analysis/call-trace/src/main/java/org/overlord/rtgov/call/trace/model/TraceNode.java +++ b/modules/activity-analysis/call-trace/src/main/java/org/overlord/rtgov/call/trace/model/TraceNode.java @@ -15,9 +15,9 @@ */ package org.overlord.rtgov.call.trace.model; -import org.codehaus.jackson.annotate.JsonSubTypes; -import org.codehaus.jackson.annotate.JsonTypeInfo; -import org.codehaus.jackson.annotate.JsonSubTypes.Type; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonSubTypes.Type; /** * This abstract base class represents a node in the call diff --git a/modules/activity-analysis/call-trace/src/main/java/org/overlord/rtgov/call/trace/util/CallTraceUtil.java b/modules/activity-analysis/call-trace/src/main/java/org/overlord/rtgov/call/trace/util/CallTraceUtil.java index 1bf91c9f..2a8ef9ac 100644 --- a/modules/activity-analysis/call-trace/src/main/java/org/overlord/rtgov/call/trace/util/CallTraceUtil.java +++ b/modules/activity-analysis/call-trace/src/main/java/org/overlord/rtgov/call/trace/util/CallTraceUtil.java @@ -17,9 +17,9 @@ import java.beans.PropertyDescriptor; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; -import org.codehaus.jackson.map.annotate.JsonSerialize; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.ObjectMapper; + import org.overlord.rtgov.call.trace.model.CallTrace; /** @@ -32,11 +32,8 @@ public final class CallTraceUtil { private static final ObjectMapper MAPPER=new ObjectMapper(); static { - SerializationConfig config=MAPPER.getSerializationConfig() - .withSerializationInclusion(JsonSerialize.Inclusion.NON_NULL) - .withSerializationInclusion(JsonSerialize.Inclusion.NON_DEFAULT); - - MAPPER.setSerializationConfig(config); + MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL); + MAPPER.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT); } /** diff --git a/modules/activity-analysis/reports-jee/pom.xml b/modules/activity-analysis/reports-jee/pom.xml index 769ca652..9f0d96d0 100644 --- a/modules/activity-analysis/reports-jee/pom.xml +++ b/modules/activity-analysis/reports-jee/pom.xml @@ -33,13 +33,13 @@ provided - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/activity-analysis/reports-loader-jee/pom.xml b/modules/activity-analysis/reports-loader-jee/pom.xml index cf43c61c..3d901d14 100644 --- a/modules/activity-analysis/reports-loader-jee/pom.xml +++ b/modules/activity-analysis/reports-loader-jee/pom.xml @@ -24,13 +24,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/activity-analysis/reports/pom.xml b/modules/activity-analysis/reports/pom.xml index 327691be..87662cd1 100644 --- a/modules/activity-analysis/reports/pom.xml +++ b/modules/activity-analysis/reports/pom.xml @@ -32,13 +32,18 @@ provided - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind + provided + + + com.fasterxml.jackson.core + jackson-annotations provided diff --git a/modules/activity-analysis/reports/src/main/java/org/overlord/rtgov/reports/ReportGenerator.java b/modules/activity-analysis/reports/src/main/java/org/overlord/rtgov/reports/ReportGenerator.java index 35a77832..884b21fc 100644 --- a/modules/activity-analysis/reports/src/main/java/org/overlord/rtgov/reports/ReportGenerator.java +++ b/modules/activity-analysis/reports/src/main/java/org/overlord/rtgov/reports/ReportGenerator.java @@ -15,7 +15,7 @@ */ package org.overlord.rtgov.reports; -import org.codehaus.jackson.annotate.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import org.overlord.rtgov.reports.model.Report; /** diff --git a/modules/activity-analysis/reports/src/main/java/org/overlord/rtgov/reports/model/Section.java b/modules/activity-analysis/reports/src/main/java/org/overlord/rtgov/reports/model/Section.java index 853feeba..de345c95 100644 --- a/modules/activity-analysis/reports/src/main/java/org/overlord/rtgov/reports/model/Section.java +++ b/modules/activity-analysis/reports/src/main/java/org/overlord/rtgov/reports/model/Section.java @@ -15,9 +15,9 @@ */ package org.overlord.rtgov.reports.model; -import org.codehaus.jackson.annotate.JsonSubTypes; -import org.codehaus.jackson.annotate.JsonTypeInfo; -import org.codehaus.jackson.annotate.JsonSubTypes.Type; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonSubTypes.Type; /** * This class represents a section within the report. diff --git a/modules/activity-analysis/reports/src/main/java/org/overlord/rtgov/reports/util/ReportsUtil.java b/modules/activity-analysis/reports/src/main/java/org/overlord/rtgov/reports/util/ReportsUtil.java index b3a00b9f..5760009f 100644 --- a/modules/activity-analysis/reports/src/main/java/org/overlord/rtgov/reports/util/ReportsUtil.java +++ b/modules/activity-analysis/reports/src/main/java/org/overlord/rtgov/reports/util/ReportsUtil.java @@ -15,10 +15,10 @@ */ package org.overlord.rtgov.reports.util; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.type.TypeReference; + import org.overlord.rtgov.reports.ReportDefinition; import org.overlord.rtgov.reports.model.Calendar; import org.overlord.rtgov.reports.model.Report; @@ -35,11 +35,8 @@ public final class ReportsUtil { new TypeReference>() { }; static { - SerializationConfig config=MAPPER.getSerializationConfig() - .withSerializationInclusion(JsonSerialize.Inclusion.NON_NULL) - .withSerializationInclusion(JsonSerialize.Inclusion.NON_DEFAULT); - - MAPPER.setSerializationConfig(config); + MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL); + MAPPER.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT); } /** diff --git a/modules/activity-analysis/service-dependency-svg/pom.xml b/modules/activity-analysis/service-dependency-svg/pom.xml index 2552acca..b24e76fe 100644 --- a/modules/activity-analysis/service-dependency-svg/pom.xml +++ b/modules/activity-analysis/service-dependency-svg/pom.xml @@ -28,13 +28,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core test - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind test diff --git a/modules/activity-analysis/service-dependency/pom.xml b/modules/activity-analysis/service-dependency/pom.xml index 873ff6bd..c1b0acbc 100644 --- a/modules/activity-analysis/service-dependency/pom.xml +++ b/modules/activity-analysis/service-dependency/pom.xml @@ -28,13 +28,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core test - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind test diff --git a/modules/activity-analysis/situation-manager/pom.xml b/modules/activity-analysis/situation-manager/pom.xml index f99f8bc7..bd513227 100644 --- a/modules/activity-analysis/situation-manager/pom.xml +++ b/modules/activity-analysis/situation-manager/pom.xml @@ -23,13 +23,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/activity-analysis/situation-store-elasticsearch/pom.xml b/modules/activity-analysis/situation-store-elasticsearch/pom.xml index c43729be..4c8d09b3 100644 --- a/modules/activity-analysis/situation-store-elasticsearch/pom.xml +++ b/modules/activity-analysis/situation-store-elasticsearch/pom.xml @@ -45,6 +45,17 @@ provided + + com.fasterxml.jackson.core + jackson-core + provided + + + com.fasterxml.jackson.core + jackson-databind + provided + + org.elasticsearch elasticsearch @@ -67,6 +78,12 @@ commons-io test + + + org.overlord + overlord-commons-config + test + junit junit diff --git a/modules/activity-management/activity-server-jmsc/pom.xml b/modules/activity-management/activity-server-jmsc/pom.xml index a80febf8..6f35e4ba 100644 --- a/modules/activity-management/activity-server-jmsc/pom.xml +++ b/modules/activity-management/activity-server-jmsc/pom.xml @@ -19,13 +19,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/activity-management/activity-server-restc/pom.xml b/modules/activity-management/activity-server-restc/pom.xml index 1b781bf9..04fa6e8f 100644 --- a/modules/activity-management/activity-server-restc/pom.xml +++ b/modules/activity-management/activity-server-restc/pom.xml @@ -23,13 +23,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/activity-management/activity-server-rests/pom.xml b/modules/activity-management/activity-server-rests/pom.xml index 31d48487..59964307 100644 --- a/modules/activity-management/activity-server-rests/pom.xml +++ b/modules/activity-management/activity-server-rests/pom.xml @@ -27,13 +27,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/activity-management/activity-store-elasticsearch/pom.xml b/modules/activity-management/activity-store-elasticsearch/pom.xml index 46b0a96f..2e6100ba 100644 --- a/modules/activity-management/activity-store-elasticsearch/pom.xml +++ b/modules/activity-management/activity-store-elasticsearch/pom.xml @@ -31,13 +31,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/activity-management/activity-store-jpa/pom.xml b/modules/activity-management/activity-store-jpa/pom.xml index 7f2f4aa4..3855b504 100644 --- a/modules/activity-management/activity-store-jpa/pom.xml +++ b/modules/activity-management/activity-store-jpa/pom.xml @@ -27,13 +27,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided @@ -70,6 +70,10 @@ provided + + org.overlord + overlord-commons-config + junit junit diff --git a/modules/activity-management/activity-store-mem/pom.xml b/modules/activity-management/activity-store-mem/pom.xml index aab9cca4..14979ff8 100644 --- a/modules/activity-management/activity-store-mem/pom.xml +++ b/modules/activity-management/activity-store-mem/pom.xml @@ -25,13 +25,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/activity-management/activity/.gitignore b/modules/activity-management/activity/.gitignore index ea8c4bf7..29546b56 100644 --- a/modules/activity-management/activity/.gitignore +++ b/modules/activity-management/activity/.gitignore @@ -1 +1,2 @@ /target +/target/ diff --git a/modules/activity-management/activity/pom.xml b/modules/activity-management/activity/pom.xml index 34c0a6ea..1d8fa39d 100644 --- a/modules/activity-management/activity/pom.xml +++ b/modules/activity-management/activity/pom.xml @@ -32,12 +32,16 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.core + jackson-annotations @@ -82,6 +86,12 @@ org.osgi.compendium provided + + + org.overlord + overlord-commons-config + test + junit junit diff --git a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/ActivityType.java b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/ActivityType.java index 678e6a8c..339327ec 100644 --- a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/ActivityType.java +++ b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/ActivityType.java @@ -34,9 +34,9 @@ import javax.persistence.DiscriminatorType; import javax.persistence.Table; -import org.codehaus.jackson.annotate.JsonSubTypes; -import org.codehaus.jackson.annotate.JsonSubTypes.Type; -import org.codehaus.jackson.annotate.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonSubTypes.Type; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import org.overlord.rtgov.activity.model.app.CustomActivity; import org.overlord.rtgov.activity.model.app.LogMessage; import org.overlord.rtgov.activity.model.bpm.ProcessCompleted; diff --git a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/RPCActivityType.java b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/RPCActivityType.java index fb082588..96b5be1d 100644 --- a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/RPCActivityType.java +++ b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/RPCActivityType.java @@ -22,7 +22,7 @@ import javax.persistence.Entity; import javax.persistence.Transient; -import org.codehaus.jackson.annotate.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; import org.overlord.rtgov.activity.model.Context; import org.overlord.rtgov.activity.model.common.MessageExchange; diff --git a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/RequestReceived.java b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/RequestReceived.java index 158a4994..1c3b5469 100644 --- a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/RequestReceived.java +++ b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/RequestReceived.java @@ -22,7 +22,7 @@ import javax.persistence.Entity; import javax.persistence.Transient; -import org.codehaus.jackson.annotate.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; /** * This activity type represents a received request. diff --git a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/RequestSent.java b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/RequestSent.java index cbb85313..fdcc4cc0 100644 --- a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/RequestSent.java +++ b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/RequestSent.java @@ -22,7 +22,7 @@ import javax.persistence.Entity; import javax.persistence.Transient; -import org.codehaus.jackson.annotate.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; /** * This activity type represents a sent request. diff --git a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/ResponseReceived.java b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/ResponseReceived.java index fae15507..1703cb0f 100644 --- a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/ResponseReceived.java +++ b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/ResponseReceived.java @@ -22,7 +22,7 @@ import javax.persistence.Entity; import javax.persistence.Transient; -import org.codehaus.jackson.annotate.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; /** * This activity type represents a received request. diff --git a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/ResponseSent.java b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/ResponseSent.java index 6cdb6465..4d3314af 100644 --- a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/ResponseSent.java +++ b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/model/soa/ResponseSent.java @@ -22,7 +22,7 @@ import javax.persistence.Entity; import javax.persistence.Transient; -import org.codehaus.jackson.annotate.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; /** * This activity type represents a sent request. diff --git a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/processor/ExpressionEvaluator.java b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/processor/ExpressionEvaluator.java index 56e91bde..4e63edf6 100644 --- a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/processor/ExpressionEvaluator.java +++ b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/processor/ExpressionEvaluator.java @@ -15,9 +15,9 @@ */ package org.overlord.rtgov.activity.processor; -import org.codehaus.jackson.annotate.JsonSubTypes; -import org.codehaus.jackson.annotate.JsonTypeInfo; -import org.codehaus.jackson.annotate.JsonSubTypes.Type; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import org.overlord.rtgov.activity.processor.mvel.MVELExpressionEvaluator; import org.overlord.rtgov.activity.processor.xpath.XPathExpressionEvaluator; diff --git a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/processor/InformationTransformer.java b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/processor/InformationTransformer.java index 98bc853d..49969d55 100644 --- a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/processor/InformationTransformer.java +++ b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/processor/InformationTransformer.java @@ -15,9 +15,9 @@ */ package org.overlord.rtgov.activity.processor; -import org.codehaus.jackson.annotate.JsonSubTypes; -import org.codehaus.jackson.annotate.JsonTypeInfo; -import org.codehaus.jackson.annotate.JsonSubTypes.Type; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import org.overlord.rtgov.activity.model.ActivityType; import org.overlord.rtgov.activity.processor.mvel.MVELInformationTransformer; diff --git a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/processor/ScriptEvaluator.java b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/processor/ScriptEvaluator.java index cc54f8b1..8dc9731c 100644 --- a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/processor/ScriptEvaluator.java +++ b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/processor/ScriptEvaluator.java @@ -15,9 +15,9 @@ */ package org.overlord.rtgov.activity.processor; -import org.codehaus.jackson.annotate.JsonSubTypes; -import org.codehaus.jackson.annotate.JsonTypeInfo; -import org.codehaus.jackson.annotate.JsonSubTypes.Type; +import com.fasterxml.jackson.annotation.JsonSubTypes; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonSubTypes.Type; import org.overlord.rtgov.activity.model.ActivityType; import org.overlord.rtgov.activity.processor.mvel.MVELScriptEvaluator; diff --git a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/util/ActivityUtil.java b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/util/ActivityUtil.java index fc26bf5d..3626e0b9 100644 --- a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/util/ActivityUtil.java +++ b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/util/ActivityUtil.java @@ -15,11 +15,10 @@ */ package org.overlord.rtgov.activity.util; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.ObjectWriter; -import org.codehaus.jackson.map.SerializationConfig; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectWriter; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.type.TypeReference; import org.overlord.rtgov.activity.model.ActivityType; import org.overlord.rtgov.activity.model.ActivityUnit; import org.overlord.rtgov.activity.server.QuerySpec; @@ -41,11 +40,8 @@ public final class ActivityUtil { private static ObjectWriter ATLIST_WRITER=null; static { - SerializationConfig config=MAPPER.getSerializationConfig() - .withSerializationInclusion(JsonSerialize.Inclusion.NON_NULL) - .withSerializationInclusion(JsonSerialize.Inclusion.NON_DEFAULT); - - MAPPER.setSerializationConfig(config); + MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL); + MAPPER.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT); ATLIST_WRITER = MAPPER.writerWithType(ACTIVITY_TYPE_LIST); } diff --git a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/util/ActivityValidatorUtil.java b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/util/ActivityValidatorUtil.java index 91725d9d..64daf764 100644 --- a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/util/ActivityValidatorUtil.java +++ b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/util/ActivityValidatorUtil.java @@ -15,11 +15,11 @@ */ package org.overlord.rtgov.activity.util; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.ObjectWriter; -import org.codehaus.jackson.map.SerializationConfig; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectWriter; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.type.TypeReference; + import org.overlord.rtgov.activity.validator.ActivityValidator; /** @@ -36,11 +36,8 @@ public final class ActivityValidatorUtil { private static ObjectWriter AILIST_WRITER=null; static { - SerializationConfig config=MAPPER.getSerializationConfig() - .withSerializationInclusion(JsonSerialize.Inclusion.NON_NULL) - .withSerializationInclusion(JsonSerialize.Inclusion.NON_DEFAULT); - - MAPPER.setSerializationConfig(config); + MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL); + MAPPER.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT); AILIST_WRITER = MAPPER.writerWithType(ACTIVITY_VALIDATOR_LIST); } diff --git a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/util/InformationProcessorUtil.java b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/util/InformationProcessorUtil.java index 85b5ad14..7843b270 100644 --- a/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/util/InformationProcessorUtil.java +++ b/modules/activity-management/activity/src/main/java/org/overlord/rtgov/activity/util/InformationProcessorUtil.java @@ -15,11 +15,11 @@ */ package org.overlord.rtgov.activity.util; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.ObjectWriter; -import org.codehaus.jackson.map.SerializationConfig; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectWriter; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.type.TypeReference; + import org.overlord.rtgov.activity.processor.InformationProcessor; /** @@ -37,11 +37,8 @@ public final class InformationProcessorUtil { private static ObjectWriter IPLIST_WRITER=null; static { - SerializationConfig config=MAPPER.getSerializationConfig() - .withSerializationInclusion(JsonSerialize.Inclusion.NON_NULL) - .withSerializationInclusion(JsonSerialize.Inclusion.NON_DEFAULT); - - MAPPER.setSerializationConfig(config); + MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL); + MAPPER.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT); IPLIST_WRITER = MAPPER.writerWithType(INFORMATION_PROCESSOR_LIST); } diff --git a/modules/activity-management/activity/src/test/java/org/overlord/rtgov/activity/util/ActivityUtilTest.java b/modules/activity-management/activity/src/test/java/org/overlord/rtgov/activity/util/ActivityUtilTest.java index eb50b053..e54b88d9 100644 --- a/modules/activity-management/activity/src/test/java/org/overlord/rtgov/activity/util/ActivityUtilTest.java +++ b/modules/activity-management/activity/src/test/java/org/overlord/rtgov/activity/util/ActivityUtilTest.java @@ -17,7 +17,6 @@ import static org.junit.Assert.*; -import org.codehaus.jackson.JsonNode; import org.junit.Test; import org.overlord.rtgov.activity.model.ActivityUnit; import org.overlord.rtgov.activity.model.Context; @@ -26,6 +25,8 @@ import org.overlord.rtgov.activity.model.soa.ResponseReceived; import org.overlord.rtgov.activity.util.ActivityUtil; +import com.fasterxml.jackson.databind.JsonNode; + public class ActivityUtilTest { public ActivityUnit createTestActivityUnit(String id) { diff --git a/modules/common/rtgov-common/pom.xml b/modules/common/rtgov-common/pom.xml index f4887bf4..8009ef60 100644 --- a/modules/common/rtgov-common/pom.xml +++ b/modules/common/rtgov-common/pom.xml @@ -31,13 +31,18 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind + provided + + + com.fasterxml.jackson.core + jackson-annotations provided diff --git a/modules/common/rtgov-common/src/main/java/org/overlord/rtgov/common/service/Service.java b/modules/common/rtgov-common/src/main/java/org/overlord/rtgov/common/service/Service.java index b4e56645..fcda6776 100644 --- a/modules/common/rtgov-common/src/main/java/org/overlord/rtgov/common/service/Service.java +++ b/modules/common/rtgov-common/src/main/java/org/overlord/rtgov/common/service/Service.java @@ -18,7 +18,7 @@ import javax.annotation.PostConstruct; import javax.annotation.PreDestroy; -import org.codehaus.jackson.annotate.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeInfo; /** * This abstract class defines a service that is available to diff --git a/modules/common/rtgov-elasticsearch/pom.xml b/modules/common/rtgov-elasticsearch/pom.xml index bc9247a3..2cebcb02 100644 --- a/modules/common/rtgov-elasticsearch/pom.xml +++ b/modules/common/rtgov-elasticsearch/pom.xml @@ -43,13 +43,18 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind + provided + + + com.fasterxml.jackson.core + jackson-annotations provided diff --git a/modules/common/rtgov-elasticsearch/src/main/java/org/overlord/rtgov/common/elasticsearch/ElasticsearchClient.java b/modules/common/rtgov-elasticsearch/src/main/java/org/overlord/rtgov/common/elasticsearch/ElasticsearchClient.java index 876e3542..87f47966 100644 --- a/modules/common/rtgov-elasticsearch/src/main/java/org/overlord/rtgov/common/elasticsearch/ElasticsearchClient.java +++ b/modules/common/rtgov-elasticsearch/src/main/java/org/overlord/rtgov/common/elasticsearch/ElasticsearchClient.java @@ -16,9 +16,10 @@ package org.overlord.rtgov.common.elasticsearch; import org.apache.commons.io.IOUtils; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; -import org.codehaus.jackson.map.annotate.JsonSerialize; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.databind.ObjectMapper; + import org.elasticsearch.action.admin.indices.create.CreateIndexRequestBuilder; import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse; import org.elasticsearch.action.admin.indices.mapping.put.PutMappingRequestBuilder; @@ -56,11 +57,8 @@ public class ElasticsearchClient { protected static final ObjectMapper MAPPER = new ObjectMapper(); static { - SerializationConfig config = MAPPER.getSerializationConfig() - .withSerializationInclusion(JsonSerialize.Inclusion.NON_NULL) - .withSerializationInclusion(JsonSerialize.Inclusion.NON_DEFAULT); - - MAPPER.setSerializationConfig(config); + MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL); + MAPPER.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT); } /** diff --git a/modules/common/rtgov-infinispan/pom.xml b/modules/common/rtgov-infinispan/pom.xml index b9238cf1..ffd13983 100644 --- a/modules/common/rtgov-infinispan/pom.xml +++ b/modules/common/rtgov-infinispan/pom.xml @@ -19,13 +19,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/event-processor-network/epn-container-embedded/pom.xml b/modules/event-processor-network/epn-container-embedded/pom.xml index ffc529a6..8474c338 100644 --- a/modules/event-processor-network/epn-container-embedded/pom.xml +++ b/modules/event-processor-network/epn-container-embedded/pom.xml @@ -27,13 +27,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/event-processor-network/epn-core/pom.xml b/modules/event-processor-network/epn-core/pom.xml index a69150d6..7128d095 100644 --- a/modules/event-processor-network/epn-core/pom.xml +++ b/modules/event-processor-network/epn-core/pom.xml @@ -30,13 +30,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/event-processor-network/epn-core/src/main/java/org/overlord/rtgov/epn/util/NetworkUtil.java b/modules/event-processor-network/epn-core/src/main/java/org/overlord/rtgov/epn/util/NetworkUtil.java index dcf09b2c..8a4f9928 100644 --- a/modules/event-processor-network/epn-core/src/main/java/org/overlord/rtgov/epn/util/NetworkUtil.java +++ b/modules/event-processor-network/epn-core/src/main/java/org/overlord/rtgov/epn/util/NetworkUtil.java @@ -15,10 +15,11 @@ */ package org.overlord.rtgov.epn.util; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; import org.overlord.rtgov.epn.Network; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; + /** * This class provides utility functions for the EPN * model. @@ -29,9 +30,7 @@ public final class NetworkUtil { private static final ObjectMapper MAPPER=new ObjectMapper(); static { - SerializationConfig config=MAPPER.getSerializationConfig().with(SerializationConfig.Feature.INDENT_OUTPUT); - - MAPPER.setSerializationConfig(config); + MAPPER.enable(SerializationFeature.INDENT_OUTPUT); } /** diff --git a/modules/event-processor/ep-core/pom.xml b/modules/event-processor/ep-core/pom.xml index 91eb1efd..d8acefad 100644 --- a/modules/event-processor/ep-core/pom.xml +++ b/modules/event-processor/ep-core/pom.xml @@ -22,13 +22,18 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind + provided + + + com.fasterxml.jackson.core + jackson-annotations provided diff --git a/modules/event-processor/ep-core/src/main/java/org/overlord/rtgov/ep/EventProcessor.java b/modules/event-processor/ep-core/src/main/java/org/overlord/rtgov/ep/EventProcessor.java index 2891a6f0..8c5530de 100644 --- a/modules/event-processor/ep-core/src/main/java/org/overlord/rtgov/ep/EventProcessor.java +++ b/modules/event-processor/ep-core/src/main/java/org/overlord/rtgov/ep/EventProcessor.java @@ -15,8 +15,8 @@ */ package org.overlord.rtgov.ep; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonTypeInfo; import org.overlord.rtgov.common.service.Service; /** diff --git a/modules/event-processor/ep-core/src/main/java/org/overlord/rtgov/ep/Predicate.java b/modules/event-processor/ep-core/src/main/java/org/overlord/rtgov/ep/Predicate.java index e9ad0299..466896a0 100644 --- a/modules/event-processor/ep-core/src/main/java/org/overlord/rtgov/ep/Predicate.java +++ b/modules/event-processor/ep-core/src/main/java/org/overlord/rtgov/ep/Predicate.java @@ -15,7 +15,7 @@ */ package org.overlord.rtgov.ep; -import org.codehaus.jackson.annotate.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeInfo; /** * This class represents the predicate applied to an diff --git a/modules/event-processor/ep-core/src/test/java/org/overlord/rtgov/ep/EventProcessorTest.java b/modules/event-processor/ep-core/src/test/java/org/overlord/rtgov/ep/EventProcessorTest.java index 70d2bccf..1f54d965 100644 --- a/modules/event-processor/ep-core/src/test/java/org/overlord/rtgov/ep/EventProcessorTest.java +++ b/modules/event-processor/ep-core/src/test/java/org/overlord/rtgov/ep/EventProcessorTest.java @@ -21,7 +21,7 @@ import java.io.Serializable; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.Test; public class EventProcessorTest { diff --git a/modules/event-processor/ep-drools/pom.xml b/modules/event-processor/ep-drools/pom.xml index 36beb6a0..a95c4b3b 100644 --- a/modules/event-processor/ep-drools/pom.xml +++ b/modules/event-processor/ep-drools/pom.xml @@ -40,13 +40,18 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind + provided + + + com.fasterxml.jackson.core + jackson-annotations provided diff --git a/modules/event-processor/ep-drools/src/main/java/org/overlord/rtgov/ep/drools/DroolsEventProcessor.java b/modules/event-processor/ep-drools/src/main/java/org/overlord/rtgov/ep/drools/DroolsEventProcessor.java index d5629f96..794d2d70 100644 --- a/modules/event-processor/ep-drools/src/main/java/org/overlord/rtgov/ep/drools/DroolsEventProcessor.java +++ b/modules/event-processor/ep-drools/src/main/java/org/overlord/rtgov/ep/drools/DroolsEventProcessor.java @@ -19,7 +19,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import org.codehaus.jackson.annotate.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; import org.kie.api.KieBase; import org.kie.api.KieBaseConfiguration; import org.kie.api.KieServices; diff --git a/modules/event-processor/ep-jpa/pom.xml b/modules/event-processor/ep-jpa/pom.xml index 5e71ddcb..1f799a94 100644 --- a/modules/event-processor/ep-jpa/pom.xml +++ b/modules/event-processor/ep-jpa/pom.xml @@ -27,13 +27,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/event-processor/ep-keyvaluestore/pom.xml b/modules/event-processor/ep-keyvaluestore/pom.xml index 91d6fcba..8bc15af8 100644 --- a/modules/event-processor/ep-keyvaluestore/pom.xml +++ b/modules/event-processor/ep-keyvaluestore/pom.xml @@ -31,13 +31,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/event-processor/ep-mail/pom.xml b/modules/event-processor/ep-mail/pom.xml index b0ef7068..25f0b9ec 100644 --- a/modules/event-processor/ep-mail/pom.xml +++ b/modules/event-processor/ep-mail/pom.xml @@ -32,13 +32,13 @@ mail - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/modules/event-processor/ep-mvel/pom.xml b/modules/event-processor/ep-mvel/pom.xml index 3d7776e4..259b3a97 100644 --- a/modules/event-processor/ep-mvel/pom.xml +++ b/modules/event-processor/ep-mvel/pom.xml @@ -28,13 +28,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/pom.xml b/pom.xml index d9cdff70..d12cfb18 100644 --- a/pom.xml +++ b/pom.xml @@ -1278,6 +1278,13 @@ gwt-elemental ${version.com.google.gwt} + + + com.fasterxml.jackson.core + jackson-annotations + ${version.com.fasterxml.jackson} + + diff --git a/samples/jbossas/activityclient/pom.xml b/samples/jbossas/activityclient/pom.xml index d1c18edb..8c3d48aa 100644 --- a/samples/jbossas/activityclient/pom.xml +++ b/samples/jbossas/activityclient/pom.xml @@ -38,12 +38,12 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind commons-codec diff --git a/samples/jbossas/activityclient/src/main/java/org/overlord/rtgov/samples/jbossas/activityclient/ActivityClient.java b/samples/jbossas/activityclient/src/main/java/org/overlord/rtgov/samples/jbossas/activityclient/ActivityClient.java index 20cf432b..344a5b85 100644 --- a/samples/jbossas/activityclient/src/main/java/org/overlord/rtgov/samples/jbossas/activityclient/ActivityClient.java +++ b/samples/jbossas/activityclient/src/main/java/org/overlord/rtgov/samples/jbossas/activityclient/ActivityClient.java @@ -20,10 +20,10 @@ import javax.transaction.TransactionManager; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; -import org.codehaus.jackson.map.annotate.JsonSerialize; -import org.codehaus.jackson.type.TypeReference; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.core.type.TypeReference; + import org.overlord.rtgov.activity.collector.ActivityCollector; import org.overlord.rtgov.activity.collector.CollectorContext; import org.overlord.rtgov.activity.collector.activity.server.ActivityServerLogger; @@ -57,11 +57,8 @@ public class ActivityClient { private static final ObjectMapper MAPPER=new ObjectMapper(); static { - SerializationConfig config=MAPPER.getSerializationConfig() - .withSerializationInclusion(JsonSerialize.Inclusion.NON_NULL) - .withSerializationInclusion(JsonSerialize.Inclusion.NON_DEFAULT); - - MAPPER.setSerializationConfig(config); + MAPPER.setSerializationInclusion(JsonInclude.Include.NON_NULL); + MAPPER.setSerializationInclusion(JsonInclude.Include.NON_DEFAULT); } /** diff --git a/samples/jbossas/policy/async-av/pom.xml b/samples/jbossas/policy/async-av/pom.xml index faaba43a..77e3d394 100644 --- a/samples/jbossas/policy/async-av/pom.xml +++ b/samples/jbossas/policy/async-av/pom.xml @@ -77,13 +77,13 @@ test - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core test - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind test diff --git a/samples/jbossas/policy/async-epn/pom.xml b/samples/jbossas/policy/async-epn/pom.xml index b9bfcffc..a86c7b82 100644 --- a/samples/jbossas/policy/async-epn/pom.xml +++ b/samples/jbossas/policy/async-epn/pom.xml @@ -62,13 +62,13 @@ test - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core test - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind test diff --git a/samples/jbossas/policy/sync/pom.xml b/samples/jbossas/policy/sync/pom.xml index 6611f474..48856cbc 100644 --- a/samples/jbossas/policy/sync/pom.xml +++ b/samples/jbossas/policy/sync/pom.xml @@ -77,13 +77,13 @@ test - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core test - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind test diff --git a/samples/jbossas/pom.xml b/samples/jbossas/pom.xml index 060655a4..0e137b77 100644 --- a/samples/jbossas/pom.xml +++ b/samples/jbossas/pom.xml @@ -15,7 +15,7 @@ org.jboss.integration-platform jboss-integration-platform-parent - 6.0.0.CR12 + 6.0.0.CR14 @@ -72,7 +72,7 @@ org.jboss.integration-platform jboss-integration-platform-bom - 6.0.0.CR12 + 6.0.0.CR14 pom import diff --git a/samples/jbossas/sla/monitor/pom.xml b/samples/jbossas/sla/monitor/pom.xml index fa55f978..9dbbd479 100644 --- a/samples/jbossas/sla/monitor/pom.xml +++ b/samples/jbossas/sla/monitor/pom.xml @@ -25,13 +25,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/tests/with-rtgov/activity_server/pom.xml b/tests/with-rtgov/activity_server/pom.xml index d36d6e9d..dfc5b1a0 100644 --- a/tests/with-rtgov/activity_server/pom.xml +++ b/tests/with-rtgov/activity_server/pom.xml @@ -40,13 +40,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/tests/with-rtgov/calltrace/pom.xml b/tests/with-rtgov/calltrace/pom.xml index 8960c878..8483791f 100644 --- a/tests/with-rtgov/calltrace/pom.xml +++ b/tests/with-rtgov/calltrace/pom.xml @@ -46,13 +46,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/tests/with-rtgov/custom_events/custom_events_av/pom.xml b/tests/with-rtgov/custom_events/custom_events_av/pom.xml index ba7a7885..a57d4ad8 100644 --- a/tests/with-rtgov/custom_events/custom_events_av/pom.xml +++ b/tests/with-rtgov/custom_events/custom_events_av/pom.xml @@ -32,13 +32,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/tests/with-rtgov/custom_events/custom_events_data/pom.xml b/tests/with-rtgov/custom_events/custom_events_data/pom.xml index ff1e60be..7f5e89f2 100644 --- a/tests/with-rtgov/custom_events/custom_events_data/pom.xml +++ b/tests/with-rtgov/custom_events/custom_events_data/pom.xml @@ -19,13 +19,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/tests/with-rtgov/custom_events/custom_events_epn/pom.xml b/tests/with-rtgov/custom_events/custom_events_epn/pom.xml index 8d7ddfb6..80f269b3 100644 --- a/tests/with-rtgov/custom_events/custom_events_epn/pom.xml +++ b/tests/with-rtgov/custom_events/custom_events_epn/pom.xml @@ -37,13 +37,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/tests/with-rtgov/custom_events/custom_events_tester/pom.xml b/tests/with-rtgov/custom_events/custom_events_tester/pom.xml index c6b8f83b..058d4b76 100644 --- a/tests/with-rtgov/custom_events/custom_events_tester/pom.xml +++ b/tests/with-rtgov/custom_events/custom_events_tester/pom.xml @@ -47,13 +47,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core test - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind test diff --git a/tests/with-rtgov/custom_events/custom_events_tester/src/test/java/org/overlord/rtgov/tests/platforms/jbossas/customevents/JBossASCustomEventsResultsTest.java b/tests/with-rtgov/custom_events/custom_events_tester/src/test/java/org/overlord/rtgov/tests/platforms/jbossas/customevents/JBossASCustomEventsResultsTest.java index 62bb0d20..b83cd93b 100644 --- a/tests/with-rtgov/custom_events/custom_events_tester/src/test/java/org/overlord/rtgov/tests/platforms/jbossas/customevents/JBossASCustomEventsResultsTest.java +++ b/tests/with-rtgov/custom_events/custom_events_tester/src/test/java/org/overlord/rtgov/tests/platforms/jbossas/customevents/JBossASCustomEventsResultsTest.java @@ -23,7 +23,7 @@ import javax.xml.soap.SOAPConnectionFactory; import javax.xml.soap.SOAPMessage; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.junit.Arquillian; diff --git a/tests/with-rtgov/service_dependency/pom.xml b/tests/with-rtgov/service_dependency/pom.xml index 3ca3d622..6cf2560e 100644 --- a/tests/with-rtgov/service_dependency/pom.xml +++ b/tests/with-rtgov/service_dependency/pom.xml @@ -46,13 +46,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/tests/with-rtgov/situation_manager/pom.xml b/tests/with-rtgov/situation_manager/pom.xml index 0fb66fc4..0e909b72 100644 --- a/tests/with-rtgov/situation_manager/pom.xml +++ b/tests/with-rtgov/situation_manager/pom.xml @@ -45,13 +45,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/tests/with-rtgov/situation_manager/src/test/java/org/overlord/rtgov/tests/platforms/jbossas/situationmgr/JBossASSituationManagerServiceTest.java b/tests/with-rtgov/situation_manager/src/test/java/org/overlord/rtgov/tests/platforms/jbossas/situationmgr/JBossASSituationManagerServiceTest.java index f75f0c78..8f327d03 100644 --- a/tests/with-rtgov/situation_manager/src/test/java/org/overlord/rtgov/tests/platforms/jbossas/situationmgr/JBossASSituationManagerServiceTest.java +++ b/tests/with-rtgov/situation_manager/src/test/java/org/overlord/rtgov/tests/platforms/jbossas/situationmgr/JBossASSituationManagerServiceTest.java @@ -23,7 +23,7 @@ import javax.xml.soap.SOAPConnectionFactory; import javax.xml.soap.SOAPMessage; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.junit.Arquillian; diff --git a/tests/with-rtgov/sla_monitor/pom.xml b/tests/with-rtgov/sla_monitor/pom.xml index 4a47117f..d59fb2be 100644 --- a/tests/with-rtgov/sla_monitor/pom.xml +++ b/tests/with-rtgov/sla_monitor/pom.xml @@ -39,13 +39,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided diff --git a/tests/with-rtgov/sla_monitor/src/test/java/org/overlord/rtgov/tests/platforms/jbossas/slamonitor/JBossASSLAMonitorTest.java b/tests/with-rtgov/sla_monitor/src/test/java/org/overlord/rtgov/tests/platforms/jbossas/slamonitor/JBossASSLAMonitorTest.java index d7b2ef9f..9a9ce020 100644 --- a/tests/with-rtgov/sla_monitor/src/test/java/org/overlord/rtgov/tests/platforms/jbossas/slamonitor/JBossASSLAMonitorTest.java +++ b/tests/with-rtgov/sla_monitor/src/test/java/org/overlord/rtgov/tests/platforms/jbossas/slamonitor/JBossASSLAMonitorTest.java @@ -24,7 +24,7 @@ import javax.xml.soap.SOAPConnectionFactory; import javax.xml.soap.SOAPMessage; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.junit.Arquillian; diff --git a/tests/without-rtgov/activity-analysis/call-trace-rest/pom.xml b/tests/without-rtgov/activity-analysis/call-trace-rest/pom.xml index 83458e6c..d94babb5 100644 --- a/tests/without-rtgov/activity-analysis/call-trace-rest/pom.xml +++ b/tests/without-rtgov/activity-analysis/call-trace-rest/pom.xml @@ -56,15 +56,19 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided + + com.fasterxml.jackson.core + jackson-annotations + javax javaee-api @@ -134,7 +138,7 @@ jackson.version - ${version.org.codehaus.jackson} + ${version.com.fasterxml.jackson} commons-configuration.version diff --git a/tests/without-rtgov/activity-analysis/call-trace-rest/src/test/java/org/overlord/rtgov/tests/actanal/jbossas/calltracerest/CallTraceRESTTest.java b/tests/without-rtgov/activity-analysis/call-trace-rest/src/test/java/org/overlord/rtgov/tests/actanal/jbossas/calltracerest/CallTraceRESTTest.java index d4a65eeb..a92dec11 100644 --- a/tests/without-rtgov/activity-analysis/call-trace-rest/src/test/java/org/overlord/rtgov/tests/actanal/jbossas/calltracerest/CallTraceRESTTest.java +++ b/tests/without-rtgov/activity-analysis/call-trace-rest/src/test/java/org/overlord/rtgov/tests/actanal/jbossas/calltracerest/CallTraceRESTTest.java @@ -89,8 +89,9 @@ public static WebArchive createDeployment() { Maven.resolver().resolve("org.overlord.rtgov.content.services:call-trace-rests:"+rtgovversion).withoutTransitivity().asSingleFile(), Maven.resolver().resolve("org.overlord:overlord-commons-services:"+commonsversion).withoutTransitivity().asSingleFile(), //Maven.resolver().resolve("commons-configuration:commons-configuration:"+configversion).withoutTransitivity().asSingleFile(), - Maven.resolver().resolve("org.codehaus.jackson:jackson-core-asl:"+jacksonversion).withoutTransitivity().asSingleFile(), - Maven.resolver().resolve("org.codehaus.jackson:jackson-mapper-asl:"+jacksonversion).withoutTransitivity().asSingleFile() + Maven.resolver().resolve("com.fasterxml.jackson.core:jackson-core:"+jacksonversion).withoutTransitivity().asSingleFile(), + Maven.resolver().resolve("com.fasterxml.jackson.core:jackson-databind:"+jacksonversion).withoutTransitivity().asSingleFile(), + Maven.resolver().resolve("com.fasterxml.jackson.core:jackson-annotations:"+jacksonversion).withoutTransitivity().asSingleFile() ).addAsLibraries(Maven.resolver().resolve("org.overlord:overlord-commons-config:"+commonsversion).withTransitivity().asFile() ).addAsLibraries(Maven.resolver().resolve("commons-configuration:commons-configuration:"+configversion).withTransitivity().asFile() ).addAsLibraries(Maven.resolver().resolve("commons-lang:commons-lang:"+langversion).withTransitivity().asFile()); diff --git a/tests/without-rtgov/activity-management/activity-server-rest/pom.xml b/tests/without-rtgov/activity-management/activity-server-rest/pom.xml index 71ee5f76..16ceeed8 100644 --- a/tests/without-rtgov/activity-management/activity-server-rest/pom.xml +++ b/tests/without-rtgov/activity-management/activity-server-rest/pom.xml @@ -48,13 +48,13 @@ provided - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided @@ -114,7 +114,7 @@ jackson.version - ${version.org.codehaus.jackson} + ${version.com.fasterxml.jackson} mvel.version diff --git a/tests/without-rtgov/activity-management/activity-server-rest/src/test/java/org/overlord/rtgov/tests/actmgmt/jbossas/actsvrrest/ActivityServerRESTTest.java b/tests/without-rtgov/activity-management/activity-server-rest/src/test/java/org/overlord/rtgov/tests/actmgmt/jbossas/actsvrrest/ActivityServerRESTTest.java index 150c972a..836a8382 100644 --- a/tests/without-rtgov/activity-management/activity-server-rest/src/test/java/org/overlord/rtgov/tests/actmgmt/jbossas/actsvrrest/ActivityServerRESTTest.java +++ b/tests/without-rtgov/activity-management/activity-server-rest/src/test/java/org/overlord/rtgov/tests/actmgmt/jbossas/actsvrrest/ActivityServerRESTTest.java @@ -19,8 +19,9 @@ import java.net.URL; import java.util.Properties; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializationConfig; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; + import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.junit.Arquillian; import org.jboss.shrinkwrap.api.ShrinkWrap; @@ -48,9 +49,7 @@ public class ActivityServerRESTTest { private static final ObjectMapper MAPPER=new ObjectMapper(); static { - SerializationConfig config=MAPPER.getSerializationConfig().with(SerializationConfig.Feature.INDENT_OUTPUT); - - MAPPER.setSerializationConfig(config); + MAPPER.enable(SerializationFeature.INDENT_OUTPUT); } @Deployment @@ -73,8 +72,9 @@ public static WebArchive createDeployment() { Maven.resolver().resolve("org.overlord.rtgov.activity-management:activity-store-mem:"+rtgovversion).withoutTransitivity().asSingleFile(), Maven.resolver().resolve("org.overlord.rtgov.activity-management:activity-server-rests:"+rtgovversion).withoutTransitivity().asSingleFile(), Maven.resolver().resolve("commons-configuration:commons-configuration:"+configversion).withoutTransitivity().asSingleFile(), - Maven.resolver().resolve("org.codehaus.jackson:jackson-core-asl:"+jacksonversion).withoutTransitivity().asSingleFile(), - Maven.resolver().resolve("org.codehaus.jackson:jackson-mapper-asl:"+jacksonversion).withoutTransitivity().asSingleFile(), + Maven.resolver().resolve("com.fasterxml.jackson.core:jackson-core:"+jacksonversion).withoutTransitivity().asSingleFile(), + Maven.resolver().resolve("com.fasterxml.jackson.core:jackson-databind:"+jacksonversion).withoutTransitivity().asSingleFile(), + Maven.resolver().resolve("com.fasterxml.jackson.core:jackson-annotations:"+jacksonversion).withoutTransitivity().asSingleFile(), Maven.resolver().resolve("org.mvel:mvel2:"+mvelversion).withoutTransitivity().asSingleFile()) .addAsLibraries(Maven.resolver().resolve("org.overlord:overlord-commons-config:"+commonsversion).withTransitivity().asFile()) .addAsLibraries(Maven.resolver().resolve("org.overlord:overlord-commons-services:"+commonsversion).withTransitivity().asFile()); diff --git a/tests/without-rtgov/event-processor-network/ep-mail/pom.xml b/tests/without-rtgov/event-processor-network/ep-mail/pom.xml index cdd4cd66..c928fbdb 100644 --- a/tests/without-rtgov/event-processor-network/ep-mail/pom.xml +++ b/tests/without-rtgov/event-processor-network/ep-mail/pom.xml @@ -29,13 +29,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided @@ -96,7 +96,7 @@ jackson.version - ${jackson.version} + ${version.com.fasterxml.jackson} mvel.version diff --git a/tests/without-rtgov/event-processor-network/ep-mail/src/test/java/org/overlord/rtgov/jbossas/tests/ep/mail/EPMailTest.java b/tests/without-rtgov/event-processor-network/ep-mail/src/test/java/org/overlord/rtgov/jbossas/tests/ep/mail/EPMailTest.java index 8782e602..fb210f78 100644 --- a/tests/without-rtgov/event-processor-network/ep-mail/src/test/java/org/overlord/rtgov/jbossas/tests/ep/mail/EPMailTest.java +++ b/tests/without-rtgov/event-processor-network/ep-mail/src/test/java/org/overlord/rtgov/jbossas/tests/ep/mail/EPMailTest.java @@ -49,8 +49,8 @@ public static WebArchive createDeployment() { Maven.resolver().resolve("org.overlord.rtgov.event-processor:ep-core:"+rtgovversion).withoutTransitivity().asSingleFile(), Maven.resolver().resolve("org.overlord.rtgov.event-processor:ep-mail:"+rtgovversion).withoutTransitivity().asSingleFile(), Maven.resolver().resolve("org.mvel:mvel2:"+mvelversion).withoutTransitivity().asSingleFile(), - Maven.resolver().resolve("org.codehaus.jackson:jackson-core-asl:"+jacksonversion).withoutTransitivity().asSingleFile(), - Maven.resolver().resolve("org.codehaus.jackson:jackson-mapper-asl:"+jacksonversion).withoutTransitivity().asSingleFile() + Maven.resolver().resolve("com.fasterxml.jackson.core:jackson-core:"+jacksonversion).withoutTransitivity().asSingleFile(), + Maven.resolver().resolve("com.fasterxml.jackson.core:jackson-databind:"+jacksonversion).withoutTransitivity().asSingleFile() ) .addAsLibraries(Maven.resolver().resolve("org.overlord.rtgov.common:rtgov-common:"+rtgovversion).withTransitivity().asFile()); } diff --git a/tests/without-rtgov/event-processor-network/test-network/pom.xml b/tests/without-rtgov/event-processor-network/test-network/pom.xml index 06b3be0d..912e3c9c 100644 --- a/tests/without-rtgov/event-processor-network/test-network/pom.xml +++ b/tests/without-rtgov/event-processor-network/test-network/pom.xml @@ -29,13 +29,13 @@ - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-core provided - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind provided @@ -116,7 +116,7 @@ jackson.version - ${jackson.version} + ${version.com.fasterxml.jackson} diff --git a/tests/without-rtgov/event-processor-network/test-network/src/test/java/org/overlord/rtgov/tests/epn/jbossas/jee/NetworkLoaderTest.java b/tests/without-rtgov/event-processor-network/test-network/src/test/java/org/overlord/rtgov/tests/epn/jbossas/jee/NetworkLoaderTest.java index 4cacbfcd..e8dd001b 100644 --- a/tests/without-rtgov/event-processor-network/test-network/src/test/java/org/overlord/rtgov/tests/epn/jbossas/jee/NetworkLoaderTest.java +++ b/tests/without-rtgov/event-processor-network/test-network/src/test/java/org/overlord/rtgov/tests/epn/jbossas/jee/NetworkLoaderTest.java @@ -60,8 +60,8 @@ public static WebArchive createDeployment() { Maven.resolver().resolve("org.overlord.rtgov.event-processor:ep-core:"+rtgovversion).withoutTransitivity().asSingleFile(), Maven.resolver().resolve("org.overlord.rtgov.event-processor-network:epn-container-jee:"+rtgovversion).withoutTransitivity().asSingleFile(), Maven.resolver().resolve("org.overlord.rtgov.common:rtgov-common:"+rtgovversion).withoutTransitivity().asSingleFile(), - Maven.resolver().resolve("org.codehaus.jackson:jackson-core-asl:"+jacksonversion).withoutTransitivity().asSingleFile(), - Maven.resolver().resolve("org.codehaus.jackson:jackson-mapper-asl:"+jacksonversion).withoutTransitivity().asSingleFile() + Maven.resolver().resolve("com.fasterxml.jackson.core:jackson-core:"+jacksonversion).withoutTransitivity().asSingleFile(), + Maven.resolver().resolve("com.fasterxml.jackson.core:jackson-databind:"+jacksonversion).withoutTransitivity().asSingleFile() ); }