Skip to content

Commit

Permalink
chore: Revert "[test PR]chore: test Spring boot 3.4 (#20008)" (#20229)
Browse files Browse the repository at this point in the history
* Revert "[test PR]chore: test Spring boot 3.4 (#20008)"

This reverts commit ca3c3e7.

* restore check for SB 3.4

anyMatch work for SB < 3.4, but will fail once we upgrade.
Keep the change, since it doesn't seem to cause any issues

---------

Co-authored-by: Marco Collovati <marco@vaadin.com>
  • Loading branch information
ZheSun88 and mcollovati authored Oct 14, 2024
1 parent 4924daa commit f9a3e73
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 19 deletions.
18 changes: 1 addition & 17 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
<failOnMissingWebXml>false</failOnMissingWebXml>

<!-- Dependencies -->
<spring.boot.version>3.4.0-M3</spring.boot.version>
<spring.boot.version>3.3.4</spring.boot.version>
<gwt.version>2.9.0</gwt.version>
<hibernate.validator.version>8.0.1.Final</hibernate.validator.version>
<slf4j.version>2.0.16</slf4j.version>
Expand Down Expand Up @@ -172,14 +172,6 @@
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>repository.spring.milestone</id>
<name>Spring Milestone Repository</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>

<pluginRepositories>
Expand All @@ -199,14 +191,6 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
<pluginRepository>
<id>repository.spring.milestone</id>
<name>Spring Milestone Repository</name>
<url>https://repo.spring.io/milestone</url>
<snapshots>
<enabled>true</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>

<dependencyManagement>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import jakarta.servlet.ServletContextListener;
import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.HandlesTypes;

import java.io.File;
import java.io.IOException;
import java.io.Serializable;
Expand Down Expand Up @@ -64,7 +65,6 @@
import com.vaadin.flow.di.LookupInitializer;
import com.vaadin.flow.internal.DevModeHandlerManager;
import com.vaadin.flow.router.HasErrorParameter;
import com.vaadin.flow.router.Layout;
import com.vaadin.flow.router.Route;
import com.vaadin.flow.router.RouteAlias;
import com.vaadin.flow.router.RouteConfiguration;
Expand All @@ -75,6 +75,7 @@
import com.vaadin.flow.server.RouteRegistry;
import com.vaadin.flow.server.VaadinServletContext;
import com.vaadin.flow.server.communication.IndexHtmlRequestHandler;
import com.vaadin.flow.router.Layout;
import com.vaadin.flow.server.startup.AbstractRouteRegistryInitializer;
import com.vaadin.flow.server.startup.AnnotationValidator;
import com.vaadin.flow.server.startup.ApplicationConfiguration;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@
@ExtendWith(SpringExtension.class)
@WebAppConfiguration
@WebMvcTest
@ContextConfiguration(classes = { SpringBootAutoConfiguration.class,
@ContextConfiguration(classes = { SecurityAutoConfiguration.class,
SpringBootAutoConfiguration.class,
SpringSecurityAutoConfiguration.class,
JwtStatelessAuthenticationTest.WorkaroundConfig.class,
JwtStatelessAuthenticationTest.SecurityConfig.class })
Expand Down

0 comments on commit f9a3e73

Please sign in to comment.