diff --git a/dxa-framework/dxa-common-api/src/test/java/com/sdl/webapp/common/markup/html/ParsableHtmlNodeTest.java b/dxa-framework/dxa-common-api/src/test/java/com/sdl/webapp/common/markup/html/ParsableHtmlNodeTest.java
index d68159e95..fdb723f45 100644
--- a/dxa-framework/dxa-common-api/src/test/java/com/sdl/webapp/common/markup/html/ParsableHtmlNodeTest.java
+++ b/dxa-framework/dxa-common-api/src/test/java/com/sdl/webapp/common/markup/html/ParsableHtmlNodeTest.java
@@ -22,7 +22,7 @@ public void testInjectMarkup() throws Exception {
String xpmMarkup = "";
html.prepend(xpmMarkup);
- assertThat("XPM markup has been injected into HTML", markup.toHtml(), is("
\n \n
Hello there!!!
LINK\n
"));
+ assertThat("XPM markup has been injected into HTML", markup.toHtml(), is("\n \n
Hello there!!!
\n
LINK\n
"));
}
}
diff --git a/dxa-framework/dxa-data-model/src/main/java/com/sdl/dxa/api/datamodel/DataModelSpringConfiguration.java b/dxa-framework/dxa-data-model/src/main/java/com/sdl/dxa/api/datamodel/DataModelSpringConfiguration.java
index 2e88a3408..7734c2114 100644
--- a/dxa-framework/dxa-data-model/src/main/java/com/sdl/dxa/api/datamodel/DataModelSpringConfiguration.java
+++ b/dxa-framework/dxa-data-model/src/main/java/com/sdl/dxa/api/datamodel/DataModelSpringConfiguration.java
@@ -2,10 +2,7 @@
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.PropertyNamingStrategy;
-import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.util.StdDateFormat;
import com.fasterxml.jackson.datatype.joda.JodaModule;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
@@ -36,7 +33,7 @@ public class DataModelSpringConfiguration {
public ObjectMapper dxaR2ObjectMapper() {
ObjectMapper objectMapper = new ObjectMapper();
- objectMapper.setPropertyNamingStrategy(new PropertyNamingStrategy.UpperCamelCaseStrategy());
+ objectMapper.setPropertyNamingStrategy(PropertyNamingStrategies.UPPER_CAMEL_CASE);
objectMapper.registerModule(new JodaModule());
objectMapper.registerModule(new JavaTimeModule());
objectMapper.setDateFormat(new StdDateFormat());
diff --git a/pom.xml b/pom.xml
index 5a27130c8..cf755f046 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,25 +34,25 @@
- 2.18.0
- 3.17.0
- 1.13.0
- 4.4
- 1.27.1
+ 2.20.0
+ 3.18.0
+ 1.14.0
+ 4.5.0
+ 1.28.0
4.5.14
4.4.16
- 33.3.1-jre
+ 33.4.8-jre
- 2.13.0
+ 2.14.0
- 2.18.3
- 1.18.36
+ 2.19.2
+ 1.18.38
- 1.5.16
- 2.0.16
+ 1.5.18
+ 2.0.17
6.1.0
@@ -61,25 +61,25 @@
3.0.1
- 5.11.4
+ 5.13.4
3.0
- 5.15.2
+ 5.19.0
0.9.1
1.5.3
- 2.10.0
+ 2.10.3
- 6.2.1
- 6.4.2
+ 6.2.10
+ 6.5.3
- 1.18.3
+ 1.21.2
2.1.0
1.5.4
- 6.5.2
+ 7.0.0
3.2.18.1
- 26.0.1
+ 26.0.2-1
2.0.0
2.0.6.1
@@ -87,10 +87,10 @@
0.4.4
1.1.1
- 1.17.2
+ 1.19.0
- 4.8.179
- 2.11.0
+ 4.8.181
+ 2.13.1
3.0.0
4.0.2
4.0.2
@@ -737,7 +737,7 @@
com.squareup.okio
okio-jvm
- 3.10.2
+ 3.16.0
org.scala-lang.modules
@@ -747,22 +747,17 @@
org.jetbrains.kotlin
kotlin-stdlib
- 2.1.0
-
-
- org.jetbrains.kotlin
- kotlin-stdlib-common
- 2.1.0
+ 2.2.10
org.jetbrains.kotlin
kotlin-stdlib-jdk7
- 2.1.0
+ 2.2.10
org.jetbrains.kotlin
kotlin-stdlib-jdk8
- 2.1.0
+ 2.2.10
com.github.ua-parser
@@ -878,17 +873,17 @@
org.yaml
snakeyaml
- 2.3
+ 2.5
com.squareup.okhttp3
okhttp
- 4.12.0
+ 5.1.0
com.squareup.okhttp3
logging-interceptor
- 4.12.0
+ 5.1.0
@@ -899,12 +894,12 @@
net.minidev
json-smart
- 2.5.2
+ 2.6.0
org.glassfish.jersey.core
jersey-common
- 3.1.10
+ 3.1.11