Skip to content

Commit 73eb107

Browse files
authored
chore!: Upgrade to Spring Boot 3 RC2 (#15098)
As Spring Boot now uses Tomcat 10.1, we cannot mix Jetty 11 (servlet 5) and Tomcat 10.1 (servlet 6) in the same test modules so they are all run with Jetty 11 for now.
1 parent f5bb060 commit 73eb107

9 files changed

Lines changed: 33 additions & 52 deletions

File tree

‎flow-commons-upload/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
<dependency>
2020
<groupId>jakarta.servlet</groupId>
2121
<artifactId>jakarta.servlet-api</artifactId>
22+
<scope>provided</scope>
2223
</dependency>
2324
</dependencies>
2425
<build>

‎flow-lit-template/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>jakarta.servlet</groupId>
4040
<artifactId>jakarta.servlet-api</artifactId>
41-
<scope>test</scope>
41+
<scope>provided</scope>
4242
</dependency>
4343

4444
<dependency>

‎flow-plugins/flow-plugin-base/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<dependency>
4545
<groupId>jakarta.servlet</groupId>
4646
<artifactId>jakarta.servlet-api</artifactId>
47+
<scope>provided</scope>
4748
</dependency>
4849
<dependency>
4950
<groupId>com.vaadin</groupId>

‎flow-polymer-template/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>jakarta.servlet</groupId>
4040
<artifactId>jakarta.servlet-api</artifactId>
41-
<scope>test</scope>
41+
<scope>provided</scope>
4242
</dependency>
4343

4444
<dependency>

‎flow-server/src/test/java/com/vaadin/flow/server/MockServletContext.java‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -138,38 +138,6 @@ public RequestDispatcher getNamedDispatcher(String name) {
138138
return null;
139139
}
140140

141-
/*
142-
* (non-Javadoc)
143-
*
144-
* @see jakarta.servlet.ServletContext#getServlet(java.lang.String)
145-
*/
146-
@Override
147-
public Servlet getServlet(String name) throws ServletException {
148-
return null;
149-
}
150-
151-
/*
152-
* (non-Javadoc)
153-
*
154-
* @see jakarta.servlet.ServletContext#getServlets()
155-
*/
156-
@Override
157-
@SuppressWarnings({ "rawtypes", "unchecked" })
158-
public Enumeration getServlets() {
159-
return Collections.enumeration(Collections.EMPTY_SET);
160-
}
161-
162-
/*
163-
* (non-Javadoc)
164-
*
165-
* @see jakarta.servlet.ServletContext#getServletNames()
166-
*/
167-
@Override
168-
@SuppressWarnings({ "rawtypes", "unchecked" })
169-
public Enumeration getServletNames() {
170-
return null;
171-
}
172-
173141
/*
174142
* (non-Javadoc)
175143
*
@@ -179,16 +147,6 @@ public Enumeration getServletNames() {
179147
public void log(String msg) {
180148
}
181149

182-
/*
183-
* (non-Javadoc)
184-
*
185-
* @see jakarta.servlet.ServletContext#log(java.lang.Exception,
186-
* java.lang.String)
187-
*/
188-
@Override
189-
public void log(Exception exception, String msg) {
190-
}
191-
192150
/*
193151
* (non-Javadoc)
194152
*

‎flow-tests/test-memory-leaks/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
<dependency>
5757
<groupId>jakarta.servlet</groupId>
5858
<artifactId>jakarta.servlet-api</artifactId>
59+
<scope>provided</scope>
5960
</dependency>
6061
</dependencies>
6162

‎flow-tests/vaadin-spring-tests/test-spring-boot-only-prepare/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,16 @@
3737
<dependency>
3838
<groupId>org.springframework.boot</groupId>
3939
<artifactId>spring-boot-starter-web</artifactId>
40+
<exclusions>
41+
<exclusion>
42+
<groupId>org.springframework.boot</groupId>
43+
<artifactId>spring-boot-starter-tomcat</artifactId>
44+
</exclusion>
45+
</exclusions>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.springframework.boot</groupId>
49+
<artifactId>spring-boot-starter-jetty</artifactId>
4050
</dependency>
4151

4252
<dependency>

‎flow-tests/vaadin-spring-tests/test-spring-boot/pom.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,16 @@
3737
<dependency>
3838
<groupId>org.springframework.boot</groupId>
3939
<artifactId>spring-boot-starter-web</artifactId>
40+
<exclusions>
41+
<exclusion>
42+
<groupId>org.springframework.boot</groupId>
43+
<artifactId>spring-boot-starter-tomcat</artifactId>
44+
</exclusion>
45+
</exclusions>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.springframework.boot</groupId>
49+
<artifactId>spring-boot-starter-jetty</artifactId>
4050
</dependency>
4151

4252
<dependency>

‎pom.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,18 +85,18 @@
8585
<failOnMissingWebXml>false</failOnMissingWebXml>
8686

8787
<!-- Dependencies -->
88-
<spring.version>6.0.0-RC2</spring.version>
89-
<spring.boot.version>3.0.0-RC1</spring.boot.version>
90-
<spring.security.version>6.0.0-RC1</spring.security.version>
88+
<spring.version>6.0.0-RC4</spring.version>
89+
<spring.boot.version>3.0.0-RC2</spring.boot.version>
90+
<spring.security.version>6.0.0-RC2</spring.security.version>
9191
<spring.security.oauth2.authorization.server.version>1.0.0-RC1</spring.security.oauth2.authorization.server.version>
9292
<gwt.version>2.9.0</gwt.version>
93-
<hibernate.validator.version>7.0.5.Final</hibernate.validator.version>
93+
<hibernate.validator.version>8.0.0.Final</hibernate.validator.version>
9494
<slf4j.version>2.0.3</slf4j.version>
9595
<polymer.version>2.6.1</polymer.version>
96-
<jackson.version>2.14.0-rc2</jackson.version>
97-
<jackson.databind.version>2.14.0-rc2</jackson.databind.version>
96+
<jackson.version>2.14.0</jackson.version>
97+
<jackson.databind.version>2.14.0</jackson.databind.version>
9898
<jakarta.validation.version>3.0.2</jakarta.validation.version>
99-
<jakarta.annotation.api.version>2.0.0</jakarta.annotation.api.version>
99+
<jakarta.annotation.api.version>2.1.1</jakarta.annotation.api.version>
100100
<jaxb.version>4.0.1</jaxb.version>
101101

102102
<!-- Plugins -->
@@ -235,7 +235,7 @@
235235
<dependency>
236236
<groupId>jakarta.servlet</groupId>
237237
<artifactId>jakarta.servlet-api</artifactId>
238-
<version>5.0.0</version>
238+
<version>6.0.0</version>
239239
</dependency>
240240

241241
<dependency>

0 commit comments

Comments
 (0)