From 010b469914c70bca7bd9cae48d5b30be400deffd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Bresson?= Date: Fri, 24 Aug 2018 08:50:26 +0200 Subject: [PATCH] [build] create jar without version in openapi-generator-online (#876) Simplify other scripts needing this jar Consistent with openapi-generator-cli --- .hub.online.dockerfile | 2 +- bin/utils/release_version_update.sh | 1 - modules/openapi-generator-online/Dockerfile | 2 +- modules/openapi-generator-online/pom.xml | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.hub.online.dockerfile b/.hub.online.dockerfile index 96eda34d32b..48c04f5a568 100644 --- a/.hub.online.dockerfile +++ b/.hub.online.dockerfile @@ -26,7 +26,7 @@ RUN mkdir -p ${TARGET_DIR} WORKDIR ${TARGET_DIR} -COPY --from=builder ${GEN_DIR}/modules/openapi-generator-online/target/openapi-generator-*.jar ${TARGET_DIR}/openapi-generator-online.jar +COPY --from=builder ${GEN_DIR}/modules/openapi-generator-online/target/openapi-generator.jar ${TARGET_DIR}/openapi-generator-online.jar ENV GENERATOR_HOST=http://localhost diff --git a/bin/utils/release_version_update.sh b/bin/utils/release_version_update.sh index 6b91d2b15fb..9705da54b94 100755 --- a/bin/utils/release_version_update.sh +++ b/bin/utils/release_version_update.sh @@ -45,7 +45,6 @@ declare -a files=("CI/pom.xml.bash" "modules/openapi-generator-maven-plugin/pom.xml" "modules/openapi-generator-online/pom.xml" "modules/openapi-generator/pom.xml" - "modules/openapi-generator-online/Dockerfile" "pom.xml") for filename in "${files[@]}"; do diff --git a/modules/openapi-generator-online/Dockerfile b/modules/openapi-generator-online/Dockerfile index 49751ccdb55..59cc5813555 100644 --- a/modules/openapi-generator-online/Dockerfile +++ b/modules/openapi-generator-online/Dockerfile @@ -2,7 +2,7 @@ FROM openjdk:8-jre-alpine WORKDIR /generator -COPY target/openapi-generator-online-3.2.3-SNAPSHOT.jar /generator/openapi-generator-online.jar +COPY target/openapi-generator-online.jar /generator/openapi-generator-online.jar ENV GENERATOR_HOST=http://localhost diff --git a/modules/openapi-generator-online/pom.xml b/modules/openapi-generator-online/pom.xml index d4b791206f4..a2c07d1aa5a 100644 --- a/modules/openapi-generator-online/pom.xml +++ b/modules/openapi-generator-online/pom.xml @@ -27,6 +27,7 @@ + openapi-generator-online src/main/java