haskell clint: switch to openapi-generator

jonschoning · Feb 28, 2019 · c1cb27a · c1cb27a
1 parent f673b04
commit c1cb27a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/openapi/haskell-http-client.xml b/openapi/haskell-http-client.xml
@@ -8,18 +8,19 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>io.swagger</groupId>
-                <artifactId>swagger-codegen-maven-plugin</artifactId>
-                <version>${swagger-codegen-version}</version>
+                <groupId>org.openapitools</groupId>
+                <artifactId>openapi-generator-maven-plugin</artifactId>
+                <version>${openapi-generator-version}</version>
                 <executions>
                     <execution>
                         <goals>
                             <goal>generate</goal>
                         </goals>
                         <configuration>
                             <inputSpec>${generator.spec.path}</inputSpec>
-                            <language>haskell-http-client</language>
+                            <generatorName>haskell-http-client</generatorName>
                             <output>${generator.output.path}</output>
+                            <validateSpec>false</validateSpec>
                             <configOptions>
                                 <packageName>${generator.package.name}</packageName>
                                 <packageVersion>${generator.client.version}</packageVersion>

diff --git a/openapi/haskell.sh b/openapi/haskell.sh
@@ -43,11 +43,11 @@ pushd "${OUTPUT_DIR}" > /dev/null
 OUTPUT_DIR=`pwd`
 popd > /dev/null
 
-source "${SCRIPT_ROOT}/swagger-codegen/client-generator.sh"
+source "${SCRIPT_ROOT}/openapi-generator/client-generator.sh"
 source "${SETTING_FILE}"
 
 # Latest version of HaskellHttpClientCodegen.java as of Nov 19, 2018
-SWAGGER_CODEGEN_COMMIT="${SWAGGER_CODEGEN_COMMIT:-d0e2d7684dd3258233c3e4d838dcd7bf44055869}"; \
+OPENAPI_GENERATOR_COMMIT="${OPENAPI_GENERATOR_COMMIT:-c30a21ac3cd8b1d8a3db600e4079977af0681e11}"; \
 CLIENT_LANGUAGE=haskell-http-client; \
 CLEANUP_DIRS=(lib tests); \
 kubeclient::generator::generate_client "${OUTPUT_DIR}"