diff --git a/components/camel-ai/camel-torchserve/pom.xml b/components/camel-ai/camel-torchserve/pom.xml index cfd3486945daf..cf0416f2983d0 100644 --- a/components/camel-ai/camel-torchserve/pom.xml +++ b/components/camel-ai/camel-torchserve/pom.xml @@ -63,7 +63,7 @@ com.fasterxml.jackson.core jackson-annotations - ${jackson2-version} + ${jackson2-annotations-version} com.fasterxml.jackson.core diff --git a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/MyModule.java b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/MyModule.java index 4da47730c34f9..22a22cd79f5f4 100644 --- a/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/MyModule.java +++ b/components/camel-jackson/src/test/java/org/apache/camel/component/jackson/MyModule.java @@ -18,7 +18,7 @@ import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.databind.Module; -import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.PropertyNamingStrategies; public class MyModule extends Module { @@ -34,7 +34,7 @@ public Version version() { @Override public void setupModule(SetupContext context) { - context.setNamingStrategy(new PropertyNamingStrategy.PropertyNamingStrategyBase() { + context.setNamingStrategy(new PropertyNamingStrategies.NamingBase() { @Override public String translate(String propertyName) { return "my-" + propertyName; diff --git a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/MyModule.java b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/MyModule.java index fa2eeb550ab74..757a396c7fd88 100644 --- a/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/MyModule.java +++ b/components/camel-jacksonxml/src/test/java/org/apache/camel/component/jacksonxml/MyModule.java @@ -19,6 +19,10 @@ import com.fasterxml.jackson.core.Version; import com.fasterxml.jackson.databind.Module; import com.fasterxml.jackson.databind.PropertyNamingStrategy; +import com.fasterxml.jackson.databind.cfg.MapperConfig; +import com.fasterxml.jackson.databind.introspect.AnnotatedField; +import com.fasterxml.jackson.databind.introspect.AnnotatedMethod; +import com.fasterxml.jackson.databind.introspect.AnnotatedParameter; public class MyModule extends Module { @@ -34,10 +38,26 @@ public Version version() { @Override public void setupModule(SetupContext context) { - context.setNamingStrategy(new PropertyNamingStrategy.PropertyNamingStrategyBase() { + context.setNamingStrategy(new PropertyNamingStrategy() { @Override - public String translate(String propertyName) { - return "my-" + propertyName; + public String nameForField(MapperConfig config, AnnotatedField field, String defaultName) { + return "my-" + defaultName; + } + + @Override + public String nameForGetterMethod(MapperConfig config, AnnotatedMethod method, String defaultName) { + return "my-" + defaultName; + } + + @Override + public String nameForSetterMethod(MapperConfig config, AnnotatedMethod method, String defaultName) { + return "my-" + defaultName; + } + + @Override + public String nameForConstructorParameter( + MapperConfig config, AnnotatedParameter ctorParam, String defaultName) { + return "my-" + defaultName; } }); } diff --git a/parent/pom.xml b/parent/pom.xml index 3534f1358d87c..26ee3e5f3b571 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -272,7 +272,8 @@ 2.5.3 0.2.9 1.6.0 - 2.19.4 + 2.21.2 + 2.21 2.22.3 0.15 3.5.3