From 65eb64ce5e3085ec628e1604dbecb24fd497a619 Mon Sep 17 00:00:00 2001 From: Paul Ebermann Date: Thu, 16 Mar 2017 18:23:21 +0100 Subject: [PATCH 1/3] Update samples for akka. --- samples/client/petstore/akka-scala/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/client/petstore/akka-scala/pom.xml b/samples/client/petstore/akka-scala/pom.xml index d37f26cfb4c..0715ac9c4f6 100644 --- a/samples/client/petstore/akka-scala/pom.xml +++ b/samples/client/petstore/akka-scala/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 io.swagger - scala-akka-petstore-client + swagger-client jar - scala-akka-petstore-client + swagger-client 1.0.0 2.2.0 From bd195fd4a0e2a63cbf649418da848c2606d7136d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Thu, 16 Mar 2017 21:02:15 +0100 Subject: [PATCH 2/3] Have akka-scala-petstore scripts set the correct artifact names --- bin/akka-scala-petstore.sh | 2 +- bin/windows/akka-scala-petstore.bat | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/akka-scala-petstore.sh b/bin/akka-scala-petstore.sh index 0fc8dafd2d7..3340758f9ed 100755 --- a/bin/akka-scala-petstore.sh +++ b/bin/akka-scala-petstore.sh @@ -26,6 +26,6 @@ fi # if you've executed sbt assembly previously it will use that instead. export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties" -ags="$@ generate -t modules/swagger-codegen/src/main/resources/akka-scala -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l akka-scala -o samples/client/petstore/akka-scala" +ags="$@ generate --artifact-id "scala-akka-petstore-client" -t modules/swagger-codegen/src/main/resources/akka-scala -i modules/swagger-codegen/src/test/resources/2_0/petstore.yaml -l akka-scala -o samples/client/petstore/akka-scala" java $JAVA_OPTS -jar $executable $ags diff --git a/bin/windows/akka-scala-petstore.bat b/bin/windows/akka-scala-petstore.bat index 27598a00a4b..86ec1ef6eff 100755 --- a/bin/windows/akka-scala-petstore.bat +++ b/bin/windows/akka-scala-petstore.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties -set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l akka-scala -o samples\client\petstore\akka-scala +set ags=generate --artifact-id "scala-akka-petstore-client" -i modules\swagger-codegen\src\test\resources\2_0\petstore.json -l akka-scala -o samples\client\petstore\akka-scala java %JAVA_OPTS% -jar %executable% %ags% From 03c3a12108faa6fb16758c143bc16834f1fa089f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pa=C5=ADlo=20Ebermann?= Date: Thu, 16 Mar 2017 21:03:11 +0100 Subject: [PATCH 3/3] Update akka-scala samples again. --- samples/client/petstore/akka-scala/pom.xml | 4 ++-- .../petstore/akka-scala/src/main/resources/reference.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/client/petstore/akka-scala/pom.xml b/samples/client/petstore/akka-scala/pom.xml index 0715ac9c4f6..d37f26cfb4c 100644 --- a/samples/client/petstore/akka-scala/pom.xml +++ b/samples/client/petstore/akka-scala/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 io.swagger - swagger-client + scala-akka-petstore-client jar - swagger-client + scala-akka-petstore-client 1.0.0 2.2.0 diff --git a/samples/client/petstore/akka-scala/src/main/resources/reference.conf b/samples/client/petstore/akka-scala/src/main/resources/reference.conf index f993f765edd..eefb864852e 100644 --- a/samples/client/petstore/akka-scala/src/main/resources/reference.conf +++ b/samples/client/petstore/akka-scala/src/main/resources/reference.conf @@ -12,7 +12,7 @@ io.swagger.client { connection-timeout: 5000ms default-headers { - "userAgent": "swagger-client_1.0.0" + "userAgent": "scala-akka-petstore-client_1.0.0" } // let you define custom http status code, as in :