Skip to content

Commit 2a4c1d6

Browse files
authored
Remove maven kotlin client tests (already tests in CI) (#23346)
* remove maven kotlin client tests (already tests in CI) * update spring test * use jdk17 * update
1 parent 9cc0a2b commit 2a4c1d6

File tree

4 files changed

+53
-265
lines changed

4 files changed

+53
-265
lines changed
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Maven plugin tests (JDK17)
2+
3+
on:
4+
push:
5+
paths:
6+
- modules/openapi-generator-maven-plugin/**
7+
pull_request:
8+
paths:
9+
- modules/openapi-generator-maven-plugin/**
10+
11+
jobs:
12+
test:
13+
name: Maven plugin tests
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v5
17+
- name: Set up JDK 17
18+
uses: actions/setup-java@v5
19+
with:
20+
java-version: 17
21+
distribution: 'temurin'
22+
- name: Cache maven dependencies
23+
uses: actions/cache@v5
24+
env:
25+
cache-name: cache-maven-repository
26+
with:
27+
path: |
28+
~/.m2/repository
29+
~/.gradle
30+
!~/.gradle/caches/*/plugin-resolution/
31+
!~/.m2/repository/org/openapitools/
32+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
33+
restore-keys: |
34+
${{ runner.os }}-test-maven-plugin-${{ env.cache-name }}-
35+
${{ runner.os }}-test-maven-plugin-
36+
- name: Run tests
37+
env:
38+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
39+
run: |
40+
./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
41+
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
42+
./mvnw --no-snapshot-updates --quiet clean install -f modules/openapi-generator-maven-plugin/examples/multi-module/sample-external-ref-schema/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
43+
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
44+
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error

.github/workflows/maven-plugin-tests.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ jobs:
4141
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
4242
./mvnw --no-snapshot-updates --quiet clean install -f modules/openapi-generator-maven-plugin/examples/multi-module/sample-external-ref-schema/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
4343
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
44-
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/kotlin.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
45-
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
44+
# test in JDK17 workflow instead
45+
#./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error

modules/openapi-generator-maven-plugin/examples/kotlin.xml

Lines changed: 0 additions & 245 deletions
This file was deleted.

modules/openapi-generator-maven-plugin/examples/spring.xml

Lines changed: 7 additions & 18 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>2.7.15</version>
14+
<version>3.3.13</version>
1515
</parent>
1616
<build>
1717
<plugins>
@@ -40,7 +40,6 @@
4040

4141
<!-- pass any necessary config options -->
4242
<configOptions>
43-
<documentationProvider>springfox</documentationProvider>
4443
<serializableModel>true</serializableModel>
4544
<snapshotVersion>true</snapshotVersion>
4645
</configOptions>
@@ -50,16 +49,6 @@
5049

5150
</executions>
5251
</plugin>
53-
<plugin>
54-
<groupId>org.apache.maven.plugins</groupId>
55-
<artifactId>maven-compiler-plugin</artifactId>
56-
<version>3.11.0</version>
57-
<configuration>
58-
<source>1.8</source>
59-
<target>1.8</target>
60-
<proc>none</proc>
61-
</configuration>
62-
</plugin>
6352
</plugins>
6453
<pluginManagement>
6554
</pluginManagement>
@@ -80,11 +69,6 @@
8069
<artifactId>spring-data-commons</artifactId>
8170
</dependency>
8271
<!--SpringFox dependencies -->
83-
<dependency>
84-
<groupId>io.springfox</groupId>
85-
<artifactId>springfox-swagger2</artifactId>
86-
<version>${springfox.version}</version>
87-
</dependency>
8872
<dependency>
8973
<groupId>org.webjars</groupId>
9074
<artifactId>swagger-ui</artifactId>
@@ -100,6 +84,11 @@
10084
<artifactId>jsr305</artifactId>
10185
<version>3.0.2</version>
10286
</dependency>
87+
<dependency>
88+
<groupId>org.springdoc</groupId>
89+
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
90+
<version>${springdoc.version}</version>
91+
</dependency>
10392
<dependency>
10493
<groupId>com.fasterxml.jackson.dataformat</groupId>
10594
<artifactId>jackson-dataformat-yaml</artifactId>
@@ -129,7 +118,7 @@
129118
</dependency>
130119
</dependencies>
131120
<properties>
132-
<springfox.version>2.9.2</springfox.version>
133121
<swagger-ui.version>4.15.5</swagger-ui.version>
122+
<springdoc.version>2.6.0</springdoc.version>
134123
</properties>
135124
</project>

0 commit comments

Comments
 (0)