Skip to content

Commit 590a88c

Browse files
frantumafrantuma
committed
refs #3836 - jakarta namespace artifacts
1 parent 881ceb3 commit 590a88c

File tree

23 files changed

+1490
-7
lines changed

23 files changed

+1490
-7
lines changed

‎modules/swagger-core/pom.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@
141141
<artifactId>commons-io</artifactId>
142142
</dependency>
143143
<dependency>
144-
<groupId>javax.ws.rs</groupId>
145-
<artifactId>jsr311-api</artifactId>
146-
<version>1.1.1</version>
144+
<groupId>jakarta.ws.rs</groupId>
145+
<artifactId>jakarta.ws.rs-api</artifactId>
146+
<version>${jakarta-ws-rs-api-version}</version>
147147
<scope>test</scope>
148148
</dependency>
149149
<dependency>
@@ -156,6 +156,7 @@
156156
<properties>
157157
<!-- TODO increase coverage -->
158158
<validation-api-version>2.0.2</validation-api-version>
159+
<jakarta-ws-rs-api-version>2.1.6</jakarta-ws-rs-api-version>
159160
<coverage.complexity.minimum>0.60</coverage.complexity.minimum>
160161
<coverage.line.minimum>0.0</coverage.line.minimum>
161162
<coverage.missed.classes>3</coverage.missed.classes>

‎modules/swagger-gradle-plugin/src/main/java/io/swagger/v3/plugins/gradle/tasks/ResolveTask.java

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import org.gradle.api.tasks.Classpath;
99
import org.gradle.api.tasks.Input;
1010
import org.gradle.api.tasks.InputFile;
11-
import org.gradle.api.tasks.Internal;
1211
import org.gradle.api.tasks.Optional;
1312
import org.gradle.api.tasks.OutputDirectory;
1413
import org.gradle.api.tasks.PathSensitive;

‎modules/swagger-jaxrs2/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@
141141
<dependency>
142142
<groupId>org.javassist</groupId>
143143
<artifactId>javassist</artifactId>
144-
<version>3.22.0-GA</version>
144+
<version>3.25.0-GA</version>
145145
</dependency>
146146
<dependency>
147147
<groupId>commons-io</groupId>

‎modules/swagger-project-jakarta/.gitignore

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
build/
2+
lib/*.jar
3+
target
4+
.idea
5+
.idea_modules
6+
.settings
7+
.project
8+
.classpath
9+
.cache
10+
atlassian-ide-plugin.xml
11+
*.iml
12+
.java-version
13+
sonar-project.properties
14+
test-output/
15+
*.pyc
16+
**/transformed/*.jar
17+
**/transformed/*.test-jar
18+
**/transformed/*.maven-plugin

‎modules/swagger-project-jakarta/modules/swagger-annotations-jakarta/pom.xml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xmlns="http://maven.apache.org/POM/4.0.0"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<parent>
5+
<groupId>io.swagger.core.v3</groupId>
6+
<artifactId>swagger-project-jakarta</artifactId>
7+
<version>2.1.7-SNAPSHOT</version>
8+
<relativePath>../..</relativePath>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
<artifactId>swagger-annotations-jakarta</artifactId>
12+
<name>swagger-annotations-jakarta</name>
13+
<description>swagger-annotations-jakarta</description>
14+
15+
<build></build>
16+
17+
<dependencies></dependencies>
18+
19+
<properties></properties>
20+
</project>

‎modules/swagger-project-jakarta/modules/swagger-annotations-jakarta/transformed/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#### Don't delete
2+
3+
Target directory for eclipse transformer plugin; Jakarta EE 9+ artifacts are generated in this directory

‎modules/swagger-project-jakarta/modules/swagger-core-jakarta/pom.xml

+82
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xmlns="http://maven.apache.org/POM/4.0.0"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<parent>
5+
<groupId>io.swagger.core.v3</groupId>
6+
<artifactId>swagger-project-jakarta</artifactId>
7+
<version>2.1.7-SNAPSHOT</version>
8+
<relativePath>../..</relativePath>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
<artifactId>swagger-core-jakarta</artifactId>
12+
<name>swagger-core-jakarta</name>
13+
<description>swagger-core-jakarta</description>
14+
15+
<build></build>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>org.apache.commons</groupId>
20+
<artifactId>commons-lang3</artifactId>
21+
</dependency>
22+
<dependency>
23+
<groupId>org.slf4j</groupId>
24+
<artifactId>slf4j-api</artifactId>
25+
</dependency>
26+
<dependency>
27+
<groupId>ch.qos.logback</groupId>
28+
<artifactId>logback-classic</artifactId>
29+
<scope>provided</scope>
30+
</dependency>
31+
<dependency>
32+
<groupId>ch.qos.logback</groupId>
33+
<artifactId>logback-core</artifactId>
34+
<scope>provided</scope>
35+
</dependency>
36+
<dependency>
37+
<groupId>commons-io</groupId>
38+
<artifactId>commons-io</artifactId>
39+
</dependency>
40+
41+
42+
<dependency>
43+
<groupId>io.swagger.core.v3</groupId>
44+
<artifactId>swagger-annotations-jakarta</artifactId>
45+
<version>${project.parent.version}</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>io.swagger.core.v3</groupId>
49+
<artifactId>swagger-models-jakarta</artifactId>
50+
<version>${project.parent.version}</version>
51+
</dependency>
52+
53+
<dependency>
54+
<groupId>jakarta.xml.bind</groupId>
55+
<artifactId>jakarta.xml.bind-api</artifactId>
56+
</dependency>
57+
<dependency>
58+
<groupId>jakarta.validation</groupId>
59+
<artifactId>jakarta.validation-api</artifactId>
60+
</dependency>
61+
62+
63+
<dependency>
64+
<groupId>com.fasterxml.jackson.core</groupId>
65+
<artifactId>jackson-annotations</artifactId>
66+
</dependency>
67+
<dependency>
68+
<groupId>com.fasterxml.jackson.core</groupId>
69+
<artifactId>jackson-databind</artifactId>
70+
</dependency>
71+
<dependency>
72+
<groupId>com.fasterxml.jackson.dataformat</groupId>
73+
<artifactId>jackson-dataformat-yaml</artifactId>
74+
</dependency>
75+
<dependency>
76+
<groupId>com.fasterxml.jackson.datatype</groupId>
77+
<artifactId>jackson-datatype-jsr310</artifactId>
78+
</dependency>
79+
</dependencies>
80+
81+
<properties></properties>
82+
</project>

‎modules/swagger-project-jakarta/modules/swagger-core-jakarta/transformed/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#### Don't delete
2+
3+
Target directory for eclipse transformer plugin; Jakarta EE 9+ artifacts are generated in this directory

‎modules/swagger-project-jakarta/modules/swagger-integration-jakarta/pom.xml

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xmlns="http://maven.apache.org/POM/4.0.0"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<parent>
5+
<groupId>io.swagger.core.v3</groupId>
6+
<artifactId>swagger-project-jakarta</artifactId>
7+
<version>2.1.7-SNAPSHOT</version>
8+
<relativePath>../..</relativePath>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
<artifactId>swagger-integration-jakarta</artifactId>
12+
<name>swagger-integration-jakarta</name>
13+
<description>swagger-integration-jakarta</description>
14+
15+
<build></build>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>io.github.classgraph</groupId>
20+
<artifactId>classgraph</artifactId>
21+
</dependency>
22+
23+
<dependency>
24+
<groupId>io.swagger.core.v3</groupId>
25+
<artifactId>swagger-core-jakarta</artifactId>
26+
<version>${project.version}</version>
27+
</dependency>
28+
<dependency>
29+
<groupId>io.swagger.core.v3</groupId>
30+
<artifactId>swagger-models-jakarta</artifactId>
31+
<version>${project.version}</version>
32+
</dependency>
33+
34+
</dependencies>
35+
36+
<properties></properties>
37+
</project>

‎modules/swagger-project-jakarta/modules/swagger-integration-jakarta/transformed/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#### Don't delete
2+
3+
Target directory for eclipse transformer plugin; Jakarta EE 9+ artifacts are generated in this directory

‎modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/pom.xml

+83
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
1+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xmlns="http://maven.apache.org/POM/4.0.0"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<parent>
5+
<groupId>io.swagger.core.v3</groupId>
6+
<artifactId>swagger-project-jakarta</artifactId>
7+
<version>2.1.7-SNAPSHOT</version>
8+
<relativePath>../..</relativePath>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
<artifactId>swagger-jaxrs2-jakarta</artifactId>
12+
<name>swagger-jaxrs2-jakarta</name>
13+
<description>swagger-jaxrs2-jakarta</description>
14+
15+
<build></build>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>ch.qos.logback</groupId>
20+
<artifactId>logback-classic</artifactId>
21+
<scope>provided</scope>
22+
</dependency>
23+
<dependency>
24+
<groupId>ch.qos.logback</groupId>
25+
<artifactId>logback-core</artifactId>
26+
<scope>provided</scope>
27+
</dependency>
28+
<dependency>
29+
<groupId>io.github.classgraph</groupId>
30+
<artifactId>classgraph</artifactId>
31+
</dependency>
32+
<dependency>
33+
<groupId>org.javassist</groupId>
34+
<artifactId>javassist</artifactId>
35+
<version>3.25.0-GA</version>
36+
</dependency>
37+
<dependency>
38+
<groupId>commons-io</groupId>
39+
<artifactId>commons-io</artifactId>
40+
</dependency>
41+
42+
<dependency>
43+
<groupId>io.swagger.core.v3</groupId>
44+
<artifactId>swagger-models-jakarta</artifactId>
45+
<version>${project.version}</version>
46+
</dependency>
47+
<dependency>
48+
<groupId>io.swagger.core.v3</groupId>
49+
<artifactId>swagger-annotations-jakarta</artifactId>
50+
<version>${project.version}</version>
51+
</dependency>
52+
<dependency>
53+
<groupId>io.swagger.core.v3</groupId>
54+
<artifactId>swagger-integration-jakarta</artifactId>
55+
<version>${project.version}</version>
56+
</dependency>
57+
58+
59+
<dependency>
60+
<groupId>jakarta.ws.rs</groupId>
61+
<artifactId>jakarta.ws.rs-api</artifactId>
62+
<scope>provided</scope>
63+
</dependency>
64+
<dependency>
65+
<groupId>jakarta.servlet</groupId>
66+
<artifactId>jakarta.servlet-api</artifactId>
67+
<scope>provided</scope>
68+
</dependency>
69+
70+
<dependency>
71+
<groupId>com.fasterxml.jackson.core</groupId>
72+
<artifactId>jackson-databind</artifactId>
73+
</dependency>
74+
<dependency>
75+
<groupId>com.fasterxml.jackson.jaxrs</groupId>
76+
<artifactId>jackson-jaxrs-json-provider</artifactId>
77+
<classifier>jakarta</classifier>
78+
<version>${jackson-version}</version>
79+
</dependency>
80+
</dependencies>
81+
82+
<properties></properties>
83+
</project>

‎modules/swagger-project-jakarta/modules/swagger-jaxrs2-jakarta/transformed/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#### Don't delete
2+
3+
Target directory for eclipse transformer plugin; Jakarta EE 9+ artifacts are generated in this directory

‎modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-jakarta/pom.xml

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xmlns="http://maven.apache.org/POM/4.0.0"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
4+
<parent>
5+
<groupId>io.swagger.core.v3</groupId>
6+
<artifactId>swagger-project-jakarta</artifactId>
7+
<version>2.1.7-SNAPSHOT</version>
8+
<relativePath>../..</relativePath>
9+
</parent>
10+
<modelVersion>4.0.0</modelVersion>
11+
<artifactId>swagger-jaxrs2-servlet-initializer-jakarta</artifactId>
12+
<name>swagger-jaxrs2-servlet-initializer-jakarta</name>
13+
<description>swagger-jaxrs2-servlet-initializer-jakarta</description>
14+
15+
<build></build>
16+
17+
<dependencies>
18+
<dependency>
19+
<groupId>ch.qos.logback</groupId>
20+
<artifactId>logback-classic</artifactId>
21+
<scope>provided</scope>
22+
</dependency>
23+
<dependency>
24+
<groupId>ch.qos.logback</groupId>
25+
<artifactId>logback-core</artifactId>
26+
<scope>provided</scope>
27+
</dependency>
28+
29+
<dependency>
30+
<groupId>io.swagger.core.v3</groupId>
31+
<artifactId>swagger-jaxrs2-jakarta</artifactId>
32+
<version>${project.version}</version>
33+
<scope>provided</scope>
34+
</dependency>
35+
36+
<dependency>
37+
<groupId>jakarta.ws.rs</groupId>
38+
<artifactId>jakarta.ws.rs-api</artifactId>
39+
<scope>provided</scope>
40+
</dependency>
41+
<dependency>
42+
<groupId>jakarta.servlet</groupId>
43+
<artifactId>jakarta.servlet-api</artifactId>
44+
<scope>provided</scope>
45+
</dependency>
46+
</dependencies>
47+
48+
<properties></properties>
49+
</project>

‎modules/swagger-project-jakarta/modules/swagger-jaxrs2-servlet-initializer-jakarta/transformed/README.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#### Don't delete
2+
3+
Target directory for eclipse transformer plugin; Jakarta EE 9+ artifacts are generated in this directory

0 commit comments

Comments
 (0)