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 html2-docs-incomplete
* master: (2170 commits) [ci][test] Fix samples (OpenAPITools#7509) [bug][Java] Honor instantiationMap for default values for array, map, set (OpenAPITools#4982) Fix stringifying of ~= (OpenAPITools#7460) minor formatting change (OpenAPITools#7503) [ruby] Fix generation when generateAliasAsModel is enabled (OpenAPITools#7419) [sonar][ci] Fixes some new recommended "bug" fixes found via Sonar (OpenAPITools#7508) Add option to set recursion limit (OpenAPITools#7491) regenerate java pkmst petstore samples (OpenAPITools#7502) fix issue without http signature auth (OpenAPITools#7504) [ruby] Support for per-operation servers (OpenAPITools#7415) Add a link to react native tutorial (OpenAPITools#7505) update of Objective-C model-body.mustache to support discriminator.mappedModels (OpenAPITools#7471) update samples [ci] Sonar bug fixes (OpenAPITools#7497) fixed the backslash issue (OpenAPITools#7492) Fix the range check condition (OpenAPITools#7482) [batch] Option to clean files before generation (OpenAPITools#7465) [java][groovy] Fix mangled src paths in outputs on Windows (OpenAPITools#7487) remove haskell stack installation in shippable ci (OpenAPITools#7481) remove hardcoded PetApi (OpenAPITools#7483) ...
- Loading branch information
Showing
23,860 changed files
with
1,118,488 additions
and
723,756 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
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
Validating CODEOWNERS rules …
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,30 @@ | ||
| ## Core team | ||
| modules/openapi-generator/src/main/java/org/openapitools/codegen/*.java @OpenAPITools/generator-core-team | ||
| modules/openapi-generator/src/main/java/org/openapitools/codegen/auth/*.java @OpenAPITools/generator-core-team | ||
| modules/openapi-generator/src/main/java/org/openapitools/codegen/config/*.java @OpenAPITools/generator-core-team | ||
| modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/*.java @OpenAPITools/generator-core-team | ||
| modules/openapi-generator/src/main/java/org/openapitools/codegen/ignore/**/*.java @OpenAPITools/generator-core-team | ||
| modules/openapi-generator/src/main/java/org/openapitools/codegen/serializer/*.java @OpenAPITools/generator-core-team | ||
| modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/**/*.java @OpenAPITools/generator-core-team | ||
| modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/**/*.java @OpenAPITools/generator-core-team | ||
| modules/openapi-generator-core/**/* @OpenAPITools/generator-core-team | ||
|
|
||
| # No need for auto-generated subdirectories (reduces noise) | ||
| docs/ @OpenAPITools/generator-core-team | ||
|
|
||
| ## Individual interests | ||
| .github/**/* @jimschubert | ||
| scripts/**/* @jimschubert | ||
| website/**/* @jimschubert | ||
| bin/ci/**/* @jimschubert | ||
|
|
||
| ## Bulid related | ||
| CI/**/* @OpenAPITools/build | ||
| .mvn/**/* @OpenAPITools/build | ||
| bin/utils/**/* @OpenAPITools/build | ||
|
|
||
| ## Module-specific | ||
| modules/openapi-generator-cli/**/* @jimschubert | ||
| modules/openapi-generator-gradle-plugin/**/* @jimschubert | ||
| modules/openapi-generator-maven-plugin/**/* @jimschubert | ||
|
|
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 |
|---|---|---|
| @@ -1,11 +1,11 @@ | ||
| ### PR checklist | ||
| <!-- Enter details of the change here. Include additional tests that have been done, reference to the issue for tracking, etc. --> | ||
|
|
||
| <!-- Please check the completed items below --> | ||
| ### PR checklist | ||
|
|
||
| - [ ] 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`, `./bin/openapi3/{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\`. If contributing template-only or documentation-only changes which will change sample output, be sure to [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) first. | ||
| - [ ] Filed the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `4.1.x`, `5.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 | ||
|
|
||
| (details of the change, additional tests that have been done, reference to the issue for tracking, etc) | ||
|
|
||
| - [ ] Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community. | ||
| - [ ] If contributing template-only or documentation-only changes which will change sample output, [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) beforehand. | ||
| - [ ] Run the shell script `./bin/generate-samples.sh`to update all Petstore samples related to your fix. This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/configs/java*`. For Windows users, please run the script in [Git BASH](https://gitforwindows.org/). | ||
| - [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` | ||
| - [ ] Copy 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. |
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,87 @@ | ||
| name: Check Supported Java Versions | ||
| on: | ||
| push: | ||
| branches: | ||
| - master | ||
|
|
||
| jobs: | ||
| build: | ||
| name: Build on JDK ${{ matrix.java }} and ${{ matrix.os }} | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| matrix: | ||
| java: [8, 11] | ||
| os: [ubuntu-latest] | ||
| include: | ||
| - java: 8 | ||
| os: windows-latest | ||
| - java: 13 | ||
| os: ubuntu-latest | ||
| # Need to update to Gradle version with v13 support in modules/openapi-generator-gradle-plugin/pom.xml | ||
| flags: -am -pl modules/openapi-generator-cli | ||
| steps: | ||
| - name: Check out code | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Set up JDK ${{ matrix.java }} | ||
| uses: actions/setup-java@v1 | ||
| with: | ||
| java-version: ${{ matrix.java }} | ||
|
|
||
| - uses: actions/cache@v1 | ||
| with: | ||
| path: ~/.m2/repository | ||
| key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml', 'modules/**/pom.xml') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-maven- | ||
| - uses: actions/cache@v2 | ||
| with: | ||
| path: | | ||
| ~/.gradle/caches | ||
| ~/.gradle/wrapper | ||
| key: ${{ runner.os }}-gradle-${{ hashFiles('modules/openapi-generator-gradle-plugin/pom.xml') }} | ||
| restore-keys: | | ||
| ${{ runner.os }}-gradle- | ||
| - name: Build with Maven | ||
| shell: bash | ||
| run: mvn -nsu -B --quiet -Djacoco.skip=true -Dorg.slf4j.simpleLogger.defaultLogLevel=error --no-transfer-progress clean install --file pom.xml ${{ matrix.flags }} | ||
|
|
||
| - name: Test gradle | ||
| shell: bash | ||
| run: gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --stacktrace | ||
|
|
||
| - name: Upload Maven build artifact | ||
| uses: actions/upload-artifact@v1 | ||
| if: matrix.java == '8' && matrix.os == 'ubuntu-latest' | ||
| with: | ||
| name: artifact | ||
| path: modules/openapi-generator-cli/target/openapi-generator-cli.jar | ||
|
|
||
| verify: | ||
| name: Verifies integrity of the commit on ${{ matrix.os }} | ||
| needs: build | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest] | ||
| # include: | ||
| # - os: windows-latest | ||
| # flags: --skip-docs | ||
| steps: | ||
| - name: Check out code | ||
| uses: actions/checkout@v2 | ||
| - name: Download build artifact | ||
| uses: actions/download-artifact@v1 | ||
| with: | ||
| name: artifact | ||
| - name: Run Ensures Script | ||
| shell: bash | ||
| run: | | ||
| git config --global core.fileMode false | ||
| git config --global core.safecrlf false | ||
| git config --global core.autocrlf true | ||
| mkdir -p modules/openapi-generator-cli/target/ | ||
| mv artifact/openapi-generator-cli.jar modules/openapi-generator-cli/target/ | ||
| ./bin/utils/ensure-up-to-date ${{ matrix.flags }} |
Oops, something went wrong.