Skip to content

Commit 74e2b27

Browse files
committed
updated jaxrs generator and libraries to work with java 11
1 parent 1175038 commit 74e2b27

File tree

8 files changed

+38
-8
lines changed

8 files changed

+38
-8
lines changed

modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,11 @@
8888

8989
</dependencies>
9090

91+
{{#java11}}
92+
<properties>
93+
<maven.compiler.source>11</maven.compiler.source>
94+
<maven.compiler.target>11</maven.compiler.target>
95+
</properties>
96+
{{/java11}}
97+
9198
</project>

modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
</repository>
187187
</repositories>
188188
<properties>
189-
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
189+
<java.version>{{#java11}}11{{/java11}}{{^java11}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/java11}}</java.version>
190190
<maven.compiler.source>${java.version}</maven.compiler.source>
191191
<maven.compiler.target>${java.version}</maven.compiler.target>
192192
<swagger-core-version>1.5.24</swagger-core-version>

modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
</repository>
238238
</repositories>
239239
<properties>
240-
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
240+
<java.version>{{#java11}}11{{/java11}}{{^java11}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/java11}}</java.version>
241241
<maven.compiler.source>${java.version}</maven.compiler.source>
242242
<maven.compiler.target>${java.version}</maven.compiler.target>
243243
<swagger-core-version>1.5.24</swagger-core-version>

modules/swagger-codegen/src/main/resources/JavaJaxRS/libraries/jersey1/pom.mustache

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@
175175
<artifactId>validation-api</artifactId>
176176
<version>1.1.0.Final</version>
177177
</dependency>
178+
178179
{{/useBeanValidation}}
179180
</dependencies>
180181
<repositories>
@@ -187,7 +188,7 @@
187188
</repository>
188189
</repositories>
189190
<properties>
190-
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
191+
<java.version>{{#java11}}11{{/java11}}{{^java11}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/java11}}</java.version>
191192
<maven.compiler.source>${java.version}</maven.compiler.source>
192193
<maven.compiler.target>${java.version}</maven.compiler.target>
193194
<swagger-core-version>1.5.24</swagger-core-version>

modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
</repository>
194194
</repositories>
195195
<properties>
196-
<java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
196+
<java.version>{{#java11}}11{{/java11}}{{^java11}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/java11}}</java.version>
197197
<maven.compiler.source>${java.version}</maven.compiler.source>
198198
<maven.compiler.target>${java.version}</maven.compiler.target>
199199
<swagger-core-version>1.5.24</swagger-core-version>

modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/eap/pom.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<artifactId>maven-compiler-plugin</artifactId>
1515
<version>3.6.1</version>
1616
<configuration>
17-
<source>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</source>
18-
<target>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</target>
17+
<source>{{#java11}}11{{/java11}}{{^java11}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/java11}}</source>
18+
<target>{{#java11}}11{{/java11}}{{^java11}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/java11}}</target>
1919
</configuration>
2020
</plugin>
2121
<plugin>

modules/swagger-codegen/src/main/resources/JavaJaxRS/resteasy/pom.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<artifactId>maven-compiler-plugin</artifactId>
1515
<version>3.6.1</version>
1616
<configuration>
17-
<source>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</source>
18-
<target>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</target>
17+
<source>{{#java11}}11{{/java11}}{{^java11}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/java11}}</source>
18+
<target>{{#java11}}11{{/java11}}{{^java11}}{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}{{/java11}}</target>
1919
</configuration>
2020
</plugin>
2121
<plugin>

modules/swagger-codegen/src/main/resources/JavaJaxRS/spec/pom.mustache

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,24 @@
5454
</plugin>
5555
</plugins>
5656
</build>
57+
{{#java11}}
58+
<profiles>
59+
<profile>
60+
<id>jdk11</id>
61+
<activation>
62+
<jdk>[11,)</jdk>
63+
</activation>
64+
<dependencies>
65+
<dependency>
66+
<groupId>com.sun.xml.ws</groupId>
67+
<artifactId>jaxws-rt</artifactId>
68+
<version>2.3.3</version>
69+
<type>pom</type>
70+
</dependency>
71+
</dependencies>
72+
</profile>
73+
</profiles>
74+
{{/java11}}
5775
<dependencies>
5876
<dependency>
5977
<groupId>javax.ws.rs</groupId>
@@ -116,6 +134,10 @@
116134
{{/useBeanValidation}}
117135
</dependencies>
118136
<properties>
137+
{{#java11}}
138+
<maven.compiler.source>11</maven.compiler.source>
139+
<maven.compiler.target>11</maven.compiler.target>
140+
{{/java11}}
119141
{{#jackson}}
120142
<jackson-version>2.9.9</jackson-version>
121143
{{/jackson}}

0 commit comments

Comments
 (0)