add jvm options to fix build in jdk16+

Capillary · Oct 5, 2021 · ffb6c2f · ffb6c2f
1 parent 403e887
commit ffb6c2f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/.mvn/jvm.config b/.mvn/jvm.config
@@ -0,0 +1,2 @@
+-XX:+IgnoreUnrecognizedVMOptions
+--add-opens=java.base/java.util=ALL-UNNAMED
diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml
@@ -52,7 +52,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.22.0</version>
+                <version>2.22.2</version>
                 <configuration>
                     <systemPropertyVariables>
                         <java.security.policy>${java.security.policy}</java.security.policy>

diff --git a/...swagger-generator/src/test/java/io/swagger/v3/generator/online/GeneratorControllerIT.java b/...swagger-generator/src/test/java/io/swagger/v3/generator/online/GeneratorControllerIT.java
@@ -4,7 +4,6 @@
 import io.swagger.codegen.v3.service.GenerationRequest;
 import io.swagger.codegen.v3.service.Options;
 import io.swagger.v3.core.util.Json;
-import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
@@ -18,7 +17,6 @@
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
-import java.io.File;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -161,7 +159,7 @@ public void testMultiTypesV2() throws Exception {
 
     @Test
     public void generateJava() throws Exception {
-        String json = FileUtils.readFileToString(new File("src/test/resources/petstore-oas3.json"));
+        String json = IOUtils.toString(getClass().getClassLoader().getResourceAsStream("petstore-oas3.json"));
         JsonNode node = Json.mapper().readTree(json);
         Map<String, Object> spec = Json.mapper().convertValue(node, LinkedHashMap.class);
 
@@ -188,7 +186,7 @@ public void generateJava() throws Exception {
     @Test
     public void generateHtml() throws Exception {
         HttpClient client = HttpClientBuilder.create().build();
-        String json = FileUtils.readFileToString(new File("src/test/resources/petstore-oas3.json"));
+        String json = IOUtils.toString(getClass().getClassLoader().getResourceAsStream("petstore-oas3.json"));
         JsonNode node = Json.mapper().readTree(json);
         Map<String, Object> spec = Json.mapper().convertValue(node, LinkedHashMap.class);
 

diff --git a/pom.docker.xml b/pom.docker.xml
@@ -253,6 +253,11 @@
                     <artifactId>formatter-maven-plugin</artifactId>
                     <version>0.5.2</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>3.3.2</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>

diff --git a/pom.xml b/pom.xml
@@ -129,6 +129,8 @@
                     <argLine>-XX:+StartAttachListener</argLine>
                     <argLine>
                         -javaagent:${settings.localRepository}/org/jmockit/jmockit/${jmockit-version}/jmockit-${jmockit-version}.jar
+                        -XX:+IgnoreUnrecognizedVMOptions
+                        --add-opens=java.base/java.util=ALL-UNNAMED
                     </argLine>
                 </configuration>
                 <executions>
@@ -262,6 +264,11 @@
                     <artifactId>formatter-maven-plugin</artifactId>
                     <version>0.5.2</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>3.3.2</version>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-XX:+IgnoreUnrecognizedVMOptions
		--add-opens=java.base/java.util=ALL-UNNAMED