Upgrade openapi-generator to 5.2.0

jhannes · jhannes · commit a6c0ba5d013e · 2021-08-03T22:32:58.000+02:00
diff --git a/pom.xml b/pom.xml
@@ -150,13 +150,13 @@
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>openapi-generator</artifactId>
-            <version>5.1.1</version>
+            <version>5.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
-            <version>5.6.0</version>
+            <version>5.7.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/snapshotTests/snapshot/example/.openapi-generator/FILES b/snapshotTests/snapshot/example/.openapi-generator/FILES
@@ -0,0 +1,14 @@
+.gitignore
+.openapi-generator-ignore
+README.md
+api.ts
+base.ts
+git_push.sh
+index.ts
+model.ts
+package.json
+package.json
+package.json
+test/apiTest.ts
+test/modelTest.ts
+tsconfig.json
diff --git a/snapshotTests/snapshot/example/.openapi-generator/VERSION b/snapshotTests/snapshot/example/.openapi-generator/VERSION
@@ -1 +1 @@
-5.1.1
+5.2.0
diff --git a/snapshotTests/snapshot/infectionTracker/.openapi-generator/FILES b/snapshotTests/snapshot/infectionTracker/.openapi-generator/FILES
@@ -0,0 +1,14 @@
+.gitignore
+.openapi-generator-ignore
+README.md
+api.ts
+base.ts
+git_push.sh
+index.ts
+model.ts
+package.json
+package.json
+package.json
+test/apiTest.ts
+test/modelTest.ts
+tsconfig.json
diff --git a/snapshotTests/snapshot/infectionTracker/.openapi-generator/VERSION b/snapshotTests/snapshot/infectionTracker/.openapi-generator/VERSION
@@ -1 +1 @@
-5.1.1
+5.2.0
diff --git a/snapshotTests/snapshot/petstore/.openapi-generator/FILES b/snapshotTests/snapshot/petstore/.openapi-generator/FILES
@@ -0,0 +1,14 @@
+.gitignore
+.openapi-generator-ignore
+README.md
+api.ts
+base.ts
+git_push.sh
+index.ts
+model.ts
+package.json
+package.json
+package.json
+test/apiTest.ts
+test/modelTest.ts
+tsconfig.json
diff --git a/snapshotTests/snapshot/petstore/.openapi-generator/VERSION b/snapshotTests/snapshot/petstore/.openapi-generator/VERSION
@@ -1 +1 @@
-5.1.1
+5.2.0
diff --git a/snapshotTests/snapshot/poly/.openapi-generator/FILES b/snapshotTests/snapshot/poly/.openapi-generator/FILES
@@ -0,0 +1,14 @@
+.gitignore
+.openapi-generator-ignore
+README.md
+api.ts
+base.ts
+git_push.sh
+index.ts
+model.ts
+package.json
+package.json
+package.json
+test/apiTest.ts
+test/modelTest.ts
+tsconfig.json
diff --git a/snapshotTests/snapshot/poly/.openapi-generator/VERSION b/snapshotTests/snapshot/poly/.openapi-generator/VERSION
@@ -1 +1 @@
-5.1.1
+5.2.0
diff --git a/snapshotTests/snapshot/typeHierarchy/.openapi-generator/FILES b/snapshotTests/snapshot/typeHierarchy/.openapi-generator/FILES
@@ -0,0 +1,14 @@
+.gitignore
+.openapi-generator-ignore
+README.md
+api.ts
+base.ts
+git_push.sh
+index.ts
+model.ts
+package.json
+package.json
+package.json
+test/apiTest.ts
+test/modelTest.ts
+tsconfig.json
diff --git a/snapshotTests/snapshot/typeHierarchy/.openapi-generator/VERSION b/snapshotTests/snapshot/typeHierarchy/.openapi-generator/VERSION
@@ -1 +1 @@
-5.1.1
+5.2.0
diff --git a/src/test/java/io/github/jhannes/openapi/typescriptfetchapi/VerifyOutputTests.java b/src/test/java/io/github/jhannes/openapi/typescriptfetchapi/VerifyOutputTests.java
@@ -52,10 +52,9 @@ private DynamicNode verify(Path testDir, String generatorName, Path outputDir) t
 
     private void runCommand(Path outputDir, String[] npmCommand) throws IOException, InterruptedException {
         Process command = Runtime.getRuntime().exec(npmCommand, null, outputDir.toFile());
-        System.out.println("Starting npm install in " + outputDir);
         startTransferThread(command.getInputStream(), System.out, outputDir + "-to-stdout");
         startTransferThread(command.getErrorStream(), System.err, outputDir + "-to-stderr");
-        command.waitFor(30, TimeUnit.SECONDS);
+        command.waitFor(60, TimeUnit.SECONDS);
         assertEquals(0, command.exitValue());
     }
 
