forked from OpenAPITools/openapi-generator
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into release-versioning-helper
* master: (25 commits) Add #send to ruby reserved word list (OpenAPITools#3146) Merge java8 doc for spring (OpenAPITools#3122) added api key authentication to aspnetcore 2.1 (OpenAPITools#3089) Add "yue9944882" to Perl technical committee (OpenAPITools#3194) [csharp-netcore]: Adding http response details in api_docs and making example snippet compilable (OpenAPITools#3128) generate travis configuration (OpenAPITools#3193) Perl: Basic bearer auth support (OpenAPITools#3192) [R] feat(r) : Alternate PR for serialization fixes along with WithHttpInfo method enhancement (OpenAPITools#3099) improve release checkout script (OpenAPITools#3184) Prepare 4.0.3-SNAPSHOT (OpenAPITools#3185) 4.0.2 release (OpenAPITools#3181) Fix rubocop obsolescence (OpenAPITools#3175) Add Fuse to the company list (OpenAPITools#3164) Idiomatic Rust returns for Error conversions (OpenAPITools#2812) Add API timeout handling (OpenAPITools#3078) Import inner items for map (OpenAPITools#3123) update core team in pom.xml (OpenAPITools#3126) [gradle] Document consuming via gradle plugin portal (OpenAPITools#3125) Bump up babel-cli version to fix security alert (OpenAPITools#3121) [C++] [cpprestsdk] Add examples and test for cpprestsdk (OpenAPITools#3109) ...
- Loading branch information
Showing
1,069 changed files
with
5,976 additions
and
3,867 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
oracle64-1.8.0.152 | ||
1.8 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2,7 +2,7 @@ | |
|
||
<div align="center"> | ||
|
||
[Master](https://github.com/OpenAPITools/openapi-generator/tree/master) (`4.0.2`): [![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.3`): [![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) | ||
|
@@ -99,8 +99,8 @@ OpenAPI Generator Version | Release Date | Notes | |
---------------------------- | ------------ | ----- | ||
5.0.0 (upcoming major release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/5.0.0-SNAPSHOT/)| 13.05.2020 | Major release with breaking changes (no fallback) | ||
4.1.0 (upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.1.0-SNAPSHOT/)| 15.07.2019 | Minor release (breaking changes with fallbacks) | ||
4.0.2 (upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.0.1-SNAPSHOT/)| 15.06.2019 | Patch release (minor bug fixes, etc) | ||
<!-- RELEASE_VERSION -->[4.0.1](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.0.1) (latest stable release) | 31.05.2019 | Patch release (bug fixes, minor enhancements, etc)<!-- /RELEASE_VERSION --> | ||
4.0.3 (upcoming patch release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/org/openapitools/openapi-generator-cli/4.0.3-SNAPSHOT/)| 04.07.2019 | Patch release (minor bug fixes, etc) | ||
<!-- RELEASE_VERSION -->[4.0.2](https://github.com/OpenAPITools/openapi-generator/releases/tag/v4.0.2) (latest stable release) | 20.06.2019 | Patch release (bug fixes, minor enhancements, etc)<!-- /RELEASE_VERSION --> | ||
|
||
OpenAPI Spec compatibility: 1.0, 1.1, 1.2, 2.0, 3.0 | ||
|
||
|
@@ -156,16 +156,16 @@ See the different versions of the [openapi-generator-cli](https://mvnrepository. | |
<!-- RELEASE_VERSION --> | ||
If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 8 runtime at a minimum): | ||
|
||
JAR location: `http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.1/openapi-generator-cli-4.0.1.jar` | ||
JAR location: `http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.2/openapi-generator-cli-4.0.2.jar` | ||
|
||
For **Mac/Linux** users: | ||
```sh | ||
wget http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.1/openapi-generator-cli-4.0.1.jar -O openapi-generator-cli.jar | ||
wget http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.2/openapi-generator-cli-4.0.2.jar -O openapi-generator-cli.jar | ||
``` | ||
|
||
For **Windows** users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g. | ||
``` | ||
Invoke-WebRequest -OutFile openapi-generator-cli.jar http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.1/openapi-generator-cli-4.0.1.jar | ||
Invoke-WebRequest -OutFile openapi-generator-cli.jar http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.2/openapi-generator-cli-4.0.2.jar | ||
``` | ||
|
||
After downloading the JAR, run `java -jar openapi-generator-cli.jar help` to show the usage. | ||
|
@@ -367,11 +367,12 @@ Install it globally to get the CLI available on the command line: | |
npm install @openapitools/openapi-generator-cli -g | ||
openapi-generator version | ||
``` | ||
|
||
<!-- RELEASE_VERSION --> | ||
Or install a particular OpenAPI Generator version (e.g. v4.0.1): | ||
Or install a particular OpenAPI Generator version (e.g. v4.0.2): | ||
|
||
```sh | ||
npm install @openapitools/[email protected].1 -g | ||
npm install @openapitools/[email protected].2 -g | ||
``` | ||
|
||
Or install it as dev-dependency: | ||
|
@@ -393,9 +394,11 @@ java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar generat | |
-o /var/tmp/php_api_client | ||
``` | ||
(if you're on Windows, replace the last command with `java -jar modules\openapi-generator-cli\target\openapi-generator-cli.jar generate -i https://raw.githubusercontent.com/openapitools/openapi-generator/master/modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g php -o c:\temp\php_api_client`) | ||
|
||
<!-- RELEASE_VERSION --> | ||
You can also download the JAR (latest release) directly from [maven.org](http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.1/openapi-generator-cli-4.0.1.jar) | ||
You can also download the JAR (latest release) directly from [maven.org](http://central.maven.org/maven2/org/openapitools/openapi-generator-cli/4.0.2/openapi-generator-cli-4.0.2.jar) | ||
<!-- /RELEASE_VERSION --> | ||
|
||
To get a list of **general** options available, please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar help generate` | ||
|
||
To get a list of PHP specified options (which can be passed to the generator with a config file via the `-c` option), please run `java -jar modules/openapi-generator-cli/target/openapi-generator-cli.jar config-help -g php` | ||
|
@@ -536,6 +539,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in | |
- [codecentric AG](https://www.codecentric.de/) | ||
- [Cupix](https://www.cupix.com/) | ||
- [FormAPI](https://formapi.io/) | ||
- [Fuse](https://www.fuse.no/) | ||
- [GenFlow](https://github.com/RepreZen/GenFlow) | ||
- [GMO Pepabo](https://pepabo.com/en/) | ||
- [GoDaddy](https://godaddy.com) | ||
|
@@ -603,8 +607,8 @@ OpenAPI Generator core team members are contributors who have been making signif | |
* [@jimschubert](https://github.com/jimschubert) (2016/05) [:heart:](https://www.patreon.com/jimschubert) | ||
* [@cbornet](https://github.com/cbornet) (2016/05) | ||
* [@ackintosh](https://github.com/ackintosh) (2018/02) [:heart:](https://www.patreon.com/ackintosh/overview) | ||
* [@jmini](https://github.com/jmini) (2018/04) | ||
* [@sunn](https://github.com/sunn) (2019/06) | ||
* [@jmini](https://github.com/jmini) (2018/04) [:heart:](https://www.patreon.com/jmini) | ||
* [@etherealjoy](https://github.com/etherealjoy) (2019/06) | ||
|
||
:heart: = Link to support the contributor directly | ||
|
||
|
@@ -775,7 +779,7 @@ If you want to join the committee, please kindly apply by sending an email to te | |
| Lua | @daurnimator (2017/08) | | ||
| NodeJS/Javascript | @CodeNinjai (2017/07) @frol (2017/07) @cliffano (2017/07) | | ||
| ObjC | | | ||
| Perl | @wing328 (2017/07) [:heart:](https://www.patreon.com/wing328) | | ||
| Perl | @wing328 (2017/07) [:heart:](https://www.patreon.com/wing328) @yue9944882 (2019/06) | | ||
| PHP | @jebentier (2017/07), @dkarlovi (2017/07), @mandrean (2017/08), @jfastnacht (2017/09), @ackintosh (2017/09) [:heart:](https://www.patreon.com/ackintosh/overview), @ybelenko (2018/07), @renepardon (2018/12) | | ||
| PowerShell | | | ||
| Python | @taxpon (2017/07) @frol (2017/07) @mbohlool (2017/07) @cbornet (2017/09) @kenjones-cisco (2017/11) @tomplus (2018/10) @Jyhess (2019/01) | | ||
|
@@ -812,7 +816,7 @@ OpenAPI Generator is a fork of [Swagger Codegen](https://github.com/swagger-api/ | |
- [Jean-François Côté](https://github.com/JFCote) | ||
- [Jim Schubert](https://github.com/jimschubert) | ||
- [Jon Schoning](https://github.com/jonschoning) | ||
- [Jérémie Bresson](https://github.com/jmini) | ||
- [Jérémie Bresson](https://github.com/jmini) [:heart:](https://www.patreon.com/jmini) | ||
- [Jörn Ahrens](https://github.com/jayearn) | ||
- [Keni Steward](https://github.com/kenisteward) | ||
- [Marcin Stefaniuk](https://github.com/mstefaniuk) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
#!/bin/bash | ||
# | ||
# usage: ./bin/utils/release_version_update.sh 3.0.1-SNAPSHOT 3.0.1 | ||
# | ||
# Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech) | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
# | ||
|
||
if [[ "$1" != "" ]]; then | ||
FROM="$1" | ||
else | ||
echo "Missing argument. Usage e.g.: ./bin/utils/release_version_update.sh 3.0.1-SNAPSHOT 3.0.1" | ||
exit 1; | ||
fi | ||
|
||
if [[ "$2" != "" ]]; then | ||
TO="$2" | ||
else | ||
echo "Missing argument. Usage e.g.: ./bin/utils/release_version_update.sh 3.0.1-SNAPSHOT 3.0.1" | ||
exit 1; | ||
fi | ||
|
||
echo "Release preparation: replacing $FROM with $TO in different files" | ||
|
||
declare -a files=("modules/openapi-generator-maven-plugin/README.md" | ||
"modules/openapi-generator-maven-plugin/examples/multi-module/java-client/pom.xml" | ||
"modules/openapi-generator-maven-plugin/examples/java-client.xml" | ||
"modules/openapi-generator-maven-plugin/examples/non-java-invalid-spec.xml" | ||
"modules/openapi-generator-maven-plugin/examples/non-java.xml" | ||
"modules/openapi-generator-gradle-plugin/README.adoc" | ||
"modules/openapi-generator-gradle-plugin/gradle.properties" | ||
"modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties" | ||
"modules/openapi-generator-gradle-plugin/samples/local-spec/README.md" | ||
"README.md") | ||
|
||
sedi () { | ||
# Cross-platform version of sed -i that works both on Mac and Linux | ||
sed --version >/dev/null 2>&1 && sed -i -e "$@" || sed -i "" "$@" | ||
} | ||
|
||
for filename in "${files[@]}"; do | ||
# e.g. sed -i '' "s/3.0.1-SNAPSHOT/3.0.1/g" CI/pom.xml.bash | ||
#echo "Running command: sed -i '' "s/$FROM/$TO/g" $filename" | ||
if sedi "s/$FROM/$TO/g" $filename; then | ||
echo "Updated $filename successfully!" | ||
else | ||
echo "ERROR: Failed to update $filename with the following command" | ||
echo "sed -i '' \"s/$FROM/$TO/g\" $filename" | ||
fi | ||
done |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
.bak/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
modules/openapi-generator-gradle-plugin/samples/local-spec/gradle.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
# RELEASE_VERSION | ||
openApiGeneratorVersion=4.0.2-SNAPSHOT | ||
openApiGeneratorVersion=4.0.3-SNAPSHOT | ||
# /RELEASE_VERSION |
Binary file added
BIN
+54.9 KB
modules/openapi-generator-gradle-plugin/samples/local-spec/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions
5
...enapi-generator-gradle-plugin/samples/local-spec/gradle/wrapper/gradle-wrapper.properties
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists |
Oops, something went wrong.