Merge branch 'master' into generator-validation-option

* master: (26 commits)
  Prepare 3.0.1 release (OpenAPITools#280)
  [typescript-angular] strict type checking (OpenAPITools#218)
  [C++ server] Adjust the names (script, sample folder, generator) to lang option (OpenAPITools#250)
  Removed warnings for packages included in SDK for Net Core 2.0 (OpenAPITools#269)
  [cli] Completions command for suggestions (OpenAPITools#213)
  [Java][RestTemplate] Fix query parameter URL encoding (OpenAPITools#260)
  [cpp-qt5] Remove std::shared_ptr from Qt5 (OpenAPITools#267)
  Adds some links to the README (OpenAPITools#261)
  Update sec.gpg.enc to binary encoded secret
  Add gpg --check-trustdb, limit gpg to master
  Re-do encrypted gpg and reference in settings.xml
  Fix trailing semicolons in after_success Travis CI scripts
  Use ubuntu keyserver instead of mit (due to timeout)
  [gradle] Plugin release management (OpenAPITools#201)
  Updates small typo in qna.md (OpenAPITools#262)
  Fix ModelUtils.getUnusedSchema() (OpenAPITools#253)
  Add JaxRS to bin/ensure-up-to-date (OpenAPITools#248)
  feat(security): add cookie-auth support (OpenAPITools#240)
  Add 'unblu inc.' to company list (OpenAPITools#246)
  put company list in alphabetical order (OpenAPITools#244)
  ...

Author: jimschubert

.gitignore

@@ -3,6 +3,7 @@
 out/
 *.ipr
 *.iws
+*.gpg
 classpath.txt
 version.properties
 !modules/openapi-generator-cli/src/main/resources/version.properties

.travis.yml

@@ -9,8 +9,9 @@ cache:
   - $HOME/.ivy2
   - $HOME/.gradle/caches/
   - $HOME/.gradle/wrapper/
+  - $HOME/samples/client/petstore/javascript/node_modules
   - $HOME/samples/client/petstore/php/OpenAPIToolsClient-php/vendor
-  - $HOME/samples/client/petstore/ruby/venodr/bundle
+  - $HOME/samples/client/petstore/ruby/vendor/bundle
   - $HOME/samples/client/petstore/python/.venv/
   - $HOME/samples/client/petstore/typescript-node/npm/node_modules
   - $HOME/samples/client/petstore/typescript-node/npm/typings/
@@ -72,6 +73,11 @@ before_install:
   - cat /etc/hosts
   # show java version
   - java -version
+  - if [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+      openssl aes-256-cbc -K $encrypted_6e2c8bba47c6_key -iv $encrypted_6e2c8bba47c6_iv -in sec.gpg.enc -out sec.gpg -d ;
+      gpg --keyserver keyserver.ubuntu.com --recv-key $SIGNING_KEY ;
+      gpg --check-trustdb ;
+    fi;
 
 install:
   # Add Godeps dependencies to GOPATH and PATH
@@ -93,10 +99,15 @@ script:
   - mvn --quiet clean install
   - mvn --quiet verify -Psamples
 after_success:
-  # push a snapshot version to maven repo
-  - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_BRANCH" = "master" ]; then
-      mvn clean deploy --settings CI/settings.xml;
+  # push to maven repo
+  - if [ $SONATYPE_USERNAME ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_BRANCH" = "master" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+      mvn clean deploy -DskipTests=true -B -U -P release --settings CI/settings.xml;
       echo "Finished mvn clean deploy for $TRAVIS_BRANCH";
+      pushd .;
+      cd modules/openapi-generator-gradle-plugin;
+      ./gradlew -Psigning.keyId="$SIGNING_KEY" -Psigning.password="$SIGNING_PASSPHRASE" -Psigning.secretKeyRingFile="${TRAVIS_BUILD_DIR}/sec.gpg" -PossrhUsername="${SONATYPE_USERNAME}" -PossrhPassword="${SONATYPE_PASSWORD}" uploadArchives --no-daemon;
+      echo "Finished ./gradlew uploadArchives";
+      popd;
     fi;
   ## docker: build and push openapi-generator-online to DockerHub
   - if [ $DOCKER_HUB_USERNAME ]; then echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin && docker build -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/openapi-generator-online && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_GENERATOR_IMAGE_NAME:latest $DOCKER_GENERATOR_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then docker push $DOCKER_GENERATOR_IMAGE_NAME && echo "Pushed to $DOCKER_GENERATOR_IMAGE_NAME"; fi; fi

CI/pom.xml.bash

@@ -9,7 +9,7 @@
     <artifactId>openapi-generator-project</artifactId>
     <packaging>pom</packaging>
     <name>openapi-generator-project</name>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.1</version>
     <url>https://github.com/openapi-tools/openapi-generator</url>
     <scm>
         <connection>scm:git:[email protected]:openapi-tools/openapi-generator.git</connection>

CI/pom.xml.circleci

@@ -10,7 +10,7 @@
     <artifactId>openapi-generator-project</artifactId>
     <packaging>pom</packaging>
     <name>openapi-generator-project</name>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.1</version>
     <url>https://github.com/openapitools/openapi-generator</url>
     <scm>
         <connection>scm:git:[email protected]:openapitools/openapi-generator.git</connection>

CI/pom.xml.circleci.java7

@@ -10,7 +10,7 @@
     <artifactId>openapi-generator-project</artifactId>
     <packaging>pom</packaging>
     <name>openapi-generator-project</name>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.1</version>
     <url>https://github.com/openapitools/openapi-generator</url>
     <scm>
         <connection>scm:git:[email protected]:openapitools/openapi-generator.git</connection>

CI/pom.xml.ios

@@ -9,7 +9,7 @@
     <artifactId>openapi-generator-project</artifactId>
     <packaging>pom</packaging>
     <name>openapi-generator-project</name>
-    <version>3.0.1-SNAPSHOT</version>
+    <version>3.0.1</version>
     <url>https://github.com/openapitools/openapi-generator</url>
     <scm>
         <connection>scm:git:[email protected]:openapitools/openapi-generator.git</connection>

CI/pom.xml.shippable

@@ -6,10 +6,10 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.openapitools</groupId>
-    <artifactId>openapi-generator-project</artifactId>
+    <artifactId>openapi-generator-shippable-pom</artifactId>
     <packaging>pom</packaging>
-    <name>openapi-generator-project</name>
-    <version>3.0.1-SNAPSHOT</version>
+    <name>openapi-generator-shippable-pom</name>
+    <version>3.0.1</version>
     <url>https://github.com/openapitools/openapi-generator</url>
     <scm>
         <connection>scm:git:[email protected]:openapitools/openapi-generator.git</connection>
@@ -858,10 +858,7 @@
         </profile>
     </profiles>
     <modules>
-        <module>../modules/openapi-generator</module>
-        <module>../modules/openapi-generator-cli</module>
-        <module>../modules/openapi-generator-maven-plugin</module>
-        <module>../modules/openapi-generator-online</module>
+        <module>../</module>
     </modules>
     <reporting>
         <outputDirectory>target/site</outputDirectory>

CI/settings.xml

@@ -10,9 +10,27 @@
             <username>${env.SONATYPE_USERNAME}</username>
             <password>${env.SONATYPE_PASSWORD}</password>
         </server>
+        <server>
+            <id>ossrh</id>
+            <username>${env.SONATYPE_USERNAME}</username>
+            <password>${env.SONATYPE_PASSWORD}</password>
+        </server>
     </servers>
     <mirrors/>
     <proxies/>
-    <profiles/>
+    <profiles>
+        <profile>
+            <id>release</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <gpg.executable>gpg</gpg.executable>
+                <gpg.keyname>${env.SIGNING_KEY}</gpg.keyname>
+                <gpg.passphrase>${env.SIGNING_PASSPHRASE}</gpg.passphrase>
+                <gpg.secretKeyring>${env.TRAVIS_BUILD_DIR}/sec.gpg</gpg.secretKeyring>
+            </properties>
+        </profile>
+    </profiles>
     <activeProfiles/>
 </settings>

README.md

@@ -76,7 +76,7 @@ OpenAPI Generator Version    | Release Date | OpenAPI Spec compatibility | Notes
 ---------------------------- | ------------ | -------------------------- | -----
 4.0.0 (upcoming major release) | TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Major release with breaking changes (no fallback)
 3.1.0 (upcoming minor release) | TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release with breaking changes (with fallbacks)
-3.0.1 (current master, upcoming release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/3.0.1-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Bug fixes release
+3.0.1 (current master, upcoming release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/3.0.1/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Bug fixes release
 3.0.0 | 01.06.2018 | 1.0, 1.1, 1.2, 2.0, 3.0   | First release with breaking changes
 
 ### [1.2 - Artifacts on Maven Central](#table-of-contents)
@@ -393,17 +393,23 @@ The OpenAPI Generator project is intended as a benefit for users of the Open API
 When code is generated from this project, it shall be considered **AS IS** and owned by the user of the software.  There are no warranties--expressed or implied--for generated code.  You can do what you wish with it, and once generated, the code is your responsibility and subject to the licensing terms that you deem appropriate.
 
 ## [4 - Companies/Projects using OpenAPI Generator](#table-of-contents)
-Here are some companies/projects using OpenAPI Generator in production. To add your company/project to the list, please visit [README.md](README.md) and click on the icon to edit the page.
+Here are some companies/projects (alphabetical order) using OpenAPI Generator in production. To add your company/project to the list, please visit [README.md](README.md) and click on the icon to edit the page.
 
-- [REST United](https://restunited.com)
-- [Raiffeisen Schweiz Genossenschaft](https://www.raiffeisen.ch)
+- [Angular.Schule](https://angular.schule/)
 - [Bithost GmbH](https://www.bithost.ch)
+- [GMO Pepabo](https://pepabo.com/en/)
+- [Raiffeisen Schweiz Genossenschaft](https://www.raiffeisen.ch)
+- [REST United](https://restunited.com)
+- [unblu inc.](https://www.unblu.com/)
+
 
 ## [5 - Presentations/Videos/Tutorials/Books](#table-of-contents)
 
 - 2018/05/12 - [OpenAPI Generator - community drivenで成長するコードジェネレータ](https://ackintosh.github.io/blog/2018/05/12/openapi-generator/) by [中野暁人](https://github.com/ackintosh)
 - 2018/05/15 - [Starting a new open-source project](http://jmini.github.io/blog/2018/2018-05-15_new-open-source-project.html) by [Jeremie Bresson](https://github.com/jmini)
 - 2018/05/15 - [REST API仕様からAPIクライアントやスタブサーバを自動生成する「OpenAPI Generator」オープンソースで公開。Swagger Codegenからのフォーク](https://www.publickey1.jp/blog/18/rest_apiapiopenapi_generatorswagger_generator.html) by [Publickey](https://www.publickey1.jp)
+- 2018/04/12 - [Generate Angular API clients with Swagger](https://angular.schule/blog/2018-04-swagger-codegen) by [JohannesHoppe](https://github.com/JohannesHoppe)
+- 2018/06/08 - [Swagger Codegen is now OpenAPI Generator](https://angular.schule/blog/2018-06-swagger-codegen-is-now-openapi-generator) by [JohannesHoppe](https://github.com/JohannesHoppe)
 
 ## [6 - About Us](#table-of-contents)
 

bin/pistache-server-petstore.sh renamed to bin/cpp-pistache-server-petstore.sh

@@ -27,6 +27,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 -g cpp-pistache-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -o samples/server/petstore/pistache-server $@"
+ags="generate -g cpp-pistache-server -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -o samples/server/petstore/cpp-pistache $@"
 
 java $JAVA_OPTS -jar $executable $ags