embed openapi-generator-cli into the generator jar. (#1148)

tokuhirom · web-flow · commit 2978f3da480e · 2023-11-13T18:19:36.000+09:00
It makes easier to update openapi-generator-cli
diff --git a/clients/line-bot-insight-client/.openapi-generator/VERSION b/clients/line-bot-insight-client/.openapi-generator/VERSION
@@ -1 +1 @@
-7.0.0
+unset
diff --git a/clients/line-bot-manage-audience-client/.openapi-generator/VERSION b/clients/line-bot-manage-audience-client/.openapi-generator/VERSION
@@ -1 +1 @@
-7.0.0
+unset
diff --git a/clients/line-bot-messaging-api-client/.openapi-generator/VERSION b/clients/line-bot-messaging-api-client/.openapi-generator/VERSION
@@ -1 +1 @@
-7.0.0
+unset
diff --git a/clients/line-bot-module-attach-client/.openapi-generator/VERSION b/clients/line-bot-module-attach-client/.openapi-generator/VERSION
@@ -1 +1 @@
-7.0.0
+unset
diff --git a/clients/line-bot-module-client/.openapi-generator/VERSION b/clients/line-bot-module-client/.openapi-generator/VERSION
@@ -1 +1 @@
-7.0.0
+unset
diff --git a/clients/line-bot-shop-client/.openapi-generator/VERSION b/clients/line-bot-shop-client/.openapi-generator/VERSION
@@ -1 +1 @@
-7.0.0
+unset
diff --git a/clients/line-channel-access-token-client/.openapi-generator/VERSION b/clients/line-channel-access-token-client/.openapi-generator/VERSION
@@ -1 +1 @@
-7.0.0
+unset
diff --git a/clients/line-liff-client/.openapi-generator/VERSION b/clients/line-liff-client/.openapi-generator/VERSION
@@ -1 +1 @@
-7.0.0
+unset
diff --git a/generate-code.py b/generate-code.py
@@ -97,7 +97,7 @@ def main():
         remove_previous_files(component['outdir'])
 
         command = f'''java \\
-                    -cp ./tools/openapi-generator-cli.jar:./generator/target/line-java-codegen-1.0.0.jar \\
+                    -cp ./generator/target/line-java-codegen-1.0.0.jar \\
                     org.openapitools.codegen.OpenAPIGenerator \\
                     generate \\
                     -e pebble \\
@@ -128,7 +128,7 @@ def main():
     # run_command(f'rm -rf line-bot-webhook/src/main/java/{modelPackagePath}/')
 
     command = f'''java \\
-                -cp ./tools/openapi-generator-cli.jar:./generator/target/line-java-codegen-1.0.0.jar \\
+                -cp ./generator/target/line-java-codegen-1.0.0.jar \\
                 org.openapitools.codegen.OpenAPIGenerator \\
                 generate \\
                 -e pebble \\
diff --git a/generator/pom.xml b/generator/pom.xml
@@ -126,6 +126,11 @@
             <version>${openapi-generator-version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>openapi-generator-cli</artifactId>
+            <version>${openapi-generator-version}</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/line-bot-webhook/.openapi-generator/VERSION b/line-bot-webhook/.openapi-generator/VERSION
@@ -1 +1 @@
-7.0.0
+unset
diff --git a/tools/openapi-generator-cli.jar b/tools/openapi-generator-cli.jar
