Skip to content

Commit 1b89697

Browse files
ikulikovikulikov
committed
Version 2.4.0TB
1 parent 47d6665 commit 1b89697

File tree

48 files changed

+395
-123
lines changed

Some content is hidden

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

48 files changed

+395
-123
lines changed

‎pom.xml

+33-38
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
3-
<groupId>org.springdoc</groupId>
3+
<groupId>org.thingsboard</groupId>
44
<artifactId>springdoc-openapi</artifactId>
5-
<version>2.4.0</version>
5+
<version>2.4.0TB</version>
66
<packaging>pom</packaging>
77
<name>Spring openapi documentation</name>
88
<description>Spring openapi documentation</description>
@@ -21,30 +21,42 @@
2121
</license>
2222
</licenses>
2323

24+
<organization>
25+
<name>ThingsBoard</name>
26+
<url>https://thingsboard.io/</url>
27+
</organization>
28+
2429
<developers>
2530
<developer>
2631
<name>Badr NASS LAHSEN</name>
2732
<email>support@springdoc.org</email>
2833
<organization>springdoc</organization>
2934
<organizationUrl>https://springdoc.org/</organizationUrl>
3035
</developer>
36+
<developer>
37+
<id>ikulikov</id>
38+
<name>Igor Kulikov</name>
39+
<email>ikulikov@thingsboard.io</email>
40+
<organization>ThingsBoard</organization>
41+
<organizationUrl>https://thingsboard.io/</organizationUrl>
42+
</developer>
3143
</developers>
3244

3345
<scm>
34-
<url>git@github.com:springdoc/springdoc-openapi.git</url>
35-
<connection>scm:git:git@github.com:springdoc/springdoc-openapi.git</connection>
36-
<developerConnection>scm:git:git@github.com:springdoc/springdoc-openapi.git
46+
<url>git@github.com:thingsboard/springdoc-openapi.git</url>
47+
<connection>scm:git:git@github.com:thingsboard/springdoc-openapi.git</connection>
48+
<developerConnection>scm:git:git@github.com:thingsboard/springdoc-openapi.git
3749
</developerConnection>
38-
<tag>v2.4.0</tag>
50+
<tag>v2.4.0TB</tag>
3951
</scm>
4052
<distributionManagement>
4153
<snapshotRepository>
4254
<id>ossrh</id>
43-
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
55+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
4456
</snapshotRepository>
4557
<repository>
4658
<id>ossrh</id>
47-
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
59+
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2</url>
4860
</repository>
4961
</distributionManagement>
5062

@@ -54,14 +66,15 @@
5466
<module>springdoc-openapi-starter-webflux-api</module>
5567
<module>springdoc-openapi-starter-webmvc-ui</module>
5668
<module>springdoc-openapi-starter-webflux-ui</module>
69+
<module>springdoc-swagger-ui</module>
5770
</modules>
5871

5972
<properties>
6073
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
6174
<maven-release-plugin.version>2.5.3</maven-release-plugin.version>
6275
<nexus-staging-maven-plugin>1.6.8</nexus-staging-maven-plugin>
6376
<swagger-api.version>2.2.20</swagger-api.version>
64-
<swagger-ui.version>5.11.8</swagger-ui.version>
77+
<swagger-ui.version>5.12.0TB</swagger-ui.version>
6578
<gmavenplus-plugin.version>1.13.1</gmavenplus-plugin.version>
6679
<jaxb-impl.version>2.1</jaxb-impl.version>
6780
<javax.jws-api.version>1.1</javax.jws-api.version>
@@ -79,12 +92,6 @@
7992
<artifactId>swagger-core-jakarta</artifactId>
8093
<version>${swagger-api.version}</version>
8194
</dependency>
82-
<!-- swagger ui -->
83-
<dependency>
84-
<groupId>org.webjars</groupId>
85-
<artifactId>swagger-ui</artifactId>
86-
<version>${swagger-ui.version}</version>
87-
</dependency>
8895
<dependency>
8996
<groupId>javax.xml</groupId>
9097
<artifactId>jaxb-impl</artifactId>
@@ -125,30 +132,36 @@
125132
</dependency>
126133
<!-- SpringDoc -->
127134
<dependency>
128-
<groupId>org.springdoc</groupId>
135+
<groupId>org.thingsboard</groupId>
129136
<artifactId>springdoc-openapi-starter-common</artifactId>
130137
<version>${project.version}</version>
131138
</dependency>
132139
<dependency>
133-
<groupId>org.springdoc</groupId>
140+
<groupId>org.thingsboard</groupId>
134141
<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
135142
<version>${project.version}</version>
136143
</dependency>
137144
<dependency>
138-
<groupId>org.springdoc</groupId>
145+
<groupId>org.thingsboard</groupId>
139146
<artifactId>springdoc-openapi-starter-webflux-api</artifactId>
140147
<version>${project.version}</version>
141148
</dependency>
142149
<dependency>
143-
<groupId>org.springdoc</groupId>
150+
<groupId>org.thingsboard</groupId>
144151
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
145152
<version>${project.version}</version>
146153
</dependency>
147154
<dependency>
148-
<groupId>org.springdoc</groupId>
155+
<groupId>org.thingsboard</groupId>
149156
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
150157
<version>${project.version}</version>
151158
</dependency>
159+
<!-- swagger ui -->
160+
<dependency>
161+
<groupId>org.thingsboard</groupId>
162+
<artifactId>springdoc-swagger-ui</artifactId>
163+
<version>${project.version}</version>
164+
</dependency>
152165
</dependencies>
153166
</dependencyManagement>
154167
<dependencies>
@@ -264,24 +277,6 @@
264277
</execution>
265278
</executions>
266279
</plugin>
267-
<plugin>
268-
<groupId>org.sonatype.plugins</groupId>
269-
<artifactId>nexus-staging-maven-plugin</artifactId>
270-
<version>${nexus-staging-maven-plugin}</version>
271-
<extensions>true</extensions>
272-
<configuration>
273-
<serverId>ossrh</serverId>
274-
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
275-
<autoReleaseAfterClose>true</autoReleaseAfterClose>
276-
</configuration>
277-
<dependencies>
278-
<dependency>
279-
<groupId>com.thoughtworks.xstream</groupId>
280-
<artifactId>xstream</artifactId>
281-
<version>1.4.15</version>
282-
</dependency>
283-
</dependencies>
284-
</plugin>
285280
<plugin>
286281
<artifactId>maven-release-plugin</artifactId>
287282
<version>${maven-release-plugin.version}</version>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
33
<parent>
4-
<groupId>org.springdoc</groupId>
4+
<groupId>org.thingsboard</groupId>
55
<artifactId>springdoc-openapi</artifactId>
6-
<version>2.4.0</version>
6+
<version>2.4.0TB</version>
77
</parent>
88
<artifactId>springdoc-openapi-starter-common</artifactId>
99
<dependencies>
@@ -93,7 +93,7 @@
9393
<configuration>
9494
<archive>
9595
<manifestEntries>
96-
<Automatic-Module-Name>org.springdoc.openapi.common
96+
<Automatic-Module-Name>org.thingsboard.openapi.common
9797
</Automatic-Module-Name>
9898
</manifestEntries>
9999
</archive>

‎springdoc-openapi-starter-common/src/main/java/org/springdoc/core/utils/PropertyResolverUtils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public String resolve(String parameterProperty, Locale locale) {
100100
result = factory.resolveEmbeddedValue(parameterProperty);
101101
}
102102
catch (IllegalArgumentException ex) {
103-
LOGGER.warn(ex.getMessage());
103+
LOGGER.trace(ex.getMessage());
104104
}
105105
}
106106
return result;

‎springdoc-openapi-starter-webflux-api/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
33
<parent>
4-
<groupId>org.springdoc</groupId>
4+
<groupId>org.thingsboard</groupId>
55
<artifactId>springdoc-openapi</artifactId>
6-
<version>2.4.0</version>
6+
<version>2.4.0TB</version>
77
</parent>
88
<artifactId>springdoc-openapi-starter-webflux-api</artifactId>
99
<dependencies>
1010
<!-- springdoc-common -->
1111
<dependency>
12-
<groupId>org.springdoc</groupId>
12+
<groupId>org.thingsboard</groupId>
1313
<artifactId>springdoc-openapi-starter-common</artifactId>
1414
<version>${project.version}</version>
1515
</dependency>
@@ -43,7 +43,7 @@
4343
<configuration>
4444
<archive>
4545
<manifestEntries>
46-
<Automatic-Module-Name>org.springdoc.openapi.webflux.core
46+
<Automatic-Module-Name>org.thingsboard.openapi.webflux.core
4747
</Automatic-Module-Name>
4848
</manifestEntries>
4949
</archive>

‎springdoc-openapi-starter-webflux-ui/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
33
<parent>
4-
<groupId>org.springdoc</groupId>
4+
<groupId>org.thingsboard</groupId>
55
<artifactId>springdoc-openapi</artifactId>
6-
<version>2.4.0</version>
6+
<version>2.4.0TB</version>
77
</parent>
88
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
99
<dependencies>
1010
<!-- springdoc-core -->
1111
<dependency>
12-
<groupId>org.springdoc</groupId>
12+
<groupId>org.thingsboard</groupId>
1313
<artifactId>springdoc-openapi-starter-webflux-api</artifactId>
1414
<version>${project.version}</version>
1515
</dependency>
1616
<!-- swagger-ui dependencies -->
1717
<dependency>
18-
<groupId>org.webjars</groupId>
19-
<artifactId>swagger-ui</artifactId>
18+
<groupId>org.thingsboard</groupId>
19+
<artifactId>springdoc-swagger-ui</artifactId>
2020
</dependency>
2121
<!-- Actuator dependencies -->
2222
<dependency>
@@ -38,7 +38,7 @@
3838
<configuration>
3939
<archive>
4040
<manifestEntries>
41-
<Automatic-Module-Name>org.springdoc.openapi.webflux.ui
41+
<Automatic-Module-Name>org.thingsboard.openapi.webflux.ui
4242
</Automatic-Module-Name>
4343
</manifestEntries>
4444
</archive>

‎springdoc-openapi-starter-webflux-ui/src/test/resources/results/index1

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ window.onload = function() {
1111
SwaggerUIStandalonePreset
1212
],
1313
plugins: [
14-
SwaggerUIBundle.plugins.DownloadUrl
14+
SwaggerUIBundle.plugins.DownloadUrl,
15+
SwaggerUIBundle.plugins.HttpLoginAuth
1516
],
1617
layout: "StandaloneLayout" ,
1718

‎springdoc-openapi-starter-webflux-ui/src/test/resources/results/index1-configurl

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ window.onload = function() {
1111
SwaggerUIStandalonePreset
1212
],
1313
plugins: [
14-
SwaggerUIBundle.plugins.DownloadUrl
14+
SwaggerUIBundle.plugins.DownloadUrl,
15+
SwaggerUIBundle.plugins.HttpLoginAuth
1516
],
1617
layout: "StandaloneLayout" ,
1718

‎springdoc-openapi-starter-webflux-ui/src/test/resources/results/index1-default

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ window.onload = function() {
1111
SwaggerUIStandalonePreset
1212
],
1313
plugins: [
14-
SwaggerUIBundle.plugins.DownloadUrl
14+
SwaggerUIBundle.plugins.DownloadUrl,
15+
SwaggerUIBundle.plugins.HttpLoginAuth
1516
],
1617
layout: "StandaloneLayout" ,
1718

‎springdoc-openapi-starter-webflux-ui/src/test/resources/results/index1-filter

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ window.onload = function() {
1111
SwaggerUIStandalonePreset
1212
],
1313
plugins: [
14-
SwaggerUIBundle.plugins.DownloadUrl
14+
SwaggerUIBundle.plugins.DownloadUrl,
15+
SwaggerUIBundle.plugins.HttpLoginAuth
1516
],
1617
layout: "StandaloneLayout" ,
1718

‎springdoc-openapi-starter-webflux-ui/src/test/resources/results/index1-layout

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ window.onload = function() {
1111
SwaggerUIStandalonePreset
1212
],
1313
plugins: [
14-
SwaggerUIBundle.plugins.DownloadUrl
14+
SwaggerUIBundle.plugins.DownloadUrl,
15+
SwaggerUIBundle.plugins.HttpLoginAuth
1516
],
1617
layout: "BaseLayout" ,
1718

‎springdoc-openapi-starter-webflux-ui/src/test/resources/results/index3

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ window.onload = function() {
1111
SwaggerUIStandalonePreset
1212
],
1313
plugins: [
14-
SwaggerUIBundle.plugins.DownloadUrl
14+
SwaggerUIBundle.plugins.DownloadUrl,
15+
SwaggerUIBundle.plugins.HttpLoginAuth
1516
],
1617
layout: "StandaloneLayout" ,
1718

‎springdoc-openapi-starter-webflux-ui/src/test/resources/results/index5

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ window.onload = function() {
1111
SwaggerUIStandalonePreset
1212
],
1313
plugins: [
14-
SwaggerUIBundle.plugins.DownloadUrl
14+
SwaggerUIBundle.plugins.DownloadUrl,
15+
SwaggerUIBundle.plugins.HttpLoginAuth
1516
],
1617
layout: "StandaloneLayout" ,
1718

‎springdoc-openapi-starter-webflux-ui/src/test/resources/results/index6

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ window.onload = function() {
1111
SwaggerUIStandalonePreset
1212
],
1313
plugins: [
14-
SwaggerUIBundle.plugins.DownloadUrl
14+
SwaggerUIBundle.plugins.DownloadUrl,
15+
SwaggerUIBundle.plugins.HttpLoginAuth
1516
],
1617
layout: "StandaloneLayout" ,
1718

‎springdoc-openapi-starter-webflux-ui/src/test/resources/results/index7

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ window.onload = function() {
1111
SwaggerUIStandalonePreset
1212
],
1313
plugins: [
14-
SwaggerUIBundle.plugins.DownloadUrl
14+
SwaggerUIBundle.plugins.DownloadUrl,
15+
SwaggerUIBundle.plugins.HttpLoginAuth
1516
],
1617
layout: "StandaloneLayout" ,
1718

‎springdoc-openapi-starter-webmvc-api/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<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">
22
<modelVersion>4.0.0</modelVersion>
33
<parent>
4-
<groupId>org.springdoc</groupId>
4+
<groupId>org.thingsboard</groupId>
55
<artifactId>springdoc-openapi</artifactId>
6-
<version>2.4.0</version>
6+
<version>2.4.0TB</version>
77
</parent>
88
<artifactId>springdoc-openapi-starter-webmvc-api</artifactId>
99
<dependencies>
1010
<!-- springdoc-common -->
1111
<dependency>
12-
<groupId>org.springdoc</groupId>
12+
<groupId>org.thingsboard</groupId>
1313
<artifactId>springdoc-openapi-starter-common</artifactId>
1414
<version>${project.version}</version>
1515
</dependency>
@@ -47,7 +47,7 @@
4747
<configuration>
4848
<archive>
4949
<manifestEntries>
50-
<Automatic-Module-Name>org.springdoc.openapi.webmvc.core
50+
<Automatic-Module-Name>org.thingsboard.openapi.webmvc.core
5151
</Automatic-Module-Name>
5252
</manifestEntries>
5353
</archive>

0 commit comments

Comments
 (0)