From c1e1ea93f1de6e63cd04053a77cb3af3326e64dc Mon Sep 17 00:00:00 2001 From: Josh Cummings <3627351+jzheaux@users.noreply.github.com> Date: Fri, 15 Aug 2025 14:51:42 -0600 Subject: [PATCH 1/3] Disable Test Issue gh-17747 PR gh-17724 --- .../web/configurers/NamespaceHttpInterceptUrlTests.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpInterceptUrlTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpInterceptUrlTests.java index 5cce20088e..697ee1f91c 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpInterceptUrlTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/NamespaceHttpInterceptUrlTests.java @@ -16,6 +16,7 @@ package org.springframework.security.config.annotation.web.configurers; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -85,6 +86,7 @@ public void authenticatedRequestWhenAuthorizedThenBehaviorMatchesNamespace() thr } @Test + @Disabled // see https://github.com/spring-projects/spring-security/issues/17747 public void requestWhenMappedByPostInterceptUrlThenBehaviorMatchesNamespace() throws Exception { this.spring.register(HttpInterceptUrlConfig.class, BaseController.class).autowire(); MockHttpServletRequestBuilder getWithUser = get("/admin/post").with(authentication(user("ROLE_USER"))); From 6cb14e6503b7d175f6eea85f574ca5015c9d5c64 Mon Sep 17 00:00:00 2001 From: Josh Cummings <3627351+jzheaux@users.noreply.github.com> Date: Fri, 15 Aug 2025 15:06:33 -0600 Subject: [PATCH 2/3] Isolate AOT Test to Security Components PR gh-17724 --- .../aot/EnableMethodSecurityAotTests.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/aot/EnableMethodSecurityAotTests.java b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/aot/EnableMethodSecurityAotTests.java index e0b63abd2d..78fd41048e 100644 --- a/config/src/test/java/org/springframework/security/config/annotation/method/configuration/aot/EnableMethodSecurityAotTests.java +++ b/config/src/test/java/org/springframework/security/config/annotation/method/configuration/aot/EnableMethodSecurityAotTests.java @@ -18,6 +18,8 @@ import javax.sql.DataSource; +import jakarta.persistence.EntityManager; +import org.jspecify.annotations.NonNull; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -29,7 +31,7 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.aot.ApplicationContextAotGenerator; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; +import org.springframework.data.jpa.repository.support.JpaRepositoryFactoryBean; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; @@ -72,7 +74,6 @@ private static String cglibClassName(Class clazz) { @Configuration @EnableMethodSecurity - @EnableJpaRepositories static class AppConfig { @Bean @@ -92,6 +93,14 @@ LocalContainerEntityManagerFactoryBean entityManagerFactory() { return factory; } + @Bean + JpaRepositoryFactoryBean<@NonNull MessageRepository, Message, Long> repo(EntityManager entityManager) { + JpaRepositoryFactoryBean<@NonNull MessageRepository, Message, Long> bean = new JpaRepositoryFactoryBean<>( + MessageRepository.class); + bean.setEntityManager(entityManager); + return bean; + } + } } From a9728f83d9d86a302fba59c746977bd4c8b99dea Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Aug 2025 22:11:27 +0000 Subject: [PATCH 3/3] Bump org.springframework:spring-framework-bom from 7.0.0-M7 to 7.0.0-M8 Bumps [org.springframework:spring-framework-bom](https://github.com/spring-projects/spring-framework) from 7.0.0-M7 to 7.0.0-M8. - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v7.0.0-M7...v7.0.0-M8) --- updated-dependencies: - dependency-name: org.springframework:spring-framework-bom dependency-version: 7.0.0-M8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 75549647e3..e9b1bc4783 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ org-jetbrains-kotlin = "2.2.0" org-jetbrains-kotlinx = "1.10.2" org-mockito = "5.17.0" org-opensaml5 = "5.1.5" -org-springframework = "7.0.0-M7" +org-springframework = "7.0.0-M8" [libraries] ch-qos-logback-logback-classic = "ch.qos.logback:logback-classic:1.5.18"