Skip to content
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

Jump to bottom

chore: Upgrade to Spring Boot 3 RC2 #15098

Merged
merged 4 commits into from
Nov 11, 2022
Merged

chore: Upgrade to Spring Boot 3 RC2 #15098

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1976968
chore: Upgrade to Spring Boot 3 RC2
Artur- Nov 9, 2022
b331d9c
Use servlet 6
Artur- Nov 11, 2022
c5144d6
Run Spring Boot tests with Jetty as they include Jetty dependencies t…
Artur- Nov 11, 2022
831fb9d
Run in Jetty for now
Artur- Nov 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions flow-commons-upload/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 1 addition & 1 deletion flow-lit-template/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>test</scope>
<scope>provided</scope>
</dependency>

<dependency>
Expand Down
1 change: 1 addition & 0 deletions flow-plugins/flow-plugin-base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.vaadin</groupId>
Expand Down
2 changes: 1 addition & 1 deletion flow-polymer-template/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>test</scope>
<scope>provided</scope>
</dependency>

<dependency>
Expand Down
42 changes: 0 additions & 42 deletions flow-server/src/test/java/com/vaadin/flow/server/MockServletContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,38 +138,6 @@ public RequestDispatcher getNamedDispatcher(String name) {
return null;
}

/*
* (non-Javadoc)
*
* @see jakarta.servlet.ServletContext#getServlet(java.lang.String)
*/
@Override
public Servlet getServlet(String name) throws ServletException {
return null;
}

/*
* (non-Javadoc)
*
* @see jakarta.servlet.ServletContext#getServlets()
*/
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public Enumeration getServlets() {
return Collections.enumeration(Collections.EMPTY_SET);
}

/*
* (non-Javadoc)
*
* @see jakarta.servlet.ServletContext#getServletNames()
*/
@Override
@SuppressWarnings({ "rawtypes", "unchecked" })
public Enumeration getServletNames() {
return null;
}

/*
* (non-Javadoc)
*
Expand All @@ -179,16 +147,6 @@ public Enumeration getServletNames() {
public void log(String msg) {
}

/*
* (non-Javadoc)
*
* @see jakarta.servlet.ServletContext#log(java.lang.Exception,
* java.lang.String)
*/
@Override
public void log(Exception exception, String msg) {
}

/*
* (non-Javadoc)
*
Expand Down
1 change: 1 addition & 0 deletions flow-tests/test-memory-leaks/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>

Expand Down
16 changes: 8 additions & 8 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,18 +85,18 @@
<failOnMissingWebXml>false</failOnMissingWebXml>

<!-- Dependencies -->
<spring.version>6.0.0-RC2</spring.version>
<spring.boot.version>3.0.0-RC1</spring.boot.version>
<spring.security.version>6.0.0-RC1</spring.security.version>
<spring.version>6.0.0-RC4</spring.version>
<spring.boot.version>3.0.0-RC2</spring.boot.version>
<spring.security.version>6.0.0-RC2</spring.security.version>
<spring.security.oauth2.authorization.server.version>1.0.0-RC1</spring.security.oauth2.authorization.server.version>
<gwt.version>2.9.0</gwt.version>
<hibernate.validator.version>7.0.5.Final</hibernate.validator.version>
<hibernate.validator.version>8.0.0.Final</hibernate.validator.version>
<slf4j.version>2.0.3</slf4j.version>
<polymer.version>2.6.1</polymer.version>
<jackson.version>2.14.0-rc2</jackson.version>
<jackson.databind.version>2.14.0-rc2</jackson.databind.version>
<jackson.version>2.14.0</jackson.version>
<jackson.databind.version>2.14.0</jackson.databind.version>
<jakarta.validation.version>3.0.2</jakarta.validation.version>
<jakarta.annotation.api.version>2.0.0</jakarta.annotation.api.version>
<jakarta.annotation.api.version>2.1.1</jakarta.annotation.api.version>
<jaxb.version>4.0.1</jaxb.version>

<!-- Plugins -->
Expand Down Expand Up @@ -235,7 +235,7 @@
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>5.0.0</version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI: This comment is probably really important for you guys as well: spring-projects/spring-framework#29435 (comment)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you see any need for servlet 5 support instead of going to servlet 6?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We (my company) probably have to go to Servlet 6 now as well, because of SB 3.0 and the EoL Announcement of Tomcat 10.0.x but I'm not sure what the best base-line would be for Vaadin to be honest - you have a little more servlet container / application server to consider. Like Jürgen said in the mentioned comment in the Spring Framework, Jetty 12 isn't GA at and therefore Jetty 11 still uses Servlet 5

<version>6.0.0</version>
</dependency>

<dependency>
Expand Down