From 0707b4bb20bb264d5b434b508a5f200cc4af18e0 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 18 Jul 2020 15:48:47 +0800 Subject: [PATCH] [Scala] setup Ivy cache directory (#6978) * use ivy2 cache * use ~/.ivy2 cache dir * add pom.xml to openapi-generator-ignore * update scala-akka sample * use ~ for home directory --- CI/circle_parallel.sh | 3 +++ .../scala-akka/.openapi-generator-ignore | 1 + .../scala-akka/.openapi-generator/FILES | 1 - samples/client/petstore/scala-akka/pom.xml | 22 +++++++++++++++++++ .../client/petstore/scala-httpclient/pom.xml | 22 +++++++++++++++++++ samples/client/petstore/scala-sttp/pom.xml | 2 ++ samples/client/petstore/scalaz/pom.xml | 2 ++ .../petstore/scala-akka-http-server/pom.xml | 2 ++ samples/server/petstore/scala-finch/pom.xml | 2 ++ .../petstore/scala-lagom-server/pom.xml | 2 ++ .../server/petstore/scala-play-server/pom.xml | 2 ++ samples/server/petstore/scalatra/pom.xml | 2 ++ 12 files changed, 62 insertions(+), 1 deletion(-) diff --git a/CI/circle_parallel.sh b/CI/circle_parallel.sh index 789b342ab5d..70b541743d8 100755 --- a/CI/circle_parallel.sh +++ b/CI/circle_parallel.sh @@ -20,6 +20,9 @@ if [ "$NODE_INDEX" = "1" ]; then mvn --no-snapshot-updates --quiet verify -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error + echo "show ivy2 cache" + ls -l /home/circleci/.ivy2/cache + elif [ "$NODE_INDEX" = "2" ]; then # run ensure-up-to-date sample script on SNAPSHOT version only project_version=`mvn org.apache.maven.plugins:maven-help-plugin:3.1.0:evaluate -Dexpression=project.version -q -DforceStdout` diff --git a/samples/client/petstore/scala-akka/.openapi-generator-ignore b/samples/client/petstore/scala-akka/.openapi-generator-ignore index 7484ee590a3..69a08439a3b 100644 --- a/samples/client/petstore/scala-akka/.openapi-generator-ignore +++ b/samples/client/petstore/scala-akka/.openapi-generator-ignore @@ -21,3 +21,4 @@ #docs/*.md # Then explicitly reverse the ignore rule for a single file: #!docs/README.md +pom.xml diff --git a/samples/client/petstore/scala-akka/.openapi-generator/FILES b/samples/client/petstore/scala-akka/.openapi-generator/FILES index 13da3010a5a..301241de2bd 100644 --- a/samples/client/petstore/scala-akka/.openapi-generator/FILES +++ b/samples/client/petstore/scala-akka/.openapi-generator/FILES @@ -1,6 +1,5 @@ README.md build.sbt -pom.xml src/main/resources/reference.conf src/main/scala/org/openapitools/client/api/EnumsSerializers.scala src/main/scala/org/openapitools/client/api/PetApi.scala diff --git a/samples/client/petstore/scala-akka/pom.xml b/samples/client/petstore/scala-akka/pom.xml index a88eaa5a41e..6c36a7c93f7 100644 --- a/samples/client/petstore/scala-akka/pom.xml +++ b/samples/client/petstore/scala-akka/pom.xml @@ -249,6 +249,28 @@ + + org.codehaus.mojo + exec-maven-plugin + 1.5.0 + + + sbt-test + integration-test + + exec + + + sbt + + -ivy + ~/.ivy2 + test + + + + + diff --git a/samples/client/petstore/scala-httpclient/pom.xml b/samples/client/petstore/scala-httpclient/pom.xml index 8ed860ddd65..aa1351f8106 100644 --- a/samples/client/petstore/scala-httpclient/pom.xml +++ b/samples/client/petstore/scala-httpclient/pom.xml @@ -157,6 +157,28 @@ + + org.codehaus.mojo + exec-maven-plugin + 1.5.0 + + + sbt-test + integration-test + + exec + + + sbt + + -ivy + ~/.ivy2 + test + + + + + diff --git a/samples/client/petstore/scala-sttp/pom.xml b/samples/client/petstore/scala-sttp/pom.xml index 6b6a83b21e2..66d6351c208 100644 --- a/samples/client/petstore/scala-sttp/pom.xml +++ b/samples/client/petstore/scala-sttp/pom.xml @@ -21,6 +21,8 @@ sbt + -ivy + ~/.ivy2 test diff --git a/samples/client/petstore/scalaz/pom.xml b/samples/client/petstore/scalaz/pom.xml index 166ba81bda7..2413cce0e69 100644 --- a/samples/client/petstore/scalaz/pom.xml +++ b/samples/client/petstore/scalaz/pom.xml @@ -21,6 +21,8 @@ sbt + -ivy + ~/.ivy2 test diff --git a/samples/server/petstore/scala-akka-http-server/pom.xml b/samples/server/petstore/scala-akka-http-server/pom.xml index 92061e708b4..0eebfe90c99 100644 --- a/samples/server/petstore/scala-akka-http-server/pom.xml +++ b/samples/server/petstore/scala-akka-http-server/pom.xml @@ -21,6 +21,8 @@ sbt + -ivy + ~/.ivy2 test diff --git a/samples/server/petstore/scala-finch/pom.xml b/samples/server/petstore/scala-finch/pom.xml index 92384f2a55a..9424407696b 100644 --- a/samples/server/petstore/scala-finch/pom.xml +++ b/samples/server/petstore/scala-finch/pom.xml @@ -21,6 +21,8 @@ sbt + -ivy + ~/.ivy2 test diff --git a/samples/server/petstore/scala-lagom-server/pom.xml b/samples/server/petstore/scala-lagom-server/pom.xml index 7b7cbe76b93..7805ecac188 100644 --- a/samples/server/petstore/scala-lagom-server/pom.xml +++ b/samples/server/petstore/scala-lagom-server/pom.xml @@ -21,6 +21,8 @@ sbt + -ivy + ~/.ivy2 test diff --git a/samples/server/petstore/scala-play-server/pom.xml b/samples/server/petstore/scala-play-server/pom.xml index 9147d619bd9..dc679b82faf 100644 --- a/samples/server/petstore/scala-play-server/pom.xml +++ b/samples/server/petstore/scala-play-server/pom.xml @@ -21,6 +21,8 @@ sbt + -ivy + ~/.ivy2 test diff --git a/samples/server/petstore/scalatra/pom.xml b/samples/server/petstore/scalatra/pom.xml index d3b3420e90a..78aa6a5c3cc 100644 --- a/samples/server/petstore/scalatra/pom.xml +++ b/samples/server/petstore/scalatra/pom.xml @@ -21,6 +21,8 @@ sbt + -ivy + ~/.ivy2 test