Skip to content

Commit 4e4437a

Browse files
bnasslahsenbnasslahsen
committed
Add support for Jakarta EE #1284 
1 parent a6db163 commit 4e4437a

File tree

2,857 files changed

+39729
-61703
lines changed

Some content is hidden

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

2,857 files changed

+39729
-61703
lines changed

Diff for: ‎CHANGELOG.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
222222
### Changed
223223
- Upgrade versions: swagger-ui to 3.42.0
224224
### Fixed
225-
- #1051 - IllegalStateException in org.springdoc.core.SpringDocConfiguration$OpenApiResourceAdvice.handleNoHandlerFound
225+
- #1051 - IllegalStateException in org.springdoc.core.configuration.SpringDocConfiguration$OpenApiResourceAdvice.handleNoHandlerFound
226226
- #1047 - swaggerWelcome `WebFluxProperties' that could not be found
227227

228228
## [1.5.3] - 2021-01-26

Diff for: ‎README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -56,12 +56,12 @@ This is a community-based project, not maintained by the Spring Framework Contri
5656
* `port`: The server port
5757
* `context-path`: The context path of the application
5858
* Documentation can be available in yaml format as well, on the following path: /v3/api-docs.yaml
59-
* Add the `springdoc-openapi-ui` library to the list of your project dependencies (No additional configuration is needed):
59+
* Add the `springdoc-openapi-starter-webmvc-ui` library to the list of your project dependencies (No additional configuration is needed):
6060

6161
```xml
6262
<dependency>
6363
<groupId>org.springdoc</groupId>
64-
<artifactId>springdoc-openapi-ui</artifactId>
64+
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
6565
<version>last-release-version</version>
6666
</dependency>
6767
```
@@ -94,7 +94,7 @@ springdoc.swagger-ui.path=/swagger-ui.html
9494
```xml
9595
<dependency>
9696
<groupId>org.springdoc</groupId>
97-
<artifactId>springdoc-openapi-webmvc-core</artifactId>
97+
<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
9898
<version>last-release-version</version>
9999
</dependency>
100100
```
@@ -127,7 +127,7 @@ To generate documentation automatically, make sure all the methods declare the H
127127
```xml
128128
<dependency>
129129
<groupId>org.springdoc</groupId>
130-
<artifactId>springdoc-openapi-webflux-ui</artifactId>
130+
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
131131
<version>last-release-version</version>
132132
</dependency>
133133
```

Diff for: ‎pom.xml

+34-67
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0"
2+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
24
<modelVersion>4.0.0</modelVersion>
35
<groupId>org.springdoc</groupId>
46
<artifactId>springdoc-openapi</artifactId>
@@ -11,7 +13,7 @@
1113
<parent>
1214
<groupId>org.springframework.boot</groupId>
1315
<artifactId>spring-boot-starter-parent</artifactId>
14-
<version>2.6.2</version>
16+
<version>3.0.0-M1</version>
1517
</parent>
1618

1719
<licenses>
@@ -50,18 +52,11 @@
5052
</distributionManagement>
5153

5254
<modules>
53-
<module>springdoc-openapi-common</module>
54-
<module>springdoc-openapi-webmvc-core</module>
55-
<module>springdoc-openapi-webflux-core</module>
56-
<module>springdoc-openapi-kotlin</module>
57-
<module>springdoc-openapi-hateoas</module>
58-
<module>springdoc-openapi-data-rest</module>
59-
<module>springdoc-openapi-security</module>
60-
<module>springdoc-openapi-groovy</module>
61-
<module>springdoc-openapi-ui</module>
62-
<module>springdoc-openapi-webflux-ui</module>
63-
<module>springdoc-openapi-javadoc</module>
64-
<module>springdoc-openapi-native</module>
55+
<module>springdoc-openapi-starter-common</module>
56+
<module>springdoc-openapi-starter-webmvc-api</module>
57+
<module>springdoc-openapi-starter-webflux-api</module>
58+
<module>springdoc-openapi-starter-webmvc-ui</module>
59+
<module>springdoc-openapi-starter-webflux-ui</module>
6560
</modules>
6661

6762
<properties>
@@ -70,24 +65,23 @@
7065
<nexus-staging-maven-plugin>1.6.8</nexus-staging-maven-plugin>
7166
<swagger-api.version>2.1.12</swagger-api.version>
7267
<swagger-ui.version>4.2.1</swagger-ui.version>
73-
<spring-security-oauth2.version>2.3.8.RELEASE</spring-security-oauth2.version>
7468
<classgraph.version>4.8.138</classgraph.version>
7569
<webjars-locator-core.version>0.45</webjars-locator-core.version>
76-
<gmavenplus-plugin.version>1.8.1</gmavenplus-plugin.version>
70+
<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
7771
<jaxb-impl.version>2.1</jaxb-impl.version>
7872
<javax.jws-api.version>1.1</javax.jws-api.version>
7973
<jjwt.version>0.9.1</jjwt.version>
8074
<spring-native.version>0.11.1</spring-native.version>
8175
<therapi-runtime-javadoc.version>0.13.0</therapi-runtime-javadoc.version>
82-
<spring-cloud.version>2021.0.0</spring-cloud.version>
76+
<spring-cloud-function.version>4.0.0-SNAPSHOT</spring-cloud-function.version>
8377
</properties>
8478

8579
<dependencyManagement>
8680
<dependencies>
8781
<!-- swagger dependencies -->
8882
<dependency>
8983
<groupId>io.swagger.core.v3</groupId>
90-
<artifactId>swagger-core</artifactId>
84+
<artifactId>swagger-core-jakarta</artifactId>
9185
<version>${swagger-api.version}</version>
9286
</dependency>
9387
<!-- swagger ui -->
@@ -107,11 +101,6 @@
107101
</exclusion>
108102
</exclusions>
109103
</dependency>
110-
<dependency>
111-
<groupId>org.springframework.security.oauth</groupId>
112-
<artifactId>spring-security-oauth2</artifactId>
113-
<version>${spring-security-oauth2.version}</version>
114-
</dependency>
115104
<dependency>
116105
<groupId>io.github.classgraph</groupId>
117106
<artifactId>classgraph</artifactId>
@@ -139,72 +128,36 @@
139128
<artifactId>spring-native</artifactId>
140129
<version>${spring-native.version}</version>
141130
</dependency>
142-
143131
<!-- SpringDoc -->
144132
<dependency>
145133
<groupId>org.springdoc</groupId>
146-
<artifactId>springdoc-openapi-common</artifactId>
134+
<artifactId>springdoc-openapi-starter-common</artifactId>
147135
<version>${project.version}</version>
148136
</dependency>
149137
<dependency>
150138
<groupId>org.springdoc</groupId>
151-
<artifactId>springdoc-openapi-webmvc-core</artifactId>
139+
<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
152140
<version>${project.version}</version>
153141
</dependency>
154142
<dependency>
155143
<groupId>org.springdoc</groupId>
156-
<artifactId>springdoc-openapi-webflux-core</artifactId>
144+
<artifactId>springdoc-openapi-starter-webflux-api</artifactId>
157145
<version>${project.version}</version>
158146
</dependency>
159147
<dependency>
160148
<groupId>org.springdoc</groupId>
161-
<artifactId>springdoc-openapi-kotlin</artifactId>
149+
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
162150
<version>${project.version}</version>
163151
</dependency>
164152
<dependency>
165153
<groupId>org.springdoc</groupId>
166-
<artifactId>springdoc-openapi-hateoas</artifactId>
167-
<version>${project.version}</version>
168-
</dependency>
169-
<dependency>
170-
<groupId>org.springdoc</groupId>
171-
<artifactId>springdoc-openapi-data-rest</artifactId>
172-
<version>${project.version}</version>
173-
</dependency>
174-
<dependency>
175-
<groupId>org.springdoc</groupId>
176-
<artifactId>springdoc-openapi-security</artifactId>
177-
<version>${project.version}</version>
178-
</dependency>
179-
<dependency>
180-
<groupId>org.springdoc</groupId>
181-
<artifactId>springdoc-openapi-groovy</artifactId>
182-
<version>${project.version}</version>
183-
</dependency>
184-
<dependency>
185-
<groupId>org.springdoc</groupId>
186-
<artifactId>springdoc-openapi-ui</artifactId>
187-
<version>${project.version}</version>
188-
</dependency>
189-
<dependency>
190-
<groupId>org.springdoc</groupId>
191-
<artifactId>springdoc-openapi-webflux-ui</artifactId>
192-
<version>${project.version}</version>
193-
</dependency>
194-
<dependency>
195-
<groupId>org.springdoc</groupId>
196-
<artifactId>springdoc-openapi-javadoc</artifactId>
197-
<version>${project.version}</version>
198-
</dependency>
199-
<dependency>
200-
<groupId>org.springdoc</groupId>
201-
<artifactId>springdoc-openapi-native</artifactId>
154+
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
202155
<version>${project.version}</version>
203156
</dependency>
204157
<dependency>
205158
<groupId>org.springframework.cloud</groupId>
206-
<artifactId>spring-cloud-dependencies</artifactId>
207-
<version>${spring-cloud.version}</version>
159+
<artifactId>spring-cloud-function-parent</artifactId>
160+
<version>${spring-cloud-function.version}</version>
208161
<type>pom</type>
209162
<scope>import</scope>
210163
</dependency>
@@ -236,6 +189,20 @@
236189
</build>
237190

238191
<profiles>
192+
<profile>
193+
<id>ci</id>
194+
<activation>
195+
<activeByDefault>true</activeByDefault>
196+
</activation>
197+
<modules>
198+
<module>springdoc-openapi-starter-common</module>
199+
<module>springdoc-openapi-starter-webmvc-api</module>
200+
<module>springdoc-openapi-starter-webflux-api</module>
201+
<module>springdoc-openapi-starter-webmvc-ui</module>
202+
<module>springdoc-openapi-starter-webflux-ui</module>
203+
<module>springdoc-openapi-tests</module>
204+
</modules>
205+
</profile>
239206
<profile>
240207
<id>gpg</id>
241208
<build>
@@ -264,7 +231,7 @@
264231
</execution>
265232
</executions>
266233
<configuration>
267-
<source>8</source>
234+
<source>17</source>
268235
</configuration>
269236
</plugin>
270237
<plugin>

Diff for: ‎springdoc-openapi-common/pom.xml

-61
This file was deleted.

0 commit comments

Comments
 (0)