Skip to content

chore(samples/java): bump to Spring Boot 4.0.6, spring-dotenv 5.1.0, keytool 2.0.2 #145

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

Merged
ksroda-sa merged 3 commits into from
May 13, 2026
Merged

chore(samples/java): bump to Spring Boot 4.0.6, spring-dotenv 5.1.0, keytool 2.0.2 #145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ec70b58
chore(samples/java): bump to Spring Boot 4.0.6 + spring-dotenv 5.1.0 …
ksroda-sa May 6, 2026
37ea065
fix(snippets): correct ios lib_version drift
ksroda-sa May 6, 2026
5c56a97
Merge branch 'main' into chore/java-bump-spring-boot-4
ksroda-sa May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions samples/java/login-auth-code/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.1</version>
<version>4.0.6</version>
<relativePath/>
</parent>

Expand Down Expand Up @@ -35,15 +35,22 @@
</dependency>
<dependency>
<groupId>me.paulschwarz</groupId>
<artifactId>spring-dotenv</artifactId>
<version>4.0.0</version>
<artifactId>springboot4-dotenv</artifactId>
<version>5.1.0</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<!-- Spring Boot 4.0 split AutoConfigureMockMvc into a separate module
(spring-boot-webmvc-test) that's not pulled by spring-boot-starter-test. -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-webmvc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
Expand All @@ -60,7 +67,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>keytool-maven-plugin</artifactId>
<version>1.7</version>
<version>2.0.2</version>
<executions>
<execution>
<id>generate-dev-keystore</id>
Expand Down
2 changes: 1 addition & 1 deletion samples/java/login-auth-code/src/test/java/com/secureauth/quickstart/ApplicationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.springframework.security.oauth2.client.registration.ClientRegistrationRepository;
Expand Down
15 changes: 11 additions & 4 deletions samples/java/saml-sp-login/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.1</version>
<version>4.0.6</version>
<relativePath/>
</parent>

Expand Down Expand Up @@ -44,15 +44,22 @@
</dependency>
<dependency>
<groupId>me.paulschwarz</groupId>
<artifactId>spring-dotenv</artifactId>
<version>4.0.0</version>
<artifactId>springboot4-dotenv</artifactId>
<version>5.1.0</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<!-- Spring Boot 4.0 split AutoConfigureMockMvc into a separate module
(spring-boot-webmvc-test) that's not pulled by spring-boot-starter-test. -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-webmvc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
Expand All @@ -69,7 +76,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>keytool-maven-plugin</artifactId>
<version>1.7</version>
<version>2.0.2</version>
<executions>
<execution>
<id>generate-dev-keystore</id>
Expand Down
14 changes: 8 additions & 6 deletions samples/java/saml-sp-login/src/main/java/com/secureauth/quickstart/Application.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import org.springframework.security.saml2.core.Saml2ErrorCodes;
import org.springframework.security.saml2.core.Saml2ResponseValidatorResult;
import org.springframework.security.saml2.core.Saml2X509Credential;
import org.springframework.security.saml2.provider.service.authentication.OpenSaml4AuthenticationProvider;
import org.springframework.security.saml2.provider.service.authentication.OpenSaml5AuthenticationProvider;
import org.springframework.security.saml2.provider.service.authentication.Saml2AuthenticatedPrincipal;
import org.springframework.security.saml2.provider.service.registration.InMemoryRelyingPartyRegistrationRepository;
import org.springframework.security.saml2.provider.service.registration.RelyingPartyRegistration;
Expand Down Expand Up @@ -101,9 +101,9 @@ static class SecurityConfig {

@Bean
SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
OpenSaml4AuthenticationProvider provider = new OpenSaml4AuthenticationProvider();
Converter<OpenSaml4AuthenticationProvider.ResponseToken, Saml2ResponseValidatorResult> defaultValidator =
OpenSaml4AuthenticationProvider.createDefaultResponseValidator();
OpenSaml5AuthenticationProvider provider = new OpenSaml5AuthenticationProvider();
Converter<OpenSaml5AuthenticationProvider.ResponseToken, Saml2ResponseValidatorResult> defaultValidator =
OpenSaml5AuthenticationProvider.createDefaultResponseValidator();
provider.setResponseValidator(token -> {
Saml2ResponseValidatorResult result = defaultValidator.convert(token);
List<Saml2Error> filtered = result.getErrors().stream()
Expand Down Expand Up @@ -138,7 +138,7 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
}
}
final String expectedInResponseTo = assertionInResponseTo;
return OpenSaml4AuthenticationProvider.createDefaultAssertionValidatorWithParameters(
return OpenSaml5AuthenticationProvider.createDefaultAssertionValidatorWithParameters(
params -> {
params.put(
org.opensaml.saml.saml2.assertion.SAML2AssertionValidationParameters.SC_CHECK_ADDRESS,
Expand All @@ -162,7 +162,9 @@ SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
// requires POST + CSRF; for a quickstart we let a simple <a href="/logout">
// link work directly).
.logout(l -> l
.logoutRequestMatcher(new org.springframework.security.web.util.matcher.AntPathRequestMatcher("/logout"))
// Spring Security 7 dropped AntPathRequestMatcher; PathPatternRequestMatcher
// is the replacement. `.matcher(path)` (no HTTP method) matches any method.
.logoutRequestMatcher(org.springframework.security.web.servlet.util.matcher.PathPatternRequestMatcher.withDefaults().matcher("/logout"))
.logoutSuccessUrl("/"))
// Disable CSRF for the demo. SAML2 ACS endpoint is already exempt by the
// framework; this just removes the requirement on /logout. Production apps
Expand Down
2 changes: 1 addition & 1 deletion samples/java/saml-sp-login/src/test/java/com/secureauth/quickstart/ApplicationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import org.hamcrest.Matchers;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.springframework.security.saml2.provider.service.authentication.DefaultSaml2AuthenticatedPrincipal;
Expand Down
15 changes: 11 additions & 4 deletions samples/java/token-refresh/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>3.4.1</version>
<version>4.0.6</version>
<relativePath/>
</parent>

Expand Down Expand Up @@ -35,15 +35,22 @@
</dependency>
<dependency>
<groupId>me.paulschwarz</groupId>
<artifactId>spring-dotenv</artifactId>
<version>4.0.0</version>
<artifactId>springboot4-dotenv</artifactId>
<version>5.1.0</version>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
</dependency>
<!-- Spring Boot 4.0 split AutoConfigureMockMvc into a separate module
(spring-boot-webmvc-test) that's not pulled by spring-boot-starter-test. -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-webmvc-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
Expand All @@ -60,7 +67,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>keytool-maven-plugin</artifactId>
<version>1.7</version>
<version>2.0.2</version>
<executions>
<execution>
<id>generate-dev-keystore</id>
Expand Down
2 changes: 1 addition & 1 deletion samples/java/token-refresh/src/test/java/com/secureauth/quickstart/ApplicationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.annotation.Import;
import org.springframework.security.oauth2.client.OAuth2AuthorizedClient;
Expand Down
Loading