Skip to content

Commit f889d1c

Browse files
authored
JAVA-39447: Changes made for upgrade the log-mdc module spring 5 to spring 6 (#18908)
1 parent d132810 commit f889d1c

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

logging-modules/log-mdc/pom.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
<version>${spring.version}</version>
2828
</dependency>
2929
<dependency>
30-
<groupId>javax.servlet</groupId>
31-
<artifactId>javax.servlet-api</artifactId>
32-
<version>${javax.servlet-api.version}</version>
30+
<groupId>jakarta.servlet</groupId>
31+
<artifactId>jakarta.servlet-api</artifactId>
32+
<version>${jakarta.servlet-api.version}</version>
3333
<scope>provided</scope>
3434
</dependency>
3535
<dependency>
@@ -97,7 +97,8 @@
9797
<disruptor.version>3.3.6</disruptor.version>
9898
<jbosslogging.version>3.3.0.Final</jbosslogging.version>
9999
<maven-war-plugin.version>3.3.2</maven-war-plugin.version>
100-
<spring.version>5.3.28</spring.version>
100+
<spring.version>6.0.11</spring.version>
101+
<jakarta.servlet-api.version>6.0.0</jakarta.servlet-api.version>
101102
</properties>
102103

103104
</project>

logging-modules/log-mdc/src/main/java/com/baeldung/config/AppConfiguration.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
import org.springframework.context.annotation.Configuration;
55
import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer;
66
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
7-
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
7+
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
88

99
@Configuration
1010
@EnableWebMvc
1111
@ComponentScan(basePackages = "com.baeldung")
12-
public class AppConfiguration extends WebMvcConfigurerAdapter {
12+
public class AppConfiguration implements WebMvcConfigurer {
1313

14-
@Override
1514
public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
1615
configurer.enable();
1716
}

logging-modules/log-mdc/src/main/java/com/baeldung/config/AppInitializer.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.baeldung.config;
22

3-
import javax.servlet.ServletContext;
4-
import javax.servlet.ServletException;
3+
import jakarta.servlet.ServletContext;
4+
import jakarta.servlet.ServletException;
55

66
import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
77

0 commit comments

Comments
 (0)