Skip to content

Commit ab9fc59

Browse files
wing328wing328
committed
remove springFox from kotlins spring templates
1 parent afd974b commit ab9fc59

5 files changed

Lines changed: 22 additions & 47 deletions

File tree

‎modules/openapi-generator/src/main/resources/kotlin-spring/homeController.mustache‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ class HomeController {
3939
{{#sourceDocumentationProvider}}
4040
private val apiDocsPath = "/openapi.json"
4141
{{/sourceDocumentationProvider}}
42-
{{#springFoxDocumentationProvider}}
43-
private val apiDocsPath = "/v2/api-docs"
44-
{{/springFoxDocumentationProvider}}
4542
{{/springDocDocumentationProvider}}
4643
{{/useSwaggerUI}}
4744
{{#sourceDocumentationProvider}}

‎modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom-sb3.mustache‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
<version>{{artifactVersion}}</version>
88
<properties>{{#reactive}}
99
<kotlinx-coroutines.version>1.6.1</kotlinx-coroutines.version>{{/reactive}}{{#springDocDocumentationProvider}}{{#useSwaggerUI}}
10-
<springdoc-openapi.version>2.2.0</springdoc-openapi.version>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#springFoxDocumentationProvider}}
11-
<springfox-swagger2.version>2.9.2</springfox-swagger2.version>{{/springFoxDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
12-
<swagger-ui.version>5.3.1</swagger-ui.version>{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springFoxDocumentationProvider}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}}
10+
<springdoc-openapi.version>2.2.0</springdoc-openapi.version>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
11+
<swagger-ui.version>5.3.1</swagger-ui.version>{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}}
1312
<swagger-annotations.version>1.6.6</swagger-annotations.version>{{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}
14-
<swagger-annotations.version>2.2.15</swagger-annotations.version>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}}
13+
<swagger-annotations.version>2.2.15</swagger-annotations.version>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}
1514
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
1615
<jakarta-annotation.version>2.1.0</jakarta-annotation.version>
1716
<kotlin-test-junit5.version>1.7.10</kotlin-test-junit5.version>
@@ -145,13 +144,7 @@
145144
<groupId>org.springdoc</groupId>
146145
<artifactId>springdoc-openapi-{{#reactive}}webflux{{/reactive}}{{^reactive}}webmvc{{/reactive}}-core</artifactId>
147146
<version>${springdoc-openapi.version}</version>
148-
</dependency>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#springFoxDocumentationProvider}}
149-
<!--SpringFox dependencies -->
150-
<dependency>
151-
<groupId>io.springfox</groupId>
152-
<artifactId>springfox-swagger2</artifactId>
153-
<version>${springfox-swagger2.version}</version>
154-
</dependency>{{/springFoxDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
147+
</dependency>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
155148
<dependency>
156149
<groupId>org.webjars</groupId>
157150
<artifactId>swagger-ui</artifactId>
@@ -160,7 +153,7 @@
160153
<dependency>
161154
<groupId>org.webjars</groupId>
162155
<artifactId>webjars-locator-core</artifactId>
163-
</dependency>{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springFoxDocumentationProvider}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}}
156+
</dependency>{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}}
164157
<dependency>
165158
<groupId>io.swagger</groupId>
166159
<artifactId>swagger-annotations</artifactId>
@@ -170,7 +163,7 @@
170163
<groupId>io.swagger.core.v3</groupId>
171164
<artifactId>swagger-annotations</artifactId>
172165
<version>${swagger-annotations.version}</version>
173-
</dependency>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}}
166+
</dependency>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}
174167

175168
<!-- @Nullable annotation -->
176169
<dependency>

‎modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache‎

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
<version>{{artifactVersion}}</version>
88
<properties>{{#reactive}}
99
<kotlinx-coroutines.version>1.6.1</kotlinx-coroutines.version>{{/reactive}}{{#springDocDocumentationProvider}}{{#useSwaggerUI}}
10-
<springdoc-openapi.version>1.6.8</springdoc-openapi.version>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#springFoxDocumentationProvider}}
11-
<springfox-swagger2.version>2.9.2</springfox-swagger2.version>{{/springFoxDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
12-
<swagger-ui.version>4.10.3</swagger-ui.version>{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springFoxDocumentationProvider}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}}
10+
<springdoc-openapi.version>1.6.8</springdoc-openapi.version>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
11+
<swagger-ui.version>4.10.3</swagger-ui.version>{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}}
1312
<swagger-annotations.version>1.6.6</swagger-annotations.version>{{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}
14-
<swagger-annotations.version>2.2.0</swagger-annotations.version>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}}
13+
<swagger-annotations.version>2.2.0</swagger-annotations.version>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}
1514
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
1615
<javax-annotation.version>1.3.2</javax-annotation.version>
1716
<kotlin-test-junit5.version>1.6.21</kotlin-test-junit5.version>
@@ -132,13 +131,7 @@
132131
<groupId>org.springdoc</groupId>
133132
<artifactId>springdoc-openapi-{{#reactive}}webflux{{/reactive}}{{^reactive}}webmvc{{/reactive}}-core</artifactId>
134133
<version>${springdoc-openapi.version}</version>
135-
</dependency>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#springFoxDocumentationProvider}}
136-
<!--SpringFox dependencies -->
137-
<dependency>
138-
<groupId>io.springfox</groupId>
139-
<artifactId>springfox-swagger2</artifactId>
140-
<version>${springfox-swagger2.version}</version>
141-
</dependency>{{/springFoxDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
134+
</dependency>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
142135
<dependency>
143136
<groupId>org.webjars</groupId>
144137
<artifactId>swagger-ui</artifactId>
@@ -147,7 +140,7 @@
147140
<dependency>
148141
<groupId>org.webjars</groupId>
149142
<artifactId>webjars-locator-core</artifactId>
150-
</dependency>{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springFoxDocumentationProvider}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}}
143+
</dependency>{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}}
151144
<dependency>
152145
<groupId>io.swagger</groupId>
153146
<artifactId>swagger-annotations</artifactId>
@@ -157,7 +150,7 @@
157150
<groupId>io.swagger.core.v3</groupId>
158151
<artifactId>swagger-annotations</artifactId>
159152
<version>${swagger-annotations.version}</version>
160-
</dependency>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}}
153+
</dependency>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}
161154

162155
<!-- @Nullable annotation -->
163156
<dependency>

‎modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-cloud/pom.mustache‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@
77
<version>{{artifactVersion}}</version>
88
<properties>{{#reactive}}
99
<kotlinx-coroutines.version>1.6.1</kotlinx-coroutines.version>{{/reactive}}{{#springDocDocumentationProvider}}{{#useSwaggerUI}}
10-
<springdoc-openapi.version>1.6.8</springdoc-openapi.version>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#springFoxDocumentationProvider}}
11-
<springfox-swagger2.version>2.9.2</springfox-swagger2.version>{{/springFoxDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
12-
<swagger-ui.version>4.10.3</swagger-ui.version>{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springFoxDocumentationProvider}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}}
10+
<springdoc-openapi.version>1.6.8</springdoc-openapi.version>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
11+
<swagger-ui.version>4.10.3</swagger-ui.version>{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}}
1312
<swagger-annotations.version>1.6.6</swagger-annotations.version>{{/swagger1AnnotationLibrary}}{{#swagger2AnnotationLibrary}}
14-
<swagger-annotations.version>2.2.0</swagger-annotations.version>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}}
13+
<swagger-annotations.version>2.2.0</swagger-annotations.version>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}
1514
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
1615
<javax-annotation.version>1.3.2</javax-annotation.version>
1716
<kotlin-test-junit5.version>1.6.21</kotlin-test-junit5.version>
@@ -138,13 +137,7 @@
138137
<groupId>org.springdoc</groupId>
139138
<artifactId>springdoc-openapi-{{#reactive}}webflux{{/reactive}}{{^reactive}}webmvc{{/reactive}}-core</artifactId>
140139
<version>${springdoc-openapi.version}</version>
141-
</dependency>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#springFoxDocumentationProvider}}
142-
<!--SpringFox dependencies -->
143-
<dependency>
144-
<groupId>io.springfox</groupId>
145-
<artifactId>springfox-swagger2</artifactId>
146-
<version>${springfox-swagger2.version}</version>
147-
</dependency>{{/springFoxDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
140+
</dependency>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
148141
<dependency>
149142
<groupId>org.webjars</groupId>
150143
<artifactId>swagger-ui</artifactId>
@@ -153,7 +146,7 @@
153146
<dependency>
154147
<groupId>org.webjars</groupId>
155148
<artifactId>webjars-locator-core</artifactId>
156-
</dependency>{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springFoxDocumentationProvider}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}}
149+
</dependency>{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}}
157150
<dependency>
158151
<groupId>io.swagger</groupId>
159152
<artifactId>swagger-annotations</artifactId>
@@ -163,7 +156,7 @@
163156
<groupId>io.swagger.core.v3</groupId>
164157
<artifactId>swagger-annotations</artifactId>
165158
<version>${swagger-annotations.version}</version>
166-
</dependency>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}{{/springFoxDocumentationProvider}}
159+
</dependency>{{/swagger2AnnotationLibrary}}{{/springDocDocumentationProvider}}
167160

168161
<!-- @Nullable annotation -->
169162
<dependency>
@@ -200,12 +193,13 @@
200193
<groupId>com.fasterxml.jackson.module</groupId>
201194
<artifactId>jackson-module-kotlin</artifactId>
202195
</dependency>
203-
{{#useBeanValidation}}
196+
{{#useBeanValidation}}
204197
<!-- Bean Validation API support -->
205198
<dependency>
206199
<groupId>javax.validation</groupId>
207200
<artifactId>validation-api</artifactId>
208-
</dependency>{{/useBeanValidation}}
201+
</dependency>
202+
{{/useBeanValidation}}
209203
<dependency>
210204
<groupId>javax.annotation</groupId>
211205
<artifactId>javax.annotation-api</artifactId>

‎modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-declarative-http-interface/pom-sb3.mustache‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
<kotlinx-coroutines.version>1.6.1
1111
</kotlinx-coroutines.version>{{/reactive}}{{#springDocDocumentationProvider}}{{#useSwaggerUI}}
1212
<springdoc-openapi.version>2.2.0
13-
</springdoc-openapi.version>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}
14-
<springfox-swagger2.version>2.9.2
15-
</springfox-swagger2.version>{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
13+
</springdoc-openapi.version>{{/useSwaggerUI}}{{/springDocDocumentationProvider}}{{#useSwaggerUI}}{{^springDocDocumentationProvider}}
1614
<swagger-ui.version>5.3.1
1715
</swagger-ui.version>{{/springDocDocumentationProvider}}{{/useSwaggerUI}}{{^springDocDocumentationProvider}}{{#swagger1AnnotationLibrary}}
1816
<swagger-annotations.version>1.6.6

0 commit comments

Comments
 (0)