Skip to content

Commit 73ea23e

Browse files
frantumafrantuma
authored
Merge pull request #8640 from swagger-api/ci-3.0
adapt pom for jenkins CI
2 parents 1a9fa2a + 4dc3607 commit 73ea23e

File tree

4 files changed

+104
-11
lines changed

4 files changed

+104
-11
lines changed

‎.travis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,10 @@ script:
8787

8888
after_success:
8989
# push a snapshot version to maven repo
90-
- if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_BRANCH" = "3.0.0" ]; then
91-
mvn clean deploy --settings .travis/settings.xml;
92-
echo "Finished mvn clean deploy for $TRAVIS_BRANCH";
93-
fi;
90+
#- if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_BRANCH" = "3.0.0" ]; then
91+
# mvn clean deploy --settings .travis/settings.xml;
92+
# echo "Finished mvn clean deploy for $TRAVIS_BRANCH";
93+
# fi;
9494

9595
env:
9696
- DOCKER_GENERATOR_IMAGE_NAME=swaggerapi/swagger-generator-v3-minimal DOCKER_CODEGEN_CLI_IMAGE_NAME=swaggerapi/swagger-codegen-cli-v3

‎circle.yml‎ renamed to ‎circle.yml.disabled‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ test:
4646
# skip the rest if previous mvn task fails
4747
- if [ $? -ne 0 ]; then exit 1; fi
4848
## docker: build generator image and push to Docker Hub
49-
- if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build --rm=false -t $DOCKER_GENERATOR_IMAGE_NAME -f ./modules/swagger-generator/Dockerfile_minimal ./modules/swagger-generator && if [ ! -z "$CIRCLE_TAG" ]; then docker tag $DOCKER_GENERATOR_IMAGE_NAME:latest $DOCKER_GENERATOR_IMAGE_NAME:$CIRCLE_TAG; fi && if [ ! -z "$CIRCLE_TAG" ] || [ "$CIRCLE_BRANCH" = "3.0.0" ]; then docker push $DOCKER_GENERATOR_IMAGE_NAME; fi; fi
49+
#- if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build --rm=false -t $DOCKER_GENERATOR_IMAGE_NAME -f ./modules/swagger-generator/Dockerfile_minimal ./modules/swagger-generator && if [ ! -z "$CIRCLE_TAG" ]; then docker tag $DOCKER_GENERATOR_IMAGE_NAME:latest $DOCKER_GENERATOR_IMAGE_NAME:$CIRCLE_TAG; fi && if [ ! -z "$CIRCLE_TAG" ] || [ "$CIRCLE_BRANCH" = "3.0.0" ]; then docker push $DOCKER_GENERATOR_IMAGE_NAME; fi; fi
5050
## docker: build cli image and push to Docker Hub
51-
- if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build --rm=false -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/swagger-codegen-cli && if [ ! -z "$CIRCLE_TAG" ]; then docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest $DOCKER_CODEGEN_CLI_IMAGE_NAME:$CIRCLE_TAG; fi && if [ ! -z "$CIRCLE_TAG" ] || [ "$CIRCLE_BRANCH" = "3.0.0" ]; then docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME; fi; fi
51+
#- if [ $DOCKER_HUB_USERNAME ]; then docker login --email=$DOCKER_HUB_EMAIL --username=$DOCKER_HUB_USERNAME --password=$DOCKER_HUB_PASSWORD && docker build --rm=false -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/swagger-codegen-cli && if [ ! -z "$CIRCLE_TAG" ]; then docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest $DOCKER_CODEGEN_CLI_IMAGE_NAME:$CIRCLE_TAG; fi && if [ ! -z "$CIRCLE_TAG" ] || [ "$CIRCLE_BRANCH" = "3.0.0" ]; then docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME; fi; fi

‎modules/swagger-generator/pom.xml‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,13 @@
127127
<docker-host-ip>localhost</docker-host-ip>
128128
</properties>
129129
</profile>
130+
<profile>
131+
<id>release</id>
132+
<properties>
133+
<docker-latest-tag>latest</docker-latest-tag>
134+
<dockerfile.tag.skip>false</dockerfile.tag.skip>
135+
</properties>
136+
</profile>
130137
<profile>
131138
<id>docker</id>
132139
<properties>
@@ -241,13 +248,13 @@
241248
<version>1.4.3</version>
242249
<executions>
243250
<execution>
244-
<id>default</id>
251+
<id>build</id>
245252
<goals>
246253
<goal>build</goal>
247254
</goals>
248255
<configuration>
249256
<repository>swaggerapi/swagger-generator-v3</repository>
250-
<tag>${project.version}</tag>
257+
<tag>${docker-latest-tag}</tag>
251258
<buildArgs>
252259
<HIDDEN_OPTIONS_DEFAULT_PATH>${HIDDEN_OPTIONS_DEFAULT_PATH}</HIDDEN_OPTIONS_DEFAULT_PATH>
253260
<JAVA_MEM>${JAVA_MEM}</JAVA_MEM>
@@ -259,12 +266,20 @@
259266
<id>tag</id>
260267
<goals>
261268
<goal>tag</goal>
262-
<!-- TODO skip for now until clarified -->
263-
<!--<goal>push</goal>-->
264269
</goals>
265270
<configuration>
266271
<repository>swaggerapi/swagger-generator-v3</repository>
267-
<tag>latest</tag>
272+
<tag>${project.version}</tag>
273+
</configuration>
274+
</execution>
275+
<execution>
276+
<id>push</id>
277+
<goals>
278+
<goal>push</goal>
279+
</goals>
280+
<configuration>
281+
<repository>swaggerapi/swagger-generator-v3</repository>
282+
<tag>${docker-latest-tag}</tag>
268283
</configuration>
269284
</execution>
270285
</executions>
@@ -307,6 +322,8 @@
307322
</dependency>
308323
</dependencies>
309324
<properties>
325+
<dockerfile.tag.skip>true</dockerfile.tag.skip>
326+
<docker-latest-tag>unstable</docker-latest-tag>
310327
<maven-plugin-version>1.0.0</maven-plugin-version>
311328
<jetty-version>9.4.11.v20180605</jetty-version>
312329
<inflector-version>2.0.0-rc2</inflector-version>

‎pom.xml‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -601,6 +601,18 @@
601601
<module>samples/server/petstore/jaxrs-resteasy/eap</module>
602602
</modules>
603603
</profile>
604+
<profile>
605+
<id>jaxrs-resteasy-eap-server-java8</id>
606+
<activation>
607+
<property>
608+
<name>env</name>
609+
<value>java</value>
610+
</property>
611+
</activation>
612+
<modules>
613+
<module>samples/server/petstore/jaxrs-resteasy/eap-java8</module>
614+
</modules>
615+
</profile>
604616
<profile>
605617
<id>jaxrs-resteasy-eap-server-joda</id>
606618
<activation>
@@ -757,6 +769,18 @@
757769
<module>samples/server/petstore/spring-mvc</module>
758770
</modules>
759771
</profile>
772+
<profile>
773+
<id>springboot-useoptional</id>
774+
<activation>
775+
<property>
776+
<name>env</name>
777+
<value>java</value>
778+
</property>
779+
</activation>
780+
<modules>
781+
<module>samples/server/petstore/springboot-useoptional</module>
782+
</modules>
783+
</profile>
760784
<profile>
761785
<id>springboot-beanvalidation</id>
762786
<activation>
@@ -838,6 +862,58 @@
838862
</property>
839863
</activation>
840864
<modules>
865+
<!-- clients -->
866+
<!-- test java-related projects -->
867+
<!--<module>samples/client/petstore/akka-scala</module>-->
868+
<!--<module>samples/client/petstore/scala</module>-->
869+
<!--<module>samples/client/petstore/scalaz</module>-->
870+
<!--<module>samples/client/petstore/clojure</module>-->
871+
<module>samples/client/petstore/java/feign</module>
872+
<module>samples/client/petstore/java/jersey1</module>
873+
<module>samples/client/petstore/java/jersey2</module>
874+
<module>samples/client/petstore/java/okhttp-gson</module>
875+
<module>samples/client/petstore/java/retrofit</module>
876+
<module>samples/client/petstore/java/retrofit2</module>
877+
<module>samples/client/petstore/java/retrofit2rx</module>
878+
<!--<module>samples/client/petstore/jaxrs-cxf-client</module>-->
879+
<module>samples/client/petstore/java/resttemplate</module>
880+
<module>samples/client/petstore/java/resttemplate-withXml</module>
881+
<module>samples/client/petstore/java/vertx</module>
882+
<module>samples/client/petstore/java/resteasy</module>
883+
<module>samples/client/petstore/java/google-api-client</module>
884+
<!--<module>samples/client/petstore/kotlin/</module>-->
885+
<!-- test non-java projects -->
886+
<!--<module>samples/client/petstore/go</module>-->
887+
<!-- servers -->
888+
<!--<module>samples/server/petstore/java-vertx/rx</module>-->
889+
<!--<module>samples/server/petstore/java-vertx/async</module>-->
890+
<module>samples/server/petstore/java-inflector</module>
891+
<!--<module>samples/server/petstore/java-pkmst</module>-->
892+
<!--<module>samples/server/petstore/java-play-framework</module>-->
893+
<!--<module>samples/server/petstore/undertow</module>-->
894+
<!--<module>samples/server/petstore/jaxrs/jersey1</module>-->
895+
<!--<module>samples/server/petstore/jaxrs/jersey2</module>-->
896+
<!--<module>samples/server/petstore/jaxrs/jersey1-useTags</module>-->
897+
<!--<module>samples/server/petstore/jaxrs/jersey2-useTags</module>-->
898+
<!--<module>samples/server/petstore/jaxrs-resteasy/default</module>-->
899+
<!--<module>samples/server/petstore/jaxrs-resteasy/eap</module>-->
900+
<!--<module>samples/server/petstore/jaxrs-resteasy/eap-joda</module>-->
901+
<!--<module>samples/server/petstore/jaxrs-resteasy/eap-java8</module>-->
902+
<!--<module>samples/server/petstore/jaxrs-resteasy/joda</module>-->
903+
<!--<module>samples/server/petstore/spring-mvc</module>-->
904+
<!--<module>samples/client/petstore/spring-cloud</module>-->
905+
<!--<module>samples/server/petstore/springboot</module>-->
906+
<!--<module>samples/server/petstore/springboot-beanvalidation</module>-->
907+
<!--<module>samples/server/petstore/springboot-useoptional</module>-->
908+
<!--<module>samples/server/petstore/jaxrs-cxf</module>-->
909+
<!--<module>samples/server/petstore/jaxrs-cxf-annotated-base-path</module>-->
910+
<!--<module>samples/server/petstore/jaxrs-cxf-cdi</module>-->
911+
<!--<module>samples/server/petstore/jaxrs-cxf-non-spring-app</module>-->
912+
<!--<module>samples/server/petstore/java-msf4j</module>-->
913+
<!--<module>samples/server/petstore/jaxrs-spec-interface</module>-->
914+
<!--<module>samples/server/petstore/scala-lagom-server</module>-->
915+
916+
841917
<!-- <module>samples/server/petstore/erlang-server</module> note: make sample compilation work -->
842918
<!-- clients -->
843919
<!--<module>samples/client/petstore/php/SwaggerClient-php</module>-->

0 commit comments

Comments
 (0)