Skip to content

Commit 5bdb7d3

Browse files
committed
supports jdk 9+ build
1 parent 5eab2a0 commit 5bdb7d3

File tree

5 files changed

+44
-974
lines changed

5 files changed

+44
-974
lines changed

modules/swagger-codegen/pom.xml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,19 @@
161161
<plugin>
162162
<groupId>org.apache.maven.plugins</groupId>
163163
<artifactId>maven-javadoc-plugin</artifactId>
164-
<version>2.10.4</version>
164+
<version>3.0.1</version>
165165
<configuration>
166166
<aggregate>true</aggregate>
167-
<debug>true</debug>
167+
<source>1.8</source>
168+
<encoding>UTF-8</encoding>
169+
<maxmemory>1g</maxmemory>
168170
<links>
169-
<link>http://java.sun.com/javaee/5/docs/api</link>
170-
<link>http://java.sun.com/j2se/1.5.0/docs/api</link>
171+
<link>http://docs.oracle.com/javase/8/docs/api</link>
171172
</links>
172173
<excludePackageNames/>
174+
<additionalOptions>
175+
<additionalOption>-Xdoclint:none</additionalOption>
176+
</additionalOptions>
173177
</configuration>
174178
</plugin>
175179
<plugin>

pom.xml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@
127127
<configuration>
128128
<testNGArtifactName>none:none</testNGArtifactName>
129129
<argLine>-XX:+StartAttachListener</argLine>
130+
<argLine>
131+
-javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit-version}/jmockit-${jmockit-version}.jar
132+
</argLine>
130133
</configuration>
131134
<executions>
132135
<execution>
@@ -193,13 +196,19 @@
193196
<plugin>
194197
<groupId>org.apache.maven.plugins</groupId>
195198
<artifactId>maven-javadoc-plugin</artifactId>
196-
<version>2.10.4</version>
199+
<version>3.0.1</version>
197200
<configuration>
198201
<aggregate>true</aggregate>
199202
<source>1.8</source>
200203
<encoding>UTF-8</encoding>
201204
<maxmemory>1g</maxmemory>
205+
<links>
206+
<link>http://docs.oracle.com/javase/8/docs/api</link>
207+
</links>
202208
<excludePackageNames>${javadoc.package.exclude}</excludePackageNames>
209+
<additionalOptions>
210+
<additionalOption>-Xdoclint:none</additionalOption>
211+
</additionalOptions>
203212
</configuration>
204213
<executions>
205214
<execution>
@@ -1022,9 +1031,10 @@
10221031
<scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
10231032
<jmustache-version>1.12</jmustache-version>
10241033
<testng-version>6.9.6</testng-version>
1025-
<surefire-version>2.19.1</surefire-version>
1034+
<surefire-version>2.22.0</surefire-version>
10261035
<jmockit-version>1.25</jmockit-version>
10271036
<reflections-version>0.9.10</reflections-version>
10281037
<swagger-codegen-generators-version>1.0.0-SNAPSHOT</swagger-codegen-generators-version>
1038+
<jmockit-version>1.42</jmockit-version>
10291039
</properties>
10301040
</project>

pom.xml.bash

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@
126126
<configuration>
127127
<testNGArtifactName>none:none</testNGArtifactName>
128128
<argLine>-XX:+StartAttachListener</argLine>
129+
<argLine>
130+
-javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit-version}/jmockit-${jmockit-version}.jar
131+
</argLine>
129132
</configuration>
130133
<executions>
131134
<execution>
@@ -192,13 +195,19 @@
192195
<plugin>
193196
<groupId>org.apache.maven.plugins</groupId>
194197
<artifactId>maven-javadoc-plugin</artifactId>
195-
<version>2.10.4</version>
198+
<version>3.0.1</version>
196199
<configuration>
197200
<aggregate>true</aggregate>
198201
<source>1.8</source>
199202
<encoding>UTF-8</encoding>
200203
<maxmemory>1g</maxmemory>
204+
<links>
205+
<link>http://docs.oracle.com/javase/8/docs/api</link>
206+
</links>
201207
<excludePackageNames>${javadoc.package.exclude}</excludePackageNames>
208+
<additionalOptions>
209+
<additionalOption>-Xdoclint:none</additionalOption>
210+
</additionalOptions>
202211
</configuration>
203212
<executions>
204213
<execution>
@@ -924,9 +933,10 @@
924933
<scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
925934
<jmustache-version>1.12</jmustache-version>
926935
<testng-version>6.9.6</testng-version>
927-
<surefire-version>2.19.1</surefire-version>
936+
<surefire-version>2.22.0</surefire-version>
928937
<jmockit-version>1.25</jmockit-version>
929938
<reflections-version>0.9.10</reflections-version>
930939
<swagger-codegen-generators-version>1.0.0-SNAPSHOT</swagger-codegen-generators-version>
940+
<jmockit-version>1.42</jmockit-version>
931941
</properties>
932942
</project>

0 commit comments

Comments
 (0)