Skip to content

Commit 6d85e53

Browse files
ch4mpych4mpy
committed
Boot 4.0.0-RC1
1 parent 9146877 commit 6d85e53

File tree

78 files changed

+947
-1000
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+947
-1000
lines changed

‎pom.xml‎

Lines changed: 7 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-starter-parent</artifactId>
7-
<version>4.0.0-M1</version>
7+
<version>4.0.0-RC1</version>
88
</parent>
99
<groupId>com.c4-soft.springaddons</groupId>
1010
<artifactId>spring-addons</artifactId>
@@ -57,10 +57,10 @@
5757
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
5858
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
5959

60-
<maven-gpg-plugin.version>3.2.7</maven-gpg-plugin.version>
60+
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
6161
<nexus-staging-maven-plugin.version>1.7.0</nexus-staging-maven-plugin.version>
6262

63-
<sonar-maven-plugin.version>5.1.0.4751</sonar-maven-plugin.version>
63+
<sonar-maven-plugin.version>5.2.0.4988</sonar-maven-plugin.version>
6464

6565
<spring-boot.version>${project.parent.version}</spring-boot.version>
6666

@@ -70,11 +70,11 @@
7070
<integration-tests.hostname>${env.HOSTNAME}</integration-tests.hostname>
7171
<integration-tests.scheme>https</integration-tests.scheme>
7272

73-
<springdoc-openapi.version>2.8.8</springdoc-openapi.version>
74-
<springdoc-openapi-maven-plugin.version>1.4</springdoc-openapi-maven-plugin.version>
73+
<springdoc-openapi.version>3.0.0-M1</springdoc-openapi.version>
74+
<springdoc-openapi-maven-plugin.version>1.5</springdoc-openapi-maven-plugin.version>
7575

76-
<wiremock-spring-boot.version>3.10.0</wiremock-spring-boot.version>
77-
<openapi-generator-maven-plugin.version>7.13.0</openapi-generator-maven-plugin.version>
76+
<wiremock-spring-boot.version>3.10.6</wiremock-spring-boot.version>
77+
<openapi-generator-maven-plugin.version>7.16.0</openapi-generator-maven-plugin.version>
7878

7979
<repackage.classifier />
8080
<image.builder>paketobuildpacks/builder:tiny</image.builder>
@@ -142,83 +142,6 @@
142142
</dependencies>
143143
</dependencyManagement>
144144

145-
<repositories>
146-
<repository>
147-
<id>spring-snapshots</id>
148-
<name>Spring Snapshots</name>
149-
<url>https://repo.spring.io/snapshot</url>
150-
<snapshots>
151-
<enabled>true</enabled>
152-
<updatePolicy>always</updatePolicy>
153-
</snapshots>
154-
<releases>
155-
<enabled>false</enabled>
156-
<updatePolicy>never</updatePolicy>
157-
</releases>
158-
</repository>
159-
<repository>
160-
<id>spring-milestones</id>
161-
<name>Spring Milestones</name>
162-
<url>https://repo.spring.io/milestone</url>
163-
<snapshots>
164-
<enabled>true</enabled>
165-
</snapshots>
166-
<releases>
167-
<enabled>true</enabled>
168-
</releases>
169-
</repository>
170-
<repository>
171-
<id>repository.spring.release</id>
172-
<name>Spring GA Repository</name>
173-
<url>http://repo.spring.io/release</url>
174-
<snapshots>
175-
<enabled>false</enabled>
176-
</snapshots>
177-
<releases>
178-
<enabled>true</enabled>
179-
<updatePolicy>never</updatePolicy>
180-
</releases>
181-
</repository>
182-
</repositories>
183-
<pluginRepositories>
184-
<pluginRepository>
185-
<id>spring-snapshots</id>
186-
<name>Spring Snapshots</name>
187-
<url>https://repo.spring.io/plugins-snapshot</url>
188-
<snapshots>
189-
<enabled>true</enabled>
190-
<updatePolicy>always</updatePolicy>
191-
</snapshots>
192-
<releases>
193-
<enabled>true</enabled>
194-
<updatePolicy>never</updatePolicy>
195-
</releases>
196-
</pluginRepository>
197-
<pluginRepository>
198-
<id>spring-milestones</id>
199-
<name>Spring Milestones</name>
200-
<url>https://repo.spring.io/plugins-milestone</url>
201-
<snapshots>
202-
<enabled>true</enabled>
203-
</snapshots>
204-
<releases>
205-
<enabled>true</enabled>
206-
</releases>
207-
</pluginRepository>
208-
<pluginRepository>
209-
<id>repository.spring.release</id>
210-
<name>Spring GA Repository</name>
211-
<url>http://repo.spring.io/plugins-release</url>
212-
<snapshots>
213-
<enabled>false</enabled>
214-
</snapshots>
215-
<releases>
216-
<enabled>true</enabled>
217-
<updatePolicy>never</updatePolicy>
218-
</releases>
219-
</pluginRepository>
220-
</pluginRepositories>
221-
222145
<build>
223146
<pluginManagement>
224147
<plugins>

‎samples/oauth2-bff-reactive/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
<!-- OAuth2 -->
2626
<dependency>
2727
<groupId>org.springframework.boot</groupId>
28-
<artifactId>spring-boot-starter-oauth2-client</artifactId>
28+
<artifactId>spring-boot-starter-security-oauth2-client</artifactId>
2929
</dependency>
3030
<dependency>
3131
<groupId>org.springframework.boot</groupId>
32-
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
32+
<artifactId>spring-boot-starter-security-oauth2-resource-server</artifactId>
3333
</dependency>
3434
<dependency>
3535
<groupId>com.c4-soft.springaddons</groupId>

‎samples/oauth2-bff-servlet/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@
2525
<!-- OAuth2 -->
2626
<dependency>
2727
<groupId>org.springframework.boot</groupId>
28-
<artifactId>spring-boot-starter-oauth2-client</artifactId>
28+
<artifactId>spring-boot-starter-security-oauth2-client</artifactId>
2929
</dependency>
3030
<dependency>
3131
<groupId>org.springframework.boot</groupId>
32-
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
32+
<artifactId>spring-boot-starter-security-oauth2-resource-server</artifactId>
3333
</dependency>
3434
<dependency>
3535
<groupId>com.c4-soft.springaddons</groupId>

‎samples/springdoc-openapi-2494-servlet/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</dependency>
1919
<dependency>
2020
<groupId>org.springframework.boot</groupId>
21-
<artifactId>spring-boot-starter-web</artifactId>
21+
<artifactId>spring-boot-starter-webmvc</artifactId>
2222
</dependency>
2323
<dependency>
2424
<groupId>org.springdoc</groupId>

‎samples/tutorials/reactive-client/pom.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</dependency>
1919
<dependency>
2020
<groupId>org.springframework.boot</groupId>
21-
<artifactId>spring-boot-starter-oauth2-client</artifactId>
21+
<artifactId>spring-boot-starter-security-oauth2-client</artifactId>
2222
</dependency>
2323
<dependency>
2424
<groupId>org.springframework.boot</groupId>
@@ -49,9 +49,14 @@
4949
<artifactId>spring-boot-starter-test</artifactId>
5050
<scope>test</scope>
5151
</dependency>
52+
<dependency>
53+
<groupId>org.springframework.boot</groupId>
54+
<artifactId>spring-boot-webflux-test</artifactId>
55+
<scope>test</scope>
56+
</dependency>
5257
<dependency>
53-
<groupId>org.springframework.security</groupId>
54-
<artifactId>spring-security-test</artifactId>
58+
<groupId>org.springframework.boot</groupId>
59+
<artifactId>spring-boot-starter-security-test</artifactId>
5560
<scope>test</scope>
5661
</dependency>
5762
<dependency>

‎samples/tutorials/reactive-client/src/test/java/com/c4soft/springaddons/tutorials/ReactiveClientApplicationTest.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
import java.util.List;
55
import java.util.Map;
66
import java.util.stream.Stream;
7-
87
import org.junit.jupiter.api.Test;
98
import org.junit.jupiter.params.ParameterizedTest;
109
import org.junit.jupiter.params.provider.MethodSource;
1110
import org.springframework.beans.factory.annotation.Autowired;
12-
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
1311
import org.springframework.boot.test.context.SpringBootTest;
1412
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
13+
import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
1514
import org.springframework.context.annotation.Import;
1615
import org.springframework.security.authentication.AnonymousAuthenticationToken;
1716
import org.springframework.security.core.authority.AuthorityUtils;
@@ -24,7 +23,6 @@
2423
import org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers;
2524
import org.springframework.security.test.web.reactive.server.SecurityMockServerConfigurers.OidcLoginMutator;
2625
import org.springframework.test.web.reactive.server.WebTestClient;
27-
2826
import com.c4_soft.springaddons.security.oauth2.test.annotations.OpenIdClaims;
2927
import com.c4_soft.springaddons.security.oauth2.test.annotations.WithOidcLogin;
3028
import com.c4_soft.springaddons.security.oauth2.test.annotations.parameterized.OidcLoginAuthenticationSource;

‎samples/tutorials/reactive-client/src/test/java/com/c4soft/springaddons/tutorials/TestSecurityConf.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@
33
import static org.mockito.ArgumentMatchers.anyString;
44
import static org.mockito.Mockito.mock;
55
import static org.mockito.Mockito.when;
6-
76
import java.util.ArrayList;
8-
97
import org.springframework.boot.test.context.TestConfiguration;
108
import org.springframework.context.annotation.Bean;
119
import org.springframework.security.oauth2.client.registration.ClientRegistration;
1210
import org.springframework.security.oauth2.client.registration.InMemoryReactiveClientRegistrationRepository;
1311
import org.springframework.security.oauth2.core.AuthorizationGrantType;
14-
1512
import reactor.core.publisher.Mono;
1613

1714
@TestConfiguration

‎samples/tutorials/reactive-resource-server/pom.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<dependencies>
1414
<dependency>
1515
<groupId>org.springframework.boot</groupId>
16-
<artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
16+
<artifactId>spring-boot-starter-security-oauth2-resource-server</artifactId>
1717
</dependency>
1818
<dependency>
1919
<groupId>org.springframework.boot</groupId>
@@ -40,9 +40,14 @@
4040
<artifactId>spring-boot-starter-test</artifactId>
4141
<scope>test</scope>
4242
</dependency>
43+
<dependency>
44+
<groupId>org.springframework.boot</groupId>
45+
<artifactId>spring-boot-webflux-test</artifactId>
46+
<scope>test</scope>
47+
</dependency>
4348
<dependency>
44-
<groupId>org.springframework.security</groupId>
45-
<artifactId>spring-security-test</artifactId>
49+
<groupId>org.springframework.boot</groupId>
50+
<artifactId>spring-boot-starter-security-test</artifactId>
4651
<scope>test</scope>
4752
</dependency>
4853
<dependency>

‎samples/tutorials/reactive-resource-server/src/test/java/com/c4soft/springaddons/tutorials/GreetingControllerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.junit.jupiter.params.ParameterizedTest;
1010
import org.junit.jupiter.params.provider.MethodSource;
1111
import org.springframework.beans.factory.annotation.Autowired;
12-
import org.springframework.boot.test.autoconfigure.web.reactive.WebFluxTest;
12+
import org.springframework.boot.webflux.test.autoconfigure.WebFluxTest;
1313
import org.springframework.context.annotation.Import;
1414
import org.springframework.core.convert.converter.Converter;
1515
import org.springframework.security.authentication.AbstractAuthenticationToken;

‎samples/tutorials/reactive-resource-server/src/test/java/com/c4soft/springaddons/tutorials/ReactiveResourceServerApplicationTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
import org.junit.jupiter.params.ParameterizedTest;
1010
import org.junit.jupiter.params.provider.MethodSource;
1111
import org.springframework.beans.factory.annotation.Autowired;
12-
import org.springframework.boot.test.autoconfigure.web.reactive.AutoConfigureWebTestClient;
1312
import org.springframework.boot.test.context.SpringBootTest;
1413
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
14+
import org.springframework.boot.webtestclient.AutoConfigureWebTestClient;
1515
import org.springframework.core.convert.converter.Converter;
1616
import org.springframework.security.authentication.AbstractAuthenticationToken;
1717
import org.springframework.security.authentication.AnonymousAuthenticationToken;

0 commit comments

Comments
 (0)