Skip to content

Full review and update of 3rd party dependencies. #216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dxasupport merged 1 commit into from
Sep 8, 2025
Merged

Full review and update of 3rd party dependencies. #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .../dxa-common-api/src/test/java/com/sdl/webapp/common/markup/html/ParsableHtmlNodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public void testInjectMarkup() throws Exception {
String xpmMarkup = "<!-- Start Component Presentation -->";
html.prepend(xpmMarkup);

assertThat("XPM markup has been injected into HTML", markup.toHtml(), is("<div id=\"region\">\n <!-- Start Component Presentation -->\n <p>Hello there!!!</p><a href=\"#\">LINK</a>\n</div>"));
assertThat("XPM markup has been injected into HTML", markup.toHtml(), is("<div id=\"region\">\n <!-- Start Component Presentation -->\n <p>Hello there!!!</p>\n <a href=\"#\">LINK</a>\n</div>"));
}

}
7 changes: 2 additions & 5 deletions .../dxa-data-model/src/main/java/com/sdl/dxa/api/datamodel/DataModelSpringConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down
67 changes: 31 additions & 36 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,25 +34,25 @@
<!-- /DXA Versions -->

<!-- Apache -->
<commons-io-version>2.18.0</commons-io-version>
<commons-lang3.version>3.17.0</commons-lang3.version>
<commons-text.version>1.13.0</commons-text.version>
<commons-collections4.version>4.4</commons-collections4.version>
<commons-compress.version>1.27.1</commons-compress.version>
<commons-io-version>2.20.0</commons-io-version>
<commons-lang3.version>3.18.0</commons-lang3.version>
<commons-text.version>1.14.0</commons-text.version>
<commons-collections4.version>4.5.0</commons-collections4.version>
<commons-compress.version>1.28.0</commons-compress.version>
<httpcomponents-client-version>4.5.14</httpcomponents-client-version>
<httpcomponents.core.version>4.4.16</httpcomponents.core.version>

<guava-version>33.3.1-jre</guava-version>
<guava-version>33.4.8-jre</guava-version>

<!-- Joda Time -->
<joda-time-version>2.13.0</joda-time-version>
<joda-time-version>2.14.0</joda-time-version>

<jackson.version>2.18.3</jackson.version>
<lombok.version>1.18.36</lombok.version>
<jackson.version>2.19.2</jackson.version>
<lombok.version>1.18.38</lombok.version>

<!-- Logging -->
<logback.version>1.5.16</logback.version>
<slf4j-version>2.0.16</slf4j-version>
<logback.version>1.5.18</logback.version>
<slf4j-version>2.0.17</slf4j-version>

<!-- Servlet and JSP APIs -->
<servlet-api-version>6.1.0</servlet-api-version>
Expand All @@ -61,36 +61,36 @@
<glassfish-jstl-version>3.0.1</glassfish-jstl-version>

<!-- JUnit and other test libraries -->
<junit-version>5.11.4</junit-version>
<junit-version>5.13.4</junit-version>
<hamcrest-version>3.0</hamcrest-version>
<mockito-version>5.15.2</mockito-version>
<mockito-version>5.19.0</mockito-version>
<openpojo.version>0.9.1</openpojo.version>
<jsonassert.version>1.5.3</jsonassert.version>
<xmlunit.version>2.10.0</xmlunit.version>
<xmlunit.version>2.10.3</xmlunit.version>

<!-- Spring -->
<spring.version>6.2.1</spring.version>
<spring-security.version>6.4.2</spring-security.version>
<spring.version>6.2.10</spring.version>
<spring-security.version>6.5.3</spring-security.version>

<jsoup.version>1.18.3</jsoup.version>
<jsoup.version>1.21.2</jsoup.version>
<rome.version>2.1.0</rome.version>
<jettison.version>1.5.4</jettison.version>

<dozer.version>6.5.2</dozer.version>
<dozer.version>7.0.0</dozer.version>
<device-detection.version>3.2.18.1</device-detection.version>

<jb-annotations.version>26.0.1</jb-annotations.version>
<jb-annotations.version>26.0.2-1</jb-annotations.version>
<jaxen.version>2.0.0</jaxen.version>
<jdom2.version>2.0.6.1</jdom2.version>

<ehcache.version>3.10.8</ehcache.version>
<ehcache-sizeof.version>0.4.4</ehcache-sizeof.version>
<cache-api.version>1.1.1</cache-api.version>

<commons-codec.version>1.17.2</commons-codec.version>
<commons-codec.version>1.19.0</commons-codec.version>

<fast-classpath-scanner.version>4.8.179</fast-classpath-scanner.version>
<gson.version>2.11.0</gson.version>
<fast-classpath-scanner.version>4.8.181</fast-classpath-scanner.version>
<gson.version>2.13.1</gson.version>
<jakarta.annotation.version>3.0.0</jakarta.annotation.version>
<jakarta.xml.ws-api.version>4.0.2</jakarta.xml.ws-api.version>
<jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
Expand Down Expand Up @@ -737,7 +737,7 @@
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio-jvm</artifactId>
<version>3.10.2</version>
<version>3.16.0</version>
</dependency>
<dependency>
<groupId>org.scala-lang.modules</groupId>
Expand All @@ -747,22 +747,17 @@
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
<version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-common</artifactId>
<version>2.1.0</version>
<version>2.2.10</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk7</artifactId>
<version>2.1.0</version>
<version>2.2.10</version>
</dependency>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>2.1.0</version>
<version>2.2.10</version>
</dependency>
<dependency>
<groupId>com.github.ua-parser</groupId>
Expand Down Expand Up @@ -878,17 +873,17 @@
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>2.3</version>
<version>2.5</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
<version>4.12.0</version>
<version>5.1.0</version>
</dependency>
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>logging-interceptor</artifactId>
<version>4.12.0</version>
<version>5.1.0</version>
</dependency>

<dependency>
Expand All @@ -899,12 +894,12 @@
<dependency>
<groupId>net.minidev</groupId>
<artifactId>json-smart</artifactId>
<version>2.5.2</version>
<version>2.6.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>3.1.10</version>
<version>3.1.11</version>
</dependency>

<dependency>
Expand Down