Skip to content

Commit f5eedda

Browse files
dxasupportdxasupport
authored
Merge pull request #221 from RWS/dependency-updates-Jan26
Dependency updates jan26
2 parents d287cc4 + d192652 commit f5eedda

3 files changed

Lines changed: 41 additions & 35 deletions

File tree

‎dxa-framework/dxa-common-api/src/main/java/com/sdl/webapp/common/impl/SpringConfiguration.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConverter;
2323
import org.springframework.http.converter.xml.SourceHttpMessageConverter;
2424
import org.springframework.util.ClassUtils;
25-
import org.springframework.web.servlet.config.annotation.ContentNegotiationConfigurer;
2625
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
2726
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
2827
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@@ -44,11 +43,6 @@ public class SpringConfiguration implements WebMvcConfigurer {
4443
@Autowired
4544
private ThreadLocalInterceptor threadLocalInterceptor = null;
4645

47-
@Override
48-
public void configureContentNegotiation(ContentNegotiationConfigurer configurer) {
49-
configurer.favorPathExtension(false);
50-
}
51-
5246
/**
5347
* {@inheritDoc}
5448
*/

‎dxa-webapp/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.sdl.dxa</groupId>
77
<artifactId>dxa-oss-parent</artifactId>
8-
<version>2.3.7-SNAPSHOT</version>
8+
<version>2.3.12-SNAPSHOT</version>
99
<relativePath>../pom.xml</relativePath>
1010
</parent>
1111

@@ -201,7 +201,7 @@
201201
<dependency>
202202
<groupId>com.sdl.dxa</groupId>
203203
<artifactId>dxa-oss-parent</artifactId>
204-
<version>2.3.7-SNAPSHOT</version>
204+
<version>2.3.12-SNAPSHOT</version>
205205
<type>pom</type>
206206
<scope>import</scope>
207207
</dependency>

‎pom.xml‎

Lines changed: 39 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -34,24 +34,25 @@
3434
<!-- /DXA Versions -->
3535

3636
<!-- Apache -->
37-
<commons-io-version>2.20.0</commons-io-version>
38-
<commons-lang3.version>3.18.0</commons-lang3.version>
39-
<commons-text.version>1.14.0</commons-text.version>
37+
<commons-io-version>2.21.0</commons-io-version>
38+
<commons-lang3.version>3.20.0</commons-lang3.version>
39+
<commons-text.version>1.15.0</commons-text.version>
4040
<commons-collections4.version>4.5.0</commons-collections4.version>
4141
<commons-compress.version>1.28.0</commons-compress.version>
4242
<httpcomponents-client-version>4.5.14</httpcomponents-client-version>
4343
<httpcomponents.core.version>4.4.16</httpcomponents.core.version>
4444

45-
<guava-version>33.4.8-jre</guava-version>
45+
<guava-version>33.5.0-jre</guava-version>
4646

4747
<!-- Joda Time -->
4848
<joda-time-version>2.14.0</joda-time-version>
4949

50-
<jackson.version>2.19.2</jackson.version>
51-
<lombok.version>1.18.38</lombok.version>
50+
<jackson.version>2.20.1</jackson.version>
51+
<jackson-annotations.version>2.20</jackson-annotations.version>
52+
<lombok.version>1.18.42</lombok.version>
5253

5354
<!-- Logging -->
54-
<logback.version>1.5.18</logback.version>
55+
<logback.version>1.5.24</logback.version>
5556
<slf4j-version>2.0.17</slf4j-version>
5657

5758
<!-- Servlet and JSP APIs -->
@@ -61,18 +62,18 @@
6162
<glassfish-jstl-version>3.0.1</glassfish-jstl-version>
6263

6364
<!-- JUnit and other test libraries -->
64-
<junit-version>5.13.4</junit-version>
65+
<junit-version>6.0.2</junit-version>
6566
<hamcrest-version>3.0</hamcrest-version>
66-
<mockito-version>5.19.0</mockito-version>
67+
<mockito-version>5.21.0</mockito-version>
6768
<openpojo.version>0.9.1</openpojo.version>
6869
<jsonassert.version>1.5.3</jsonassert.version>
69-
<xmlunit.version>2.10.3</xmlunit.version>
70+
<xmlunit.version>2.11.0</xmlunit.version>
7071

7172
<!-- Spring -->
72-
<spring.version>6.2.10</spring.version>
73-
<spring-security.version>6.5.3</spring-security.version>
73+
<spring.version>7.0.2</spring.version>
74+
<spring-security.version>7.0.2</spring-security.version>
7475

75-
<jsoup.version>1.21.2</jsoup.version>
76+
<jsoup.version>1.22.1</jsoup.version>
7677
<rome.version>2.1.0</rome.version>
7778
<jettison.version>1.5.4</jettison.version>
7879

@@ -83,18 +84,18 @@
8384
<jaxen.version>2.0.0</jaxen.version>
8485
<jdom2.version>2.0.6.1</jdom2.version>
8586

86-
<ehcache.version>3.10.8</ehcache.version>
87+
<ehcache.version>3.11.1</ehcache.version>
8788
<ehcache-sizeof.version>0.4.4</ehcache-sizeof.version>
8889
<cache-api.version>1.1.1</cache-api.version>
8990

9091
<commons-codec.version>1.19.0</commons-codec.version>
9192

92-
<fast-classpath-scanner.version>4.8.181</fast-classpath-scanner.version>
93-
<gson.version>2.13.1</gson.version>
93+
<fast-classpath-scanner.version>4.8.184</fast-classpath-scanner.version>
94+
<gson.version>2.13.2</gson.version>
9495
<jakarta.annotation.version>3.0.0</jakarta.annotation.version>
9596
<jakarta.xml.ws-api.version>4.0.2</jakarta.xml.ws-api.version>
96-
<jakarta.xml.bind-api.version>4.0.2</jakarta.xml.bind-api.version>
97-
<jakarta.activation.version>2.1.3</jakarta.activation.version>
97+
<jakarta.xml.bind-api.version>4.0.4</jakarta.xml.bind-api.version>
98+
<jakarta.activation.version>2.1.4</jakarta.activation.version>
9899
<jaxb-api.version>2.3.1</jaxb-api.version>
99100
<istack-commons-runtime.version>4.2.0</istack-commons-runtime.version>
100101
<fastInfoset-version>2.1.1</fastInfoset-version>
@@ -107,6 +108,7 @@
107108

108109
<pca-client.version>2.2.30</pca-client.version>
109110
<sitemapgen4j.version>1.1.2</sitemapgen4j.version>
111+
<activemq.version>6.2.0</activemq.version>
110112
</properties>
111113

112114
<scm>
@@ -350,6 +352,10 @@
350352
<groupId>javax.servlet</groupId>
351353
<artifactId>javax.servlet-api</artifactId>
352354
</exclusion>
355+
<exclusion>
356+
<groupId>org.ehcache</groupId>
357+
<artifactId>ehcache</artifactId>
358+
</exclusion>
353359
</exclusions>
354360
</dependency>
355361
<dependency>
@@ -362,6 +368,12 @@
362368
<artifactId>cil</artifactId>
363369
<version>${cd-cil.version}</version>
364370
<type>pom</type>
371+
<exclusions>
372+
<exclusion>
373+
<groupId>org.ehcache</groupId>
374+
<artifactId>ehcache</artifactId>
375+
</exclusion>
376+
</exclusions>
365377
</dependency>
366378

367379
<dependency>
@@ -641,7 +653,7 @@
641653
<dependency>
642654
<groupId>com.fasterxml.jackson.core</groupId>
643655
<artifactId>jackson-annotations</artifactId>
644-
<version>${jackson.version}</version>
656+
<version>${jackson-annotations.version}</version>
645657
</dependency>
646658
<dependency>
647659
<groupId>com.fasterxml.jackson.core</groupId>
@@ -726,7 +738,7 @@
726738
<dependency>
727739
<groupId>com.squareup.okio</groupId>
728740
<artifactId>okio-jvm</artifactId>
729-
<version>3.16.0</version>
741+
<version>3.16.4</version>
730742
</dependency>
731743
<dependency>
732744
<groupId>org.scala-lang.modules</groupId>
@@ -736,17 +748,17 @@
736748
<dependency>
737749
<groupId>org.jetbrains.kotlin</groupId>
738750
<artifactId>kotlin-stdlib</artifactId>
739-
<version>2.2.10</version>
751+
<version>2.3.0</version>
740752
</dependency>
741753
<dependency>
742754
<groupId>org.jetbrains.kotlin</groupId>
743755
<artifactId>kotlin-stdlib-jdk7</artifactId>
744-
<version>2.2.10</version>
756+
<version>2.3.0</version>
745757
</dependency>
746758
<dependency>
747759
<groupId>org.jetbrains.kotlin</groupId>
748760
<artifactId>kotlin-stdlib-jdk8</artifactId>
749-
<version>2.2.10</version>
761+
<version>2.3.0</version>
750762
</dependency>
751763
<dependency>
752764
<groupId>com.github.ua-parser</groupId>
@@ -867,12 +879,12 @@
867879
<dependency>
868880
<groupId>com.squareup.okhttp3</groupId>
869881
<artifactId>okhttp</artifactId>
870-
<version>5.1.0</version>
882+
<version>5.3.2</version>
871883
</dependency>
872884
<dependency>
873885
<groupId>com.squareup.okhttp3</groupId>
874886
<artifactId>logging-interceptor</artifactId>
875-
<version>5.1.0</version>
887+
<version>5.3.2</version>
876888
</dependency>
877889

878890
<dependency>
@@ -888,7 +900,7 @@
888900
<dependency>
889901
<groupId>org.glassfish.jersey.core</groupId>
890902
<artifactId>jersey-common</artifactId>
891-
<version>3.1.11</version>
903+
<version>4.0.0</version>
892904
</dependency>
893905

894906
<dependency>
@@ -900,7 +912,7 @@
900912
<dependency>
901913
<groupId>com.jayway.jsonpath</groupId>
902914
<artifactId>json-path</artifactId>
903-
<version>2.9.0</version>
915+
<version>2.10.0</version>
904916
</dependency>
905917

906918
</dependencies>

0 commit comments

Comments
 (0)