Skip to content

Commit 5fb3f7a

Browse files
bnasslahsenbnasslahsen
committed
Upgrade to:
- spring-boot 3.0.0-M5 - swagger-core 2.2.3 - webjars-locator-core 0.52 - spring-cloud-function 4.0.0-M5
1 parent 4137b67 commit 5fb3f7a

File tree

13 files changed

+80
-48
lines changed

13 files changed

+80
-48
lines changed

‎pom.xml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<parent>
1212
<groupId>org.springframework.boot</groupId>
1313
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>3.0.0-M4</version>
14+
<version>3.0.0-M5</version>
1515
</parent>
1616

1717
<licenses>
@@ -61,17 +61,16 @@
6161
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
6262
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
6363
<nexus-staging-maven-plugin>1.6.8</nexus-staging-maven-plugin>
64-
<swagger-api.version>2.2.2</swagger-api.version>
65-
<swagger-ui.version>4.14.0</swagger-ui.version>
64+
<swagger-api.version>2.2.3</swagger-api.version>
65+
<swagger-ui.version>4.14.3</swagger-ui.version>
6666
<classgraph.version>4.8.149</classgraph.version>
67-
<webjars-locator-core.version>0.50</webjars-locator-core.version>
67+
<webjars-locator-core.version>0.52</webjars-locator-core.version>
6868
<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
6969
<jaxb-impl.version>2.1</jaxb-impl.version>
7070
<javax.jws-api.version>1.1</javax.jws-api.version>
7171
<jjwt.version>0.9.1</jjwt.version>
72-
<spring-native.version>0.12.1</spring-native.version>
7372
<therapi-runtime-javadoc.version>0.15.0</therapi-runtime-javadoc.version>
74-
<spring-cloud-function.version>4.0.0-M3</spring-cloud-function.version>
73+
<spring-cloud-function.version>4.0.0-M5</spring-cloud-function.version>
7574
</properties>
7675

7776
<dependencyManagement>
@@ -125,11 +124,6 @@
125124
<version>${jjwt.version}</version>
126125
<scope>test</scope>
127126
</dependency>
128-
<dependency>
129-
<groupId>org.springframework.experimental</groupId>
130-
<artifactId>spring-native</artifactId>
131-
<version>${spring-native.version}</version>
132-
</dependency>
133127
<!-- spring Cloud -->
134128
<dependency>
135129
<groupId>org.springframework.cloud</groupId>
@@ -335,5 +329,13 @@
335329
<enabled>false</enabled>
336330
</snapshots>
337331
</pluginRepository>
332+
<pluginRepository>
333+
<id>spring-milestone</id>
334+
<name>Spring milestone</name>
335+
<url>https://repo.spring.io/milestone</url>
336+
<snapshots>
337+
<enabled>false</enabled>
338+
</snapshots>
339+
</pluginRepository>
338340
</pluginRepositories>
339341
</project>

‎springdoc-openapi-starter-common/pom.xml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,6 @@
7272
<artifactId>kotlinx-coroutines-reactor</artifactId>
7373
<scope>provided</scope>
7474
</dependency>
75-
<!-- Spring Native -->
76-
<dependency>
77-
<groupId>org.springframework.experimental</groupId>
78-
<artifactId>spring-native</artifactId>
79-
<optional>true</optional>
80-
</dependency>
8175
<!-- Spring Web /Data Rest/Hateoas && For Enhanced Pageable Support-->
8276
<dependency>
8377
<groupId>org.springframework.boot</groupId>

‎springdoc-openapi-starter-webmvc-api/src/test/resources/results/3.0.1/app26.json

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,12 +44,36 @@
4444
},
4545
"components": {
4646
"schemas": {
47+
"Bar": {
48+
"type": "object",
49+
"properties": {
50+
"bar": {
51+
"type": "string"
52+
}
53+
}
54+
},
55+
"Foo": {
56+
"type": "object",
57+
"properties": {
58+
"foo": {
59+
"type": "string"
60+
}
61+
}
62+
},
4763
"MyModel": {
4864
"type": "object",
4965
"properties": {
5066
"thing": {
5167
"type": "object",
52-
"description": "Hello"
68+
"description": "Hello",
69+
"oneOf": [
70+
{
71+
"$ref": "#/components/schemas/Foo"
72+
},
73+
{
74+
"$ref": "#/components/schemas/Bar"
75+
}
76+
]
5377
}
5478
}
5579
}

‎springdoc-openapi-starter-webmvc-ui/src/test/java/test/org/springdoc/ui/app11/WebSecurityConf.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package test.org.springdoc.ui.app11;
22

3+
import org.springframework.context.annotation.Configuration;
34
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
45
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
56
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
67
import org.springframework.security.web.csrf.CookieCsrfTokenRepository;
78

89
@EnableWebSecurity
10+
@Configuration
911
public class WebSecurityConf extends WebSecurityConfigurerAdapter {
1012

1113
@Override

‎springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/app301/SpringDocApp301Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void init() throws IllegalAccessException {
7272
}
7373

7474
@AfterEach
75-
private void clean() throws IllegalAccessException {
75+
void clean() throws IllegalAccessException {
7676
Field convertersField2 = FieldUtils.getDeclaredField(ObjectMapper.class, "_mixIns", true);
7777
SimpleMixInResolver _mixIns = (SimpleMixInResolver) convertersField2.get(objectMapperProvider.jsonMapper());
7878
Field convertersField3 = FieldUtils.getDeclaredField(SimpleMixInResolver.class, "_localMixIns", true);

‎springdoc-openapi-tests/springdoc-openapi-data-rest-tests/src/test/java/test/org/springdoc/api/app9/SpringDocApp9Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void init() throws IllegalAccessException {
7272
}
7373

7474
@AfterEach
75-
private void clean() throws IllegalAccessException {
75+
void clean() throws IllegalAccessException {
7676
Field convertersField2 = FieldUtils.getDeclaredField(ObjectMapper.class, "_mixIns", true);
7777
SimpleMixInResolver _mixIns = (SimpleMixInResolver) convertersField2.get(objectMapperProvider.jsonMapper());
7878
Field convertersField3 = FieldUtils.getDeclaredField(SimpleMixInResolver.class, "_localMixIns", true);

‎springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/app6/SpringDocApp6Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ void init() throws IllegalAccessException {
7373
}
7474

7575
@AfterEach
76-
private void clean() throws IllegalAccessException {
76+
void clean() throws IllegalAccessException {
7777
Field convertersField2 = FieldUtils.getDeclaredField(ObjectMapper.class, "_mixIns", true);
7878
SimpleMixInResolver _mixIns = (SimpleMixInResolver) convertersField2.get(objectMapperProvider.jsonMapper());
7979
Field convertersField3 = FieldUtils.getDeclaredField(SimpleMixInResolver.class, "_localMixIns", true);

‎springdoc-openapi-tests/springdoc-openapi-hateoas-tests/src/test/java/test/org/springdoc/api/app8/SpringDocApp8Test.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ void init() throws IllegalAccessException {
7272
}
7373

7474
@AfterEach
75-
private void clean() throws IllegalAccessException {
75+
void clean() throws IllegalAccessException {
7676
Field convertersField2 = FieldUtils.getDeclaredField(ObjectMapper.class, "_mixIns", true);
7777
SimpleMixInResolver _mixIns = (SimpleMixInResolver) convertersField2.get(objectMapperProvider.jsonMapper());
7878
Field convertersField3 = FieldUtils.getDeclaredField(SimpleMixInResolver.class, "_localMixIns", true);

‎springdoc-openapi-tests/springdoc-openapi-javadoc-tests/src/test/resources/results/app26.json

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,44 @@
5353
},
5454
"components": {
5555
"schemas": {
56+
"Bar": {
57+
"type": "object",
58+
"properties": {
59+
"bar": {
60+
"type": "string",
61+
"description": "The Bar."
62+
}
63+
},
64+
"description": "The type Bar."
65+
},
66+
"Foo": {
67+
"type": "object",
68+
"properties": {
69+
"foo": {
70+
"type": "string",
71+
"description": "The Foo."
72+
}
73+
},
74+
"description": "The type Foo."
75+
},
5676
"MyModel": {
5777
"type": "object",
5878
"properties": {
5979
"thing": {
6080
"type": "object",
61-
"description": "Hello"
81+
"description": "Hello",
82+
"oneOf": [
83+
{
84+
"$ref": "#/components/schemas/Foo"
85+
},
86+
{
87+
"$ref": "#/components/schemas/Bar"
88+
}
89+
]
6290
}
6391
},
6492
"description": "The type My model."
6593
}
6694
}
6795
}
68-
}
96+
}

‎springdoc-openapi-tests/springdoc-openapi-native-tests/pom.xml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,34 +7,11 @@
77
<modelVersion>4.0.0</modelVersion>
88
<artifactId>springdoc-openapi-native-tests</artifactId>
99
<dependencies>
10-
<dependency>
11-
<groupId>org.springframework.experimental</groupId>
12-
<artifactId>spring-native</artifactId>
13-
<scope>test</scope>
14-
</dependency>
1510
<dependency>
1611
<groupId>org.springdoc</groupId>
1712
<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
1813
<version>${project.version}</version>
1914
<scope>test</scope>
2015
</dependency>
2116
</dependencies>
22-
<build>
23-
<plugins>
24-
<plugin>
25-
<groupId>org.springframework.experimental</groupId>
26-
<artifactId>spring-aot-maven-plugin</artifactId>
27-
<version>${spring-native.version}</version>
28-
<!-- TODO, waiting for spring-native compatibility with spring-boot 3.0.0-M1-->
29-
<!-- executions>
30-
<execution>
31-
<id>test-generate</id>
32-
<goals>
33-
<goal>test-generate</goal>
34-
</goals>
35-
</execution>
36-
</executions -->
37-
</plugin>
38-
</plugins>
39-
</build>
4017
</project>

‎springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/app6/security/WebSecurity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424

2525
import org.springframework.beans.factory.annotation.Autowired;
2626
import org.springframework.context.annotation.Bean;
27+
import org.springframework.context.annotation.Configuration;
2728
import org.springframework.core.annotation.Order;
2829
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
2930
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -38,7 +39,7 @@
3839

3940
import static org.springdoc.core.utils.Constants.ALL_PATTERN;
4041

41-
42+
@Configuration
4243
@EnableWebSecurity
4344
@Order(200)
4445
public class WebSecurity extends WebSecurityConfigurerAdapter {

‎springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/app8/security/WebConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package test.org.springdoc.api.app8.security;
22

3+
import org.springframework.context.annotation.Configuration;
34
import org.springframework.core.annotation.Order;
45
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
56
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
67
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
78

9+
@Configuration
810
@EnableWebSecurity
911
@Order(200)
1012
public class WebConfig extends WebSecurityConfigurerAdapter {

‎springdoc-openapi-tests/springdoc-openapi-security-tests/src/test/java/test/org/springdoc/api/app9/WebConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package test.org.springdoc.api.app9;
22

3+
import org.springframework.context.annotation.Configuration;
34
import org.springframework.core.annotation.Order;
45
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
56
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
67
import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
78

9+
@Configuration
810
@EnableWebSecurity
911
@Order(200)
1012
public class WebConfig extends WebSecurityConfigurerAdapter {

0 commit comments

Comments
 (0)