diff --git a/astrix-context/src/main/java/com/avanza/astrix/beans/registry/ServiceRegistryObjectSerializerConfigurer.java b/astrix-context/src/main/java/com/avanza/astrix/beans/registry/ServiceRegistryObjectSerializerConfigurer.java index 0464f5b70..23616c16d 100644 --- a/astrix-context/src/main/java/com/avanza/astrix/beans/registry/ServiceRegistryObjectSerializerConfigurer.java +++ b/astrix-context/src/main/java/com/avanza/astrix/beans/registry/ServiceRegistryObjectSerializerConfigurer.java @@ -18,11 +18,11 @@ import java.util.Arrays; import java.util.List; -import com.avanza.astrix.versioning.jackson1.AstrixJsonApiMigration; -import com.avanza.astrix.versioning.jackson1.Jackson1ObjectSerializerConfigurer; -import com.avanza.astrix.versioning.jackson1.JacksonObjectMapperBuilder; +import com.avanza.astrix.versioning.jackson2.AstrixJsonApiMigration; +import com.avanza.astrix.versioning.jackson2.Jackson2ObjectSerializerConfigurer; +import com.avanza.astrix.versioning.jackson2.JacksonObjectMapperBuilder; -public class ServiceRegistryObjectSerializerConfigurer implements Jackson1ObjectSerializerConfigurer { +public class ServiceRegistryObjectSerializerConfigurer implements Jackson2ObjectSerializerConfigurer { public static final int VERSION = 2; diff --git a/astrix-context/src/main/java/com/avanza/astrix/beans/registry/ServiceRegistryV1ApiMigration.java b/astrix-context/src/main/java/com/avanza/astrix/beans/registry/ServiceRegistryV1ApiMigration.java index 8b8b40662..8093e92d6 100644 --- a/astrix-context/src/main/java/com/avanza/astrix/beans/registry/ServiceRegistryV1ApiMigration.java +++ b/astrix-context/src/main/java/com/avanza/astrix/beans/registry/ServiceRegistryV1ApiMigration.java @@ -15,11 +15,10 @@ */ package com.avanza.astrix.beans.registry; -import org.codehaus.jackson.node.ObjectNode; - import com.avanza.astrix.beans.service.ServiceProperties; -import com.avanza.astrix.versioning.jackson1.AstrixJsonApiMigration; -import com.avanza.astrix.versioning.jackson1.AstrixJsonMessageMigration; +import com.avanza.astrix.versioning.jackson2.AstrixJsonApiMigration; +import com.avanza.astrix.versioning.jackson2.AstrixJsonMessageMigration; +import com.fasterxml.jackson.databind.node.ObjectNode; public class ServiceRegistryV1ApiMigration implements AstrixJsonApiMigration { @@ -46,8 +45,8 @@ public void upgrade(ObjectNode json) { // ApplicationInstanceId concept was introduced to uniquely identify a service. // Old clients will not set the property, but it was expected that a service (api + qualifier) // was only provided by a single application instance, hence we use it as id. - String qualifier = json.get("serviceProperties").get("_qualifier").getTextValue(); - String api = json.get("serviceProperties").get("_api").getTextValue(); + String qualifier = json.get("serviceProperties").get("_qualifier").asText(); + String api = json.get("serviceProperties").get("_api").asText(); String applicationInstanceId = api + "_" + qualifier; ObjectNode.class.cast(json.get("serviceProperties")).put(ServiceProperties.APPLICATION_INSTANCE_ID, applicationInstanceId); diff --git a/astrix-context/src/main/java/com/avanza/astrix/context/AstrixConfigurer.java b/astrix-context/src/main/java/com/avanza/astrix/context/AstrixConfigurer.java index a47774fc1..fb47ad878 100644 --- a/astrix-context/src/main/java/com/avanza/astrix/context/AstrixConfigurer.java +++ b/astrix-context/src/main/java/com/avanza/astrix/context/AstrixConfigurer.java @@ -16,22 +16,9 @@ package com.avanza.astrix.context; import java.lang.annotation.Annotation; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.ServiceLoader; -import java.util.Set; +import java.util.*; import java.util.stream.Stream; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import com.avanza.astrix.beans.api.ApiProviderBeanPublisherModule; import com.avanza.astrix.beans.config.AstrixConfig; import com.avanza.astrix.beans.config.AstrixConfigModule; @@ -46,40 +33,21 @@ import com.avanza.astrix.beans.core.AstrixSettings; import com.avanza.astrix.beans.factory.BeanFactoryModule; import com.avanza.astrix.beans.factory.StandardFactoryBean; -import com.avanza.astrix.beans.ft.BeanFaultToleranceFactorySpi; -import com.avanza.astrix.beans.ft.DefaultHystrixCommandNamingStrategy; -import com.avanza.astrix.beans.ft.FaultToleranceModule; -import com.avanza.astrix.beans.ft.HystrixCommandNamingStrategy; -import com.avanza.astrix.beans.ft.NoFaultTolerance; -import com.avanza.astrix.beans.publish.ApiProviderClass; -import com.avanza.astrix.beans.publish.ApiProviderPlugins; -import com.avanza.astrix.beans.publish.ApiProviders; -import com.avanza.astrix.beans.publish.BeanPublisherPlugin; -import com.avanza.astrix.beans.publish.BeansPublishModule; +import com.avanza.astrix.beans.ft.*; +import com.avanza.astrix.beans.publish.*; import com.avanza.astrix.beans.registry.AstrixServiceRegistryLibraryProvider; import com.avanza.astrix.beans.registry.AstrixServiceRegistryServiceProvider; import com.avanza.astrix.beans.registry.ServiceRegistryDiscoveryModule; import com.avanza.astrix.beans.service.DirectComponentModule; import com.avanza.astrix.beans.service.ServiceModule; -import com.avanza.astrix.config.DynamicConfig; -import com.avanza.astrix.config.LongSetting; -import com.avanza.astrix.config.MapConfigSource; -import com.avanza.astrix.config.PropertiesConfigSource; -import com.avanza.astrix.config.Setting; -import com.avanza.astrix.config.SystemPropertiesConfigSource; +import com.avanza.astrix.config.*; import com.avanza.astrix.context.mbeans.AstrixMBeanModule; import com.avanza.astrix.context.mbeans.MBeanServerFacade; import com.avanza.astrix.context.mbeans.PlatformMBeanServer; import com.avanza.astrix.context.metrics.DefaultMetricSpi; import com.avanza.astrix.context.metrics.MetricsModule; import com.avanza.astrix.context.metrics.MetricsSpi; -import com.avanza.astrix.modules.Module; -import com.avanza.astrix.modules.ModuleContext; -import com.avanza.astrix.modules.ModuleInstancePostProcessor; -import com.avanza.astrix.modules.Modules; -import com.avanza.astrix.modules.ModulesConfigurer; -import com.avanza.astrix.modules.StrategyContextPreparer; -import com.avanza.astrix.modules.StrategyProvider; +import com.avanza.astrix.modules.*; import com.avanza.astrix.provider.core.AstrixApiProvider; import com.avanza.astrix.provider.core.AstrixExcludedByProfile; import com.avanza.astrix.provider.core.AstrixIncludedByProfile; @@ -87,7 +55,9 @@ import com.avanza.astrix.serviceunit.ServiceUnitModule; import com.avanza.astrix.serviceunit.SystemServiceApiProvider; import com.avanza.astrix.versioning.core.ObjectSerializerModule; -import com.avanza.astrix.versioning.jackson1.Jackson1SerializerModule; +import com.avanza.astrix.versioning.jackson2.Jackson2SerializerModule; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Used to configure and create an {@link AstrixContext}.

* @@ -151,7 +121,7 @@ public AstrixContext configure() { modulesConfigurer.register(new BeansPublishModule()); modulesConfigurer.register(new ServiceModule()); modulesConfigurer.register(new ObjectSerializerModule()); - modulesConfigurer.register(new Jackson1SerializerModule()); + modulesConfigurer.register(new Jackson2SerializerModule()); modulesConfigurer.register(new ApiProviderBeanPublisherModule()); modulesConfigurer.register(new FaultToleranceModule()); modulesConfigurer.register(new BeanFactoryModule()); diff --git a/astrix-context/src/main/java/com/avanza/astrix/serviceunit/ServiceAdministratorVersioningConfigurer.java b/astrix-context/src/main/java/com/avanza/astrix/serviceunit/ServiceAdministratorVersioningConfigurer.java index 3582e6c3a..e8c269969 100644 --- a/astrix-context/src/main/java/com/avanza/astrix/serviceunit/ServiceAdministratorVersioningConfigurer.java +++ b/astrix-context/src/main/java/com/avanza/astrix/serviceunit/ServiceAdministratorVersioningConfigurer.java @@ -18,11 +18,11 @@ import java.util.Collections; import java.util.List; -import com.avanza.astrix.versioning.jackson1.AstrixJsonApiMigration; -import com.avanza.astrix.versioning.jackson1.Jackson1ObjectSerializerConfigurer; -import com.avanza.astrix.versioning.jackson1.JacksonObjectMapperBuilder; +import com.avanza.astrix.versioning.jackson2.AstrixJsonApiMigration; +import com.avanza.astrix.versioning.jackson2.Jackson2ObjectSerializerConfigurer; +import com.avanza.astrix.versioning.jackson2.JacksonObjectMapperBuilder; -public class ServiceAdministratorVersioningConfigurer implements Jackson1ObjectSerializerConfigurer { +public class ServiceAdministratorVersioningConfigurer implements Jackson2ObjectSerializerConfigurer { @Override public List apiMigrations() { diff --git a/astrix-integration-tests/src/main/java/com/avanza/astrix/integration/tests/domain/apiruntime/LunchApiObjectSerializerConfigurer.java b/astrix-integration-tests/src/main/java/com/avanza/astrix/integration/tests/domain/apiruntime/LunchApiObjectSerializerConfigurer.java index c83a3f49f..975725d7b 100644 --- a/astrix-integration-tests/src/main/java/com/avanza/astrix/integration/tests/domain/apiruntime/LunchApiObjectSerializerConfigurer.java +++ b/astrix-integration-tests/src/main/java/com/avanza/astrix/integration/tests/domain/apiruntime/LunchApiObjectSerializerConfigurer.java @@ -18,12 +18,12 @@ import java.util.Arrays; import java.util.List; -import com.avanza.astrix.versioning.jackson1.AstrixJsonApiMigration; -import com.avanza.astrix.versioning.jackson1.Jackson1ObjectSerializerConfigurer; -import com.avanza.astrix.versioning.jackson1.JacksonObjectMapperBuilder; +import com.avanza.astrix.versioning.jackson2.AstrixJsonApiMigration; +import com.avanza.astrix.versioning.jackson2.Jackson2ObjectSerializerConfigurer; +import com.avanza.astrix.versioning.jackson2.JacksonObjectMapperBuilder; -public class LunchApiObjectSerializerConfigurer implements Jackson1ObjectSerializerConfigurer { +public class LunchApiObjectSerializerConfigurer implements Jackson2ObjectSerializerConfigurer { @Override public List apiMigrations() { diff --git a/astrix-integration-tests/src/main/java/com/avanza/astrix/integration/tests/domain/apiruntime/LunchApiV1Migration.java b/astrix-integration-tests/src/main/java/com/avanza/astrix/integration/tests/domain/apiruntime/LunchApiV1Migration.java index b8e1d7f1c..29ffb4e3e 100644 --- a/astrix-integration-tests/src/main/java/com/avanza/astrix/integration/tests/domain/apiruntime/LunchApiV1Migration.java +++ b/astrix-integration-tests/src/main/java/com/avanza/astrix/integration/tests/domain/apiruntime/LunchApiV1Migration.java @@ -15,11 +15,10 @@ */ package com.avanza.astrix.integration.tests.domain.apiruntime; -import org.codehaus.jackson.node.ObjectNode; - import com.avanza.astrix.integration.tests.domain.api.LunchRestaurant; -import com.avanza.astrix.versioning.jackson1.AstrixJsonApiMigration; -import com.avanza.astrix.versioning.jackson1.AstrixJsonMessageMigration; +import com.avanza.astrix.versioning.jackson2.AstrixJsonApiMigration; +import com.avanza.astrix.versioning.jackson2.AstrixJsonMessageMigration; +import com.fasterxml.jackson.databind.node.ObjectNode; public class LunchApiV1Migration implements AstrixJsonApiMigration { diff --git a/astrix-integration-tests/src/main/java/com/avanza/astrix/integration/tests/domain2/apiruntime/LunchGradeApiObjectMapperConfigurer.java b/astrix-integration-tests/src/main/java/com/avanza/astrix/integration/tests/domain2/apiruntime/LunchGradeApiObjectMapperConfigurer.java index e332fd188..9860a5d98 100644 --- a/astrix-integration-tests/src/main/java/com/avanza/astrix/integration/tests/domain2/apiruntime/LunchGradeApiObjectMapperConfigurer.java +++ b/astrix-integration-tests/src/main/java/com/avanza/astrix/integration/tests/domain2/apiruntime/LunchGradeApiObjectMapperConfigurer.java @@ -18,11 +18,11 @@ import java.util.Collections; import java.util.List; -import com.avanza.astrix.versioning.jackson1.AstrixJsonApiMigration; -import com.avanza.astrix.versioning.jackson1.Jackson1ObjectSerializerConfigurer; -import com.avanza.astrix.versioning.jackson1.JacksonObjectMapperBuilder; +import com.avanza.astrix.versioning.jackson2.AstrixJsonApiMigration; +import com.avanza.astrix.versioning.jackson2.Jackson2ObjectSerializerConfigurer; +import com.avanza.astrix.versioning.jackson2.JacksonObjectMapperBuilder; -public class LunchGradeApiObjectMapperConfigurer implements Jackson1ObjectSerializerConfigurer { +public class LunchGradeApiObjectMapperConfigurer implements Jackson2ObjectSerializerConfigurer { @Override public void configure(JacksonObjectMapperBuilder objectMapperBuilder) { diff --git a/astrix-integration-tests/src/test/java/com/avanza/astrix/integration/tests/AstrixServiceBlueGreenDeployTest.java b/astrix-integration-tests/src/test/java/com/avanza/astrix/integration/tests/AstrixServiceBlueGreenDeployTest.java index d7c01f53f..e6e80f8fb 100644 --- a/astrix-integration-tests/src/test/java/com/avanza/astrix/integration/tests/AstrixServiceBlueGreenDeployTest.java +++ b/astrix-integration-tests/src/test/java/com/avanza/astrix/integration/tests/AstrixServiceBlueGreenDeployTest.java @@ -15,13 +15,7 @@ */ package com.avanza.astrix.integration.tests; -import static com.avanza.astrix.beans.core.AstrixSettings.APPLICATION_INSTANCE_ID; -import static com.avanza.astrix.beans.core.AstrixSettings.APPLICATION_TAG; -import static com.avanza.astrix.beans.core.AstrixSettings.BEAN_BIND_ATTEMPT_INTERVAL; -import static com.avanza.astrix.beans.core.AstrixSettings.SERVICE_ADMINISTRATOR_COMPONENT; -import static com.avanza.astrix.beans.core.AstrixSettings.SERVICE_LEASE_RENEW_INTERVAL; -import static com.avanza.astrix.beans.core.AstrixSettings.SERVICE_REGISTRY_URI; -import static com.avanza.astrix.beans.core.AstrixSettings.SUBSYSTEM_NAME; +import static com.avanza.astrix.beans.core.AstrixSettings.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -32,16 +26,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.hamcrest.Description; -import org.junit.Before; -import org.junit.Rule; -import org.junit.Test; -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; -import org.springframework.core.env.MapPropertySource; - import com.avanza.astrix.beans.core.AstrixBeanKey; import com.avanza.astrix.beans.core.AstrixSettings; import com.avanza.astrix.beans.registry.AstrixServiceRegistryEntry; @@ -67,9 +51,18 @@ import com.avanza.astrix.versioning.core.AstrixObjectSerializerConfig; import com.avanza.astrix.versioning.core.AstrixObjectSerializerConfigurer; import com.avanza.astrix.versioning.core.Versioned; -import com.avanza.astrix.versioning.jackson1.AstrixJsonApiMigration; -import com.avanza.astrix.versioning.jackson1.Jackson1ObjectSerializerConfigurer; -import com.avanza.astrix.versioning.jackson1.JacksonObjectMapperBuilder; +import com.avanza.astrix.versioning.jackson2.AstrixJsonApiMigration; +import com.avanza.astrix.versioning.jackson2.Jackson2ObjectSerializerConfigurer; +import com.avanza.astrix.versioning.jackson2.JacksonObjectMapperBuilder; +import org.hamcrest.Description; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.springframework.context.annotation.AnnotationConfigApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; +import org.springframework.core.env.MapPropertySource; /** * * @author Elias Lindholm (elilin) @@ -403,7 +396,7 @@ public static interface AccountPerformaneApi { AccountPerformanceInternal accountPerformanceInternal(); } - public static class AccountPerformanceVersioningConfig implements Jackson1ObjectSerializerConfigurer { + public static class AccountPerformanceVersioningConfig implements Jackson2ObjectSerializerConfigurer { @Override public List apiMigrations() { return Collections.emptyList(); diff --git a/astrix-versioning/pom.xml b/astrix-versioning/pom.xml index f0e01ff0a..d579fb2b5 100644 --- a/astrix-versioning/pom.xml +++ b/astrix-versioning/pom.xml @@ -13,11 +13,10 @@ astrix-modules ${project.version} - - org.codehaus.jackson - jackson-mapper-asl - - + + com.fasterxml.jackson.core + jackson-databind + org.kohsuke.metainf-services diff --git a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/AstrixJsonApiMigration.java b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/AstrixJsonApiMigration.java similarity index 94% rename from astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/AstrixJsonApiMigration.java rename to astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/AstrixJsonApiMigration.java index 46be5aa08..3f35844be 100644 --- a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/AstrixJsonApiMigration.java +++ b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/AstrixJsonApiMigration.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.avanza.astrix.versioning.jackson1; +package com.avanza.astrix.versioning.jackson2; /** diff --git a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/AstrixJsonMessageMigration.java b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/AstrixJsonMessageMigration.java similarity index 91% rename from astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/AstrixJsonMessageMigration.java rename to astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/AstrixJsonMessageMigration.java index fc355ee2d..2fb3176db 100644 --- a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/AstrixJsonMessageMigration.java +++ b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/AstrixJsonMessageMigration.java @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.avanza.astrix.versioning.jackson1; +package com.avanza.astrix.versioning.jackson2; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; /** * diff --git a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/AstrixObjectMapperConfigurer.java b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/AstrixObjectMapperConfigurer.java similarity index 93% rename from astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/AstrixObjectMapperConfigurer.java rename to astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/AstrixObjectMapperConfigurer.java index 35c20cca3..2831d6e1d 100644 --- a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/AstrixObjectMapperConfigurer.java +++ b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/AstrixObjectMapperConfigurer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.avanza.astrix.versioning.jackson1; +package com.avanza.astrix.versioning.jackson2; public interface AstrixObjectMapperConfigurer { diff --git a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/Jackson1AstrixObjectSerializer.java b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/Jackson2AstrixObjectSerializer.java similarity index 85% rename from astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/Jackson1AstrixObjectSerializer.java rename to astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/Jackson2AstrixObjectSerializer.java index 111458274..b18d79735 100644 --- a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/Jackson1AstrixObjectSerializer.java +++ b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/Jackson2AstrixObjectSerializer.java @@ -13,31 +13,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.avanza.astrix.versioning.jackson1; +package com.avanza.astrix.versioning.jackson2; import java.lang.reflect.Type; import com.avanza.astrix.versioning.core.AstrixObjectSerializer; import com.avanza.astrix.versioning.core.AstrixObjectSerializerConfigurer; import com.avanza.astrix.versioning.core.ObjectSerializerDefinition; -import com.avanza.astrix.versioning.jackson1.VersionedJsonObjectMapper.VersionedObjectMapperBuilder; +import com.avanza.astrix.versioning.jackson2.VersionedJsonObjectMapper.VersionedObjectMapperBuilder; -class Jackson1AstrixObjectSerializer implements AstrixObjectSerializer { +class Jackson2AstrixObjectSerializer implements AstrixObjectSerializer { private JsonObjectMapper objectMapper; private int version; - public Jackson1AstrixObjectSerializer(ObjectSerializerDefinition serializerDefinition) { + public Jackson2AstrixObjectSerializer(ObjectSerializerDefinition serializerDefinition) { Class serializerBuilder = serializerDefinition.getObjectSerializerConfigurerClass(); this.version = serializerDefinition.version(); try { - this.objectMapper = buildObjectMapper(Jackson1ObjectSerializerConfigurer.class.cast(serializerBuilder.newInstance())); + this.objectMapper = buildObjectMapper(Jackson2ObjectSerializerConfigurer.class.cast(serializerBuilder.newInstance())); } catch (Exception e) { throw new RuntimeException("Failed to init JsonObjectMapper", e); } } - private JsonObjectMapper buildObjectMapper(Jackson1ObjectSerializerConfigurer serializerBuilder) { + private JsonObjectMapper buildObjectMapper(Jackson2ObjectSerializerConfigurer serializerBuilder) { VersionedObjectMapperBuilder objectMapperBuilder = new VersionedObjectMapperBuilder(serializerBuilder.apiMigrations()); serializerBuilder.configure(objectMapperBuilder); return JsonObjectMapper.create(objectMapperBuilder.build()); diff --git a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/Jackson1ObjectSerializerConfigurer.java b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/Jackson2ObjectSerializerConfigurer.java similarity index 88% rename from astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/Jackson1ObjectSerializerConfigurer.java rename to astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/Jackson2ObjectSerializerConfigurer.java index abdb82401..f9fb5953e 100644 --- a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/Jackson1ObjectSerializerConfigurer.java +++ b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/Jackson2ObjectSerializerConfigurer.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.avanza.astrix.versioning.jackson1; +package com.avanza.astrix.versioning.jackson2; import java.util.List; @@ -23,7 +23,7 @@ * @author Elias Lindholm * */ -public interface Jackson1ObjectSerializerConfigurer extends AstrixObjectSerializerConfigurer { +public interface Jackson2ObjectSerializerConfigurer extends AstrixObjectSerializerConfigurer { List apiMigrations(); void configure(JacksonObjectMapperBuilder objectMapperBuilder); } diff --git a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/Jackson1SerializerModule.java b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/Jackson2SerializerModule.java similarity index 87% rename from astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/Jackson1SerializerModule.java rename to astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/Jackson2SerializerModule.java index 6739b5ee3..30c3cf8b2 100644 --- a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/Jackson1SerializerModule.java +++ b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/Jackson2SerializerModule.java @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.avanza.astrix.versioning.jackson1; +package com.avanza.astrix.versioning.jackson2; import com.avanza.astrix.modules.Module; import com.avanza.astrix.modules.ModuleContext; import com.avanza.astrix.versioning.core.ObjectSerializerFactoryPlugin; -public class Jackson1SerializerModule implements Module { +public class Jackson2SerializerModule implements Module { @Override public void prepare(ModuleContext moduleContext) { - moduleContext.bind(ObjectSerializerFactoryPlugin.class, Jackson1SerializerPlugin.class); + moduleContext.bind(ObjectSerializerFactoryPlugin.class, Jackson2SerializerPlugin.class); moduleContext.export(ObjectSerializerFactoryPlugin.class); } diff --git a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/Jackson1SerializerPlugin.java b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/Jackson2SerializerPlugin.java similarity index 83% rename from astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/Jackson1SerializerPlugin.java rename to astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/Jackson2SerializerPlugin.java index f9b814639..76829dc5b 100644 --- a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/Jackson1SerializerPlugin.java +++ b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/Jackson2SerializerPlugin.java @@ -13,23 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.avanza.astrix.versioning.jackson1; +package com.avanza.astrix.versioning.jackson2; import com.avanza.astrix.versioning.core.AstrixObjectSerializer; import com.avanza.astrix.versioning.core.AstrixObjectSerializerConfigurer; import com.avanza.astrix.versioning.core.ObjectSerializerDefinition; import com.avanza.astrix.versioning.core.ObjectSerializerFactoryPlugin; -final class Jackson1SerializerPlugin implements ObjectSerializerFactoryPlugin { +final class Jackson2SerializerPlugin implements ObjectSerializerFactoryPlugin { @Override public AstrixObjectSerializer create(ObjectSerializerDefinition serializerDefinition) { - return new Jackson1AstrixObjectSerializer(serializerDefinition); + return new Jackson2AstrixObjectSerializer(serializerDefinition); } @Override public Class getConfigurerType() { - return Jackson1ObjectSerializerConfigurer.class; + return Jackson2ObjectSerializerConfigurer.class; } } diff --git a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/JacksonObjectMapperBuilder.java b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/JacksonObjectMapperBuilder.java similarity index 84% rename from astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/JacksonObjectMapperBuilder.java rename to astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/JacksonObjectMapperBuilder.java index d55a59876..b06492f43 100644 --- a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/JacksonObjectMapperBuilder.java +++ b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/JacksonObjectMapperBuilder.java @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.avanza.astrix.versioning.jackson1; +package com.avanza.astrix.versioning.jackson2; + +import com.fasterxml.jackson.databind.JsonDeserializer; +import com.fasterxml.jackson.databind.JsonSerializer; -import org.codehaus.jackson.map.JsonDeserializer; -import org.codehaus.jackson.map.JsonSerializer; /** * * @author Elias Lindholm (elilin) diff --git a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/JsonMessageMigrator.java b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/JsonMessageMigrator.java similarity index 96% rename from astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/JsonMessageMigrator.java rename to astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/JsonMessageMigrator.java index d2dc56ebf..c99ebb95a 100644 --- a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/JsonMessageMigrator.java +++ b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/JsonMessageMigrator.java @@ -13,13 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.avanza.astrix.versioning.jackson1; +package com.avanza.astrix.versioning.jackson2; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.codehaus.jackson.node.ObjectNode; +import com.fasterxml.jackson.databind.node.ObjectNode; + /** * A message migrator is responsible for migration a message on an old version * to the current version, and also responsible for migration messages on the diff --git a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/JsonObjectMapper.java b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/JsonObjectMapper.java similarity index 97% rename from astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/JsonObjectMapper.java rename to astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/JsonObjectMapper.java index 7812eb7f0..704c2acc9 100644 --- a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/JsonObjectMapper.java +++ b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/JsonObjectMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.avanza.astrix.versioning.jackson1; +package com.avanza.astrix.versioning.jackson2; import java.lang.reflect.Type; /** diff --git a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/VersionedJsonObjectMapper.java b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/VersionedJsonObjectMapper.java similarity index 91% rename from astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/VersionedJsonObjectMapper.java rename to astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/VersionedJsonObjectMapper.java index df02259c6..4aa4e4247 100644 --- a/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson1/VersionedJsonObjectMapper.java +++ b/astrix-versioning/src/main/java/com/avanza/astrix/versioning/jackson2/VersionedJsonObjectMapper.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.avanza.astrix.versioning.jackson1; +package com.avanza.astrix.versioning.jackson2; import java.io.IOException; import java.lang.reflect.Type; @@ -24,20 +24,14 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.codehaus.jackson.JsonGenerator; -import org.codehaus.jackson.JsonParser; -import org.codehaus.jackson.JsonProcessingException; -import org.codehaus.jackson.Version; -import org.codehaus.jackson.map.DeserializationContext; -import org.codehaus.jackson.map.JsonDeserializer; -import org.codehaus.jackson.map.JsonSerializer; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.SerializerProvider; -import org.codehaus.jackson.map.module.SimpleModule; -import org.codehaus.jackson.node.ObjectNode; -import org.codehaus.jackson.type.JavaType; - -import com.avanza.astrix.versioning.jackson1.JsonMessageMigrator.Builder; +import com.avanza.astrix.versioning.jackson2.JsonMessageMigrator.Builder; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonParser; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.core.Version; +import com.fasterxml.jackson.databind.*; +import com.fasterxml.jackson.databind.module.SimpleModule; +import com.fasterxml.jackson.databind.node.ObjectNode; public class VersionedJsonObjectMapper implements JsonObjectMapper.Impl { @@ -170,7 +164,7 @@ int getVersion() { static class MessageMigratorsBuilder { - Map, JsonMessageMigrator.Builder> buildersByType = new HashMap, JsonMessageMigrator.Builder>(); + Map, JsonMessageMigrator.Builder> buildersByType = new HashMap<>(); MessageMigratorsBuilder registerAll(List migrations) { for (AstrixJsonApiMigration apiMigration : migrations) { @@ -192,7 +186,7 @@ void register(int version, AstrixJsonMessageMigration messageMigration) { } ConcurrentMap, JsonMessageMigrator> build() { - ConcurrentMap, JsonMessageMigrator> migratorsByType = new ConcurrentHashMap, JsonMessageMigrator>(); + ConcurrentMap, JsonMessageMigrator> migratorsByType = new ConcurrentHashMap<>(); for (JsonMessageMigrator.Builder builder : this.buildersByType.values()) { JsonMessageMigrator jsonMessageMigrator = builder.build(); migratorsByType.put(jsonMessageMigrator.getJavaType(), jsonMessageMigrator); @@ -229,7 +223,7 @@ public VersionedJsonObjectMapper build() { } private ObjectMapper buildMigratingMapper(ObjectMapper rawMapper, ThreadLocal versionHolder) { - SimpleModule module = new SimpleModule("Astrix-migratingModule", new Version(1,0,0, "")); + SimpleModule module = new SimpleModule("Astrix-migratingModule", new Version(1, 0, 0, "", null, null)); for (JsonMessageMigrator migrator : this.migratorsByType.values()) { registerSerializerAndDeserializer(rawMapper, versionHolder, module, migrator); } diff --git a/astrix-versioning/src/test/java/com/avanza/astrix/versioning/jackson1/JacksonVersioningPluginTest.java b/astrix-versioning/src/test/java/com/avanza/astrix/versioning/jackson2/JacksonVersioningPluginTest.java similarity index 85% rename from astrix-versioning/src/test/java/com/avanza/astrix/versioning/jackson1/JacksonVersioningPluginTest.java rename to astrix-versioning/src/test/java/com/avanza/astrix/versioning/jackson2/JacksonVersioningPluginTest.java index c38ccdd0f..165338af5 100644 --- a/astrix-versioning/src/test/java/com/avanza/astrix/versioning/jackson1/JacksonVersioningPluginTest.java +++ b/astrix-versioning/src/test/java/com/avanza/astrix/versioning/jackson2/JacksonVersioningPluginTest.java @@ -13,29 +13,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.avanza.astrix.versioning.jackson1; +package com.avanza.astrix.versioning.jackson2; import static org.junit.Assert.assertEquals; import java.util.Arrays; import java.util.List; -import org.codehaus.jackson.node.ObjectNode; -import org.junit.Test; - import com.avanza.astrix.versioning.core.AstrixObjectSerializer; import com.avanza.astrix.versioning.core.ObjectSerializerDefinition; -import com.avanza.astrix.versioning.jackson1.AstrixJsonApiMigration; -import com.avanza.astrix.versioning.jackson1.AstrixJsonMessageMigration; -import com.avanza.astrix.versioning.jackson1.Jackson1ObjectSerializerConfigurer; -import com.avanza.astrix.versioning.jackson1.Jackson1SerializerPlugin; -import com.avanza.astrix.versioning.jackson1.JacksonObjectMapperBuilder; +import com.fasterxml.jackson.databind.node.ObjectNode; +import org.junit.Test; public class JacksonVersioningPluginTest { @Test public void serializesV2Objects() throws Exception { - AstrixObjectSerializer astrixObjectSerializer = new Jackson1SerializerPlugin().create(ObjectSerializerDefinition.versionedService(2, TestObjectMapperConfigurer.class)); + AstrixObjectSerializer astrixObjectSerializer = new Jackson2SerializerPlugin().create(ObjectSerializerDefinition.versionedService(2, TestObjectMapperConfigurer.class)); Object serialized = astrixObjectSerializer.serialize(new TestPojoV2("foo", "bar"), 2); TestPojoV2 deserializedPojo = astrixObjectSerializer.deserialize(serialized, TestPojoV2.class, 2); @@ -45,7 +39,7 @@ public void serializesV2Objects() throws Exception { @Test public void deserializesFromV1ObjectsByUpgrading() throws Exception { - AstrixObjectSerializer astrixObjectSerializer = new Jackson1SerializerPlugin().create(ObjectSerializerDefinition.versionedService(2, TestObjectMapperConfigurer.class)); + AstrixObjectSerializer astrixObjectSerializer = new Jackson2SerializerPlugin().create(ObjectSerializerDefinition.versionedService(2, TestObjectMapperConfigurer.class)); Object serializedV1 = astrixObjectSerializer.serialize(new TestPojoV1("foo"), 1); TestPojoV2 deserializedPojo = astrixObjectSerializer.deserialize(serializedV1, TestPojoV2.class, 1); @@ -55,7 +49,7 @@ public void deserializesFromV1ObjectsByUpgrading() throws Exception { @Test public void serializesToV1ObjectsByDowngrading() throws Exception { - AstrixObjectSerializer astrixObjectSerializer = new Jackson1SerializerPlugin().create(ObjectSerializerDefinition.versionedService(2, TestObjectMapperConfigurer.class)); + AstrixObjectSerializer astrixObjectSerializer = new Jackson2SerializerPlugin().create(ObjectSerializerDefinition.versionedService(2, TestObjectMapperConfigurer.class)); Object serializedV1 = astrixObjectSerializer.serialize(new TestPojoV2("foo", "bar"), 1); // bar will be removed during serialization TestPojoV2 deserializedPojo = astrixObjectSerializer.deserialize(serializedV1, TestPojoV2.class, 2); @@ -66,7 +60,7 @@ public void serializesToV1ObjectsByDowngrading() throws Exception { public static class FakeDescriptor { } - public static class TestObjectMapperConfigurer implements Jackson1ObjectSerializerConfigurer { + public static class TestObjectMapperConfigurer implements Jackson2ObjectSerializerConfigurer { @Override public List apiMigrations() { diff --git a/astrix-versioning/src/test/java/com/avanza/astrix/versioning/jackson1/VersionedJsonObjectMapperTest.java b/astrix-versioning/src/test/java/com/avanza/astrix/versioning/jackson2/VersionedJsonObjectMapperTest.java similarity index 92% rename from astrix-versioning/src/test/java/com/avanza/astrix/versioning/jackson1/VersionedJsonObjectMapperTest.java rename to astrix-versioning/src/test/java/com/avanza/astrix/versioning/jackson2/VersionedJsonObjectMapperTest.java index 6b9b8ec99..8ae054863 100644 --- a/astrix-versioning/src/test/java/com/avanza/astrix/versioning/jackson1/VersionedJsonObjectMapperTest.java +++ b/astrix-versioning/src/test/java/com/avanza/astrix/versioning/jackson2/VersionedJsonObjectMapperTest.java @@ -13,23 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.avanza.astrix.versioning.jackson1; +package com.avanza.astrix.versioning.jackson2; import static org.junit.Assert.assertEquals; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import org.codehaus.jackson.node.ObjectNode; -import org.junit.Test; - -import com.avanza.astrix.versioning.jackson1.AstrixJsonApiMigration; -import com.avanza.astrix.versioning.jackson1.AstrixJsonMessageMigration; -import com.avanza.astrix.versioning.jackson1.VersionedJsonObjectMapper; -import com.avanza.astrix.versioning.jackson1.VersionedJsonObjectMapper.VersionedObjectMapperBuilder; +import com.avanza.astrix.versioning.jackson2.VersionedJsonObjectMapper.VersionedObjectMapperBuilder; +import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.reflect.TypeToken; +import org.junit.Test; diff --git a/examples/lunch-grader-parent/lunch-grader-api-provider/src/main/java/lunch/grader/api/provider/LunchGradeApiObjectMapperConfigurer.java b/examples/lunch-grader-parent/lunch-grader-api-provider/src/main/java/lunch/grader/api/provider/LunchGradeApiObjectMapperConfigurer.java index 977536244..c54447b22 100644 --- a/examples/lunch-grader-parent/lunch-grader-api-provider/src/main/java/lunch/grader/api/provider/LunchGradeApiObjectMapperConfigurer.java +++ b/examples/lunch-grader-parent/lunch-grader-api-provider/src/main/java/lunch/grader/api/provider/LunchGradeApiObjectMapperConfigurer.java @@ -18,11 +18,11 @@ import java.util.Collections; import java.util.List; -import com.avanza.astrix.versioning.jackson1.AstrixJsonApiMigration; -import com.avanza.astrix.versioning.jackson1.Jackson1ObjectSerializerConfigurer; -import com.avanza.astrix.versioning.jackson1.JacksonObjectMapperBuilder; +import com.avanza.astrix.versioning.jackson2.AstrixJsonApiMigration; +import com.avanza.astrix.versioning.jackson2.Jackson2ObjectSerializerConfigurer; +import com.avanza.astrix.versioning.jackson2.JacksonObjectMapperBuilder; -public class LunchGradeApiObjectMapperConfigurer implements Jackson1ObjectSerializerConfigurer { +public class LunchGradeApiObjectMapperConfigurer implements Jackson2ObjectSerializerConfigurer { @Override public void configure(JacksonObjectMapperBuilder objectMapperBuilder) { diff --git a/examples/lunch-grader-parent/lunch-grader-pu/pom.xml b/examples/lunch-grader-parent/lunch-grader-pu/pom.xml index 4f7bfbe6f..7d1c800b2 100644 --- a/examples/lunch-grader-parent/lunch-grader-pu/pom.xml +++ b/examples/lunch-grader-parent/lunch-grader-pu/pom.xml @@ -62,15 +62,12 @@ com.gigaspaces gs-openspaces - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-core-asl - - + + + com.fasterxml.jackson.core + jackson-core + + org.slf4j slf4j-api diff --git a/examples/lunch-parent/lunch-api-provider/pom.xml b/examples/lunch-parent/lunch-api-provider/pom.xml index 0c4b6f925..ec404cfe7 100644 --- a/examples/lunch-parent/lunch-api-provider/pom.xml +++ b/examples/lunch-parent/lunch-api-provider/pom.xml @@ -20,9 +20,9 @@ ${astrix.groupId} astrix-versioning - - org.codehaus.jackson - jackson-core-asl - + + com.fasterxml.jackson.core + jackson-databind + \ No newline at end of file diff --git a/examples/lunch-parent/lunch-api-provider/src/main/java/lunch/api/provider/LunchApiObjectSerializerConfigurer.java b/examples/lunch-parent/lunch-api-provider/src/main/java/lunch/api/provider/LunchApiObjectSerializerConfigurer.java index 4ed1c5d72..49cd27b75 100644 --- a/examples/lunch-parent/lunch-api-provider/src/main/java/lunch/api/provider/LunchApiObjectSerializerConfigurer.java +++ b/examples/lunch-parent/lunch-api-provider/src/main/java/lunch/api/provider/LunchApiObjectSerializerConfigurer.java @@ -18,12 +18,12 @@ import java.util.Arrays; import java.util.List; -import com.avanza.astrix.versioning.jackson1.AstrixJsonApiMigration; -import com.avanza.astrix.versioning.jackson1.Jackson1ObjectSerializerConfigurer; -import com.avanza.astrix.versioning.jackson1.JacksonObjectMapperBuilder; +import com.avanza.astrix.versioning.jackson2.AstrixJsonApiMigration; +import com.avanza.astrix.versioning.jackson2.Jackson2ObjectSerializerConfigurer; +import com.avanza.astrix.versioning.jackson2.JacksonObjectMapperBuilder; -public class LunchApiObjectSerializerConfigurer implements Jackson1ObjectSerializerConfigurer { +public class LunchApiObjectSerializerConfigurer implements Jackson2ObjectSerializerConfigurer { @Override public void configure(JacksonObjectMapperBuilder objectMapperBuilder) { diff --git a/examples/lunch-parent/lunch-api-provider/src/main/java/lunch/api/provider/LunchApiV1Migration.java b/examples/lunch-parent/lunch-api-provider/src/main/java/lunch/api/provider/LunchApiV1Migration.java index 1f80601b5..a4b3ebacd 100644 --- a/examples/lunch-parent/lunch-api-provider/src/main/java/lunch/api/provider/LunchApiV1Migration.java +++ b/examples/lunch-parent/lunch-api-provider/src/main/java/lunch/api/provider/LunchApiV1Migration.java @@ -15,13 +15,11 @@ */ package lunch.api.provider; +import com.avanza.astrix.versioning.jackson2.AstrixJsonApiMigration; +import com.avanza.astrix.versioning.jackson2.AstrixJsonMessageMigration; +import com.fasterxml.jackson.databind.node.ObjectNode; import lunch.api.LunchRestaurant; -import org.codehaus.jackson.node.ObjectNode; - -import com.avanza.astrix.versioning.jackson1.AstrixJsonApiMigration; -import com.avanza.astrix.versioning.jackson1.AstrixJsonMessageMigration; - public class LunchApiV1Migration implements AstrixJsonApiMigration { @Override diff --git a/examples/lunch-parent/lunch-pu/pom.xml b/examples/lunch-parent/lunch-pu/pom.xml index 728c1de83..56d8ec99f 100644 --- a/examples/lunch-parent/lunch-pu/pom.xml +++ b/examples/lunch-parent/lunch-pu/pom.xml @@ -49,7 +49,6 @@ test - com.gigaspaces gs-runtime @@ -58,14 +57,10 @@ com.gigaspaces gs-openspaces - - org.codehaus.jackson - jackson-mapper-asl - - - org.codehaus.jackson - jackson-core-asl - + + com.fasterxml.jackson.core + jackson-core + org.slf4j diff --git a/pom.xml b/pom.xml index 10b09f9dd..6b3446b66 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,7 @@ 1.2.0 1.5.8 0.4.1 - 1.9.12 + 2.8.6 14.0.1 4.11 1.2.1 @@ -253,18 +253,14 @@ 0.9.9 - - - - org.codehaus.jackson - jackson-mapper-asl - ${jackson1.version} - - - org.codehaus.jackson - jackson-core-asl - ${jackson1.version} - + + + com.fasterxml.jackson + jackson-bom + ${jackson2.version} + pom + import + org.slf4j