From cd61442387d09e72c11b62edd2e94c7188aa19a8 Mon Sep 17 00:00:00 2001 From: William Cheng Date: Tue, 4 Dec 2018 11:14:14 +0800 Subject: [PATCH] Improve checkout script on NPMJS wrapper (#1595) * improve checkout on npmjs wrapper * update readme --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- CI/pom.xml.bash | 942 ------------------------------ CI/pom.xml.ios | 950 ------------------------------- README.md | 8 +- bin/utils/release_checkout.rb | 21 +- 5 files changed, 23 insertions(+), 1900 deletions(-) delete mode 100644 CI/pom.xml.bash delete mode 100644 CI/pom.xml.ios diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 889322e2a6a..839e24917d4 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -2,7 +2,7 @@ - [ ] Read the [contribution guidelines](https://github.com/openapitools/openapi-generator/blob/master/CONTRIBUTING.md). - [ ] Ran the shell script under `./bin/` to update Petstore sample so that CIs can verify the change. (For instance, only need to run `./bin/{LANG}-petstore.sh` and `./bin/security/{LANG}-petstore.sh` if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in `.\bin\windows\`. -- [ ] Filed the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `3.4.x`, `4.0.x`. Default: `master`. +- [ ] Filed the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`~~, `3.4.x`, `4.0.x`~~. Default: `master`. - [ ] Copied the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) to review the pull request if your PR is targeting a particular programming language. ### Description of the PR diff --git a/CI/pom.xml.bash b/CI/pom.xml.bash deleted file mode 100644 index f450c15702f..00000000000 --- a/CI/pom.xml.bash +++ /dev/null @@ -1,942 +0,0 @@ - - - org.sonatype.oss - oss-parent - 5 - - 4.0.0 - org.openapitools - openapi-generator-project - pom - openapi-generator-project - 4.0.0-SNAPSHOT - https://github.com/openapi-tools/openapi-generator - - scm:git:git@github.com:openapi-tools/openapi-generator.git - scm:git:git@github.com:openapi-tools/openapi-generator.git - https://github.com/openapi-tools/openapi-generator - - - - - fehguy - Tony Tam - fehguy@gmail.com - - - - wing328 - William Cheng - wing328hk@gmail.com - - - jimschubert - Jim Schubert - james.schubert@gmail.com - - - cbornet - Christophe Bornet - - - jaz-ah - Joseph Zuromski - - - ackintosh - Akihito Nakano - - - JFCote - Jean-François Côté - - - jmini - Jérémie Bresson - dev@jmini.fr - - - - github - https://github.com/openapi-tools/openapi-generator/issues - - - - Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0.html - repo - - - - src/main/java - target/classes - - - org.jvnet.wagon-svn - wagon-svn - 1.8 - - - org.apache.maven.wagon - wagon-ssh-external - 1.0-alpha-6 - - - org.apache.maven.wagon - wagon-webdav - 1.0-beta-1 - - - install - target - ${project.artifactId}-${project.version} - - - net.revelc.code - formatter-maven-plugin - - - - 1.8 - 1.8 - 1.8 - LF - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire-version} - - none:none - -XX:+StartAttachListener - - - - test-testng - test - - test - - - none:none - org.testng:testng - - - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory}/lib - - - - - - maven-compiler-plugin - 3.6.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - - development - ${project.url} - ${project.version} - org.openapi-tools - - - - - - org.apache.maven.plugins - maven-site-plugin - 3.5.1 - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.1 - - true - 1.8 - UTF-8 - 1g - true - ${javadoc.package.exclude} - - - - attach-javadocs - verify - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - verify - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.4.1 - - - enforce-versions - - enforce - - - - - 3.2.5 - - - - - - - - - - - net.revelc.code - formatter-maven-plugin - 0.5.2 - - - - - - - release-profile - - true - - - - - net.alchim31.maven - scala-maven-plugin - - - - compile - testCompile - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - prepare-package - - add-source - - - - src/main/scala - - - - - - - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - - - android-client - - - env - java - - - - samples/client/petstore/android/volley - - - - bash-client - - - env - java - - - - samples/client/petstore/bash - - - - clojure-client - - - env - clojure - - - - samples/client/petstore/clojure - - - - haskell-http-client - - - env - haskell-http-client - - - - samples/client/petstore/haskell-http-client - - - - haskell-http-client-integration-test - - - env - haskell-http-client - - - - samples/client/petstore/haskell-http-client/tests-integration - - - - java-client-jersey1 - - - env - java - - - - samples/client/petstore/java/jersey1 - - - - java-client-jersey2 - - - env - java - - - - samples/client/petstore/java/jersey2 - - - - java-client-jersey2-java6 - - - env - java - - - - samples/client/petstore/java/jersey2-java6 - - - - java-client-okhttp-gson - - - env - java - - - - samples/client/petstore/java/okhttp-gson - - - - java-client-okhttp-gson-parcelable - - - env - java - - - - samples/client/petstore/java/okhttp-gson/parcelableModel - - - - java-client-retrofit - - - env - java - - - - samples/client/petstore/java/retrofit - - - - java-client-retrofit2 - - - env - java - - - - samples/client/petstore/java/retrofit2 - - - - java-client-retrofit2-rx - - - env - java - - - - samples/client/petstore/java/retrofit2rx - - - - java-client-feign - - - env - java - - - - samples/client/petstore/java/feign - - - - javascript-client - - - env - javascript - - - - samples/client/petstore/javascript - - - - scala-client - - - env - scala - - - - samples/client/petstore/scala - - - - java-msf4j-server - - - env - java - - - - samples/server/petstore/java-msf4/ - - - - jaxrs-cxf-server - - - env - java - - - - samples/server/petstore/jaxrs-cxf - - - - jaxrs-resteasy-server - - - env - java - - - - samples/server/petstore/jaxrs-resteasy/default - - - - jaxrs-resteasy-server-joda - - - env - java - - - - samples/server/petstore/jaxrs-resteasy/joda - - - - jaxrs-resteasy-eap-server - - - env - java - - - - samples/server/petstore/jaxrs-resteasy/eap - - - - jaxrs-resteasy-eap-server-joda - - - env - java - - - - samples/server/petstore/jaxrs-resteasy/eap-joda - - - - jaxrs-server - - - env - java - - - - samples/server/petstore/jaxrs/jersey2 - - - - jaxrs-server-jersey1 - - - env - java - - - - samples/server/petstore/jaxrs/jersey1 - - - - typescript-fetch-client-tests-default - - - env - java - - - - samples/client/petstore/typescript-fetch/tests/default - - - - typescript-fetch-client-builds-default - - - env - java - - - - samples/client/petstore/typescript-fetch/builds/default - - - - typescript-fetch-client-builds-es6-target - - - env - java - - - - samples/client/petstore/typescript-fetch/builds/es6-target - - - - typescript-fetch-client-builds-with-npm-version - - - env - java - - - - samples/client/petstore/typescript-fetch/builds/with-npm-version - - - - typescript-angularjs-client - - - env - java - - - - samples/client/petstore/typescript-angularjs/npm - - - - typescript-node-npm-client - - - env - java - - - - samples/client/petstore/typescript-node/npm - - - - python-client - - - env - java - - - - samples/client/petstore/python - - - - ruby-client - - - env - java - - - - samples/client/petstore/ruby - - - - go-client - - - env - java - - - - samples/client/petstore/go - - - - spring-mvc - - - env - java - - - - samples/server/petstore/spring-mvc - - - - springboot-beanvalidation - - - env - java - - - - samples/server/petstore/springboot-beanvalidation - - - - springboot-reactive - - - env - java - - - - samples/server/petstore/springboot-reactive - - - - springboot - - - env - java - - - - samples/server/petstore/springboot - - - - spring-cloud - - - env - java - - - - samples/client/petstore/spring-cloud - - - - scalatra-server - - - env - java - - - - samples/server/petstore/scalatra - - - - java-inflector - - - env - java - - - - samples/server/petstore/java-inflector - - - - java-undertowr - - - env - java - - - - samples/server/petstore/undertow - - - - samples - - - env - samples - - - - samples/client/petstore/bash - - - - - modules/openapi-generator - modules/openapi-generator-cli - modules/openapi-generator-maven-plugin - modules/openapi-generator-online - - - target/site - - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin-version} - - - org.apache.maven.plugins - maven-jxr-plugin - 2.5 - - true - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.9 - - - - project-team - - - - - - - - - - junit - junit - ${junit-version} - test - - - org.testng - testng - ${testng-version} - test - - - org.jmockit - jmockit - ${jmockit-version} - test - - - - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - - - - - 2.0.4 - 2.0.4 - 2.11.1 - 3.4.0-SNAPSHOT - 2.4 - 1.2 - 4.8.1 - 2.8.9 - 1.0.0 - 3.4 - 1.7.12 - 3.2.1 - 1.14 - 6.9.6 - 2.19.1 - 1.25 - 0.9.10 - 2.0.2.RELEASE - - diff --git a/CI/pom.xml.ios b/CI/pom.xml.ios deleted file mode 100644 index d7f0bcba3aa..00000000000 --- a/CI/pom.xml.ios +++ /dev/null @@ -1,950 +0,0 @@ - - - org.sonatype.oss - oss-parent - 5 - - 4.0.0 - org.openapitools - openapi-generator-project - pom - openapi-generator-project - 4.0.0-SNAPSHOT - https://github.com/openapitools/openapi-generator - - scm:git:git@github.com:openapitools/openapi-generator.git - scm:git:git@github.com:openapitools/openapi-generator.git - https://github.com/openapitools/openapi-generator - - - - - fehguy - Tony Tam - fehguy@gmail.com - - - - wing328 - William Cheng - wing328hk@gmail.com - - - jimschubert - Jim Schubert - james.schubert@gmail.com - - - cbornet - Christophe Bornet - - - jaz-ah - Joseph Zuromski - - - ackintosh - Akihito Nakano - - - JFCote - Jean-François Côté - - - jmini - Jérémie Bresson - dev@jmini.fr - - - - github - https://github.com/openapitools/openapi-generator/issues - - - - Apache License 2.0 - http://www.apache.org/licenses/LICENSE-2.0.html - repo - - - - src/main/java - target/classes - - - org.jvnet.wagon-svn - wagon-svn - 1.8 - - - org.apache.maven.wagon - wagon-ssh-external - 1.0-alpha-6 - - - org.apache.maven.wagon - wagon-webdav - 1.0-beta-1 - - - install - target - ${project.artifactId}-${project.version} - - - net.revelc.code - formatter-maven-plugin - - - - 1.8 - 1.8 - 1.8 - LF - - - - - org.apache.maven.plugins - maven-surefire-plugin - ${surefire-version} - - none:none - -XX:+StartAttachListener - - - - test-testng - test - - test - - - none:none - org.testng:testng - - - - - - maven-dependency-plugin - - - package - - copy-dependencies - - - ${project.build.directory}/lib - - - - - - maven-compiler-plugin - 3.6.1 - - 1.8 - 1.8 - - - - org.apache.maven.plugins - maven-jar-plugin - 3.0.2 - - - - development - ${project.url} - ${project.version} - org.openapitools - - - - - - org.apache.maven.plugins - maven-site-plugin - 3.5.1 - - - org.apache.maven.plugins - maven-release-plugin - 2.5.3 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.0.1 - - true - 1.8 - UTF-8 - 1g - true - ${javadoc.package.exclude} - - - - attach-javadocs - verify - - jar - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.0.1 - - - attach-sources - verify - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.4.1 - - - enforce-versions - - enforce - - - - - 3.2.5 - - - - - - - - - - - net.revelc.code - formatter-maven-plugin - 0.5.2 - - - - - - - release-profile - - true - - - - - net.alchim31.maven - scala-maven-plugin - - - - compile - testCompile - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-source - prepare-package - - add-source - - - - src/main/scala - - - - - - - - - - release-sign-artifacts - - - performRelease - true - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - - - android-client - - - env - java - - - - samples/client/petstore/android/volley - - - - bash-client - - - env - java - - - - samples/client/petstore/bash - - - - clojure-client - - - env - clojure - - - - samples/client/petstore/clojure - - - - haskell-http-client - - - env - haskell-http-client - - - - samples/client/petstore/haskell-http-client - - - - haskell-http-client-integration-test - - - env - haskell-http-client - - - - samples/client/petstore/haskell-http-client/tests-integration - - - - java-client-jersey1 - - - env - java - - - - samples/client/petstore/java/jersey1 - - - - java-client-jersey2 - - - env - java - - - - samples/client/petstore/java/jersey2 - - - - java-client-jersey2-java6 - - - env - java - - - - samples/client/petstore/java/jersey2-java6 - - - - java-client-okhttp-gson - - - env - java - - - - samples/client/petstore/java/okhttp-gson - - - - java-client-okhttp-gson-parcelable - - - env - java - - - - samples/client/petstore/java/okhttp-gson/parcelableModel - - - - java-client-retrofit - - - env - java - - - - samples/client/petstore/java/retrofit - - - - java-client-retrofit2 - - - env - java - - - - samples/client/petstore/java/retrofit2 - - - - java-client-retrofit2-rx - - - env - java - - - - samples/client/petstore/java/retrofit2rx - - - - java-client-feign - - - env - java - - - - samples/client/petstore/java/feign - - - - javascript-client - - - env - javascript - - - - samples/client/petstore/javascript - - - - scala-client - - - env - scala - - - - samples/client/petstore/scala - - - - java-msf4j-server - - - env - java - - - - samples/server/petstore/java-msf4/ - - - - jaxrs-cxf-server - - - env - java - - - - samples/server/petstore/jaxrs-cxf - - - - jaxrs-resteasy-server - - - env - java - - - - samples/server/petstore/jaxrs-resteasy/default - - - - jaxrs-resteasy-server-joda - - - env - java - - - - samples/server/petstore/jaxrs-resteasy/joda - - - - jaxrs-resteasy-eap-server - - - env - java - - - - samples/server/petstore/jaxrs-resteasy/eap - - - - jaxrs-resteasy-eap-server-joda - - - env - java - - - - samples/server/petstore/jaxrs-resteasy/eap-joda - - - - jaxrs-server - - - env - java - - - - samples/server/petstore/jaxrs/jersey2 - - - - jaxrs-server-jersey1 - - - env - java - - - - samples/server/petstore/jaxrs/jersey1 - - - - typescript-fetch-client-tests-default - - - env - java - - - - samples/client/petstore/typescript-fetch/tests/default - - - - typescript-fetch-client-builds-default - - - env - java - - - - samples/client/petstore/typescript-fetch/builds/default - - - - typescript-fetch-client-builds-es6-target - - - env - java - - - - samples/client/petstore/typescript-fetch/builds/es6-target - - - - typescript-fetch-client-builds-with-npm-version - - - env - java - - - - samples/client/petstore/typescript-fetch/builds/with-npm-version - - - - typescript-angularjs-client - - - env - java - - - - samples/client/petstore/typescript-angularjs/npm - - - - typescript-node-npm-client - - - env - java - - - - samples/client/petstore/typescript-node/npm - - - - python-client - - - env - java - - - - samples/client/petstore/python - - - - ruby-client - - - env - java - - - - samples/client/petstore/ruby - - - - go-client - - - env - java - - - - samples/client/petstore/go - - - - spring-mvc - - - env - java - - - - samples/server/petstore/spring-mvc - - - - springboot-beanvalidation - - - env - java - - - - samples/server/petstore/springboot-beanvalidation - - - - springboot-reactive - - - env - java - - - - samples/server/petstore/springboot-reactive - - - - springboot - - - env - java - - - - samples/server/petstore/springboot - - - - spring-cloud - - - env - java - - - - samples/client/petstore/spring-cloud - - - - scalatra-server - - - env - java - - - - samples/server/petstore/scalatra - - - - java-inflector - - - env - java - - - - samples/server/petstore/java-inflector - - - - java-undertowr - - - env - java - - - - samples/server/petstore/undertow - - - - samples - - - env - samples - - - - samples/client/petstore/swift3/default/SwaggerClientTests - samples/client/petstore/swift3/promisekit/SwaggerClientTests - samples/client/petstore/swift3/rxswift/SwaggerClientTests - samples/client/petstore/swift/default/SwaggerClientTests - samples/client/petstore/swift/promisekit/SwaggerClientTests - samples/client/petstore/swift/rxswift/SwaggerClientTests - - - - - - modules/openapi-generator - modules/openapi-generator-cli - modules/openapi-generator-maven-plugin - modules/openapi-generator-online - - - target/site - - - net.alchim31.maven - scala-maven-plugin - ${scala-maven-plugin-version} - - - org.apache.maven.plugins - maven-jxr-plugin - 2.5 - - true - - - - org.apache.maven.plugins - maven-project-info-reports-plugin - 2.9 - - - - project-team - - - - - - - - - - junit - junit - ${junit-version} - test - - - org.testng - testng - ${testng-version} - test - - - org.jmockit - jmockit - ${jmockit-version} - test - - - - - - sonatype-snapshots - https://oss.sonatype.org/content/repositories/snapshots - - true - - - - - 2.0.4 - 2.0.4 - 2.11.1 - 3.4.0-SNAPSHOT - 2.4 - 1.2 - 4.8.1 - 2.8.9 - 1.0.0 - 3.4 - 1.7.12 - 3.2.1 - 1.14 - 6.9.6 - 2.19.1 - 1.25 - 0.9.10 - 2.0.2.RELEASE - - diff --git a/README.md b/README.md index 50e7778ff6a..64c1204f219 100644 --- a/README.md +++ b/README.md @@ -2,15 +2,11 @@
-[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`3.3.4`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator) +[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`4.0.0`): [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/master.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator) [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator) [![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=master)](https://app.shippable.com/github/OpenAPITools/openapi-generator) [![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator-wh2wu) -[`4.0.x`](https://github.com/OpenAPITools/openapi-generator/tree/4.0.x) branch: [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/4.0.x.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator) -[![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator/tree/4.0.x.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator) -[![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=4.0.x)](https://app.shippable.com/github/OpenAPITools/openapi-generator) -[![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=4.0.x&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator-wh2wu)
@@ -83,7 +79,7 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20 OpenAPI Generator Version | Release Date | Notes ---------------------------- | ------------ | ----- -4.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.0.0-SNAPSHOT/)| 20.12.2018 | Major release with breaking changes (with or without fallback) +4.0.0 (upcoming release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.0.0-SNAPSHOT/)| 20.12.2018 | Major release with breaking changes (with or without fallback) [3.3.4](https://github.com/OpenAPITools/openapi-generator/releases/tag/v3.3.4) (latest stable release) | 30.11.2018 | Bugfix release OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0 diff --git a/bin/utils/release_checkout.rb b/bin/utils/release_checkout.rb index cbeb7e47ef5..720f139c41e 100755 --- a/bin/utils/release_checkout.rb +++ b/bin/utils/release_checkout.rb @@ -1,8 +1,26 @@ -#release_chekcout.rb +#!/usr/bin/env ruby +# +# release_chekcout.rb +# require 'rubygems' require 'open-uri' require 'net/http' +def check_npmjs + print "Checking npmjs... " + + url = "https://www.npmjs.com/package/@openapitools/openapi-generator-cli?activeTab=versions" + open(url) do |f| + content = f.read + if !content.nil? && content.include?($version) + puts "[OK]" + else + puts "[ERROR]" + puts "> #{url} not yet updated with #{$version}" + end + end +end + def check_homebrew print "Checking homebrew forumla ... " @@ -184,6 +202,7 @@ $version = ARGV[0] puts "Running checkout on OpenAPI Generator release #{$version}" +check_npmjs check_homebrew check_openapi_generator_jar check_openapi_generator_cli_jar