Skip to content

Commit 21e024a

Browse files
ibarangaibaranga
committed
Merge remote-tracking branch 'origin/master'
2 parents 6addc9a + 38dac13 commit 21e024a

File tree

2,021 files changed

+29174
-12460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,021 files changed

+29174
-12460
lines changed

‎.github/workflows/samples-java-client-jdk11.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ on:
1111
- samples/openapi3/client/petstore/java/jersey2-java8-swagger2/**
1212
- samples/openapi3/client/petstore/java/native**
1313
- samples/client/others/java/okhttp-gson-oneOf/**
14+
- samples/client/others/java/okhttp-gson-oneOf-array/**
1415
- samples/client/others/java/resttemplate-useAbstractionForFiles/**
1516
- samples/client/others/java/webclient-useAbstractionForFiles/**
1617
- samples/client/others/java/jersey2-oneOf-duplicates/**
@@ -26,6 +27,7 @@ on:
2627
- samples/openapi3/client/petstore/java/jersey2-java8-swagger2/**
2728
- samples/openapi3/client/petstore/java/native**
2829
- samples/client/others/java/okhttp-gson-oneOf/**
30+
- samples/client/others/java/okhttp-gson-oneOf-array/**
2931
- samples/client/others/java/resttemplate-useAbstractionForFiles/**
3032
- samples/client/others/java/webclient-useAbstractionForFiles/**
3133
- samples/client/others/java/jersey2-oneOf-duplicates/**
@@ -75,6 +77,7 @@ jobs:
7577
- samples/client/petstore/java/resttemplate-swagger2/
7678
- samples/openapi3/client/petstore/java/jersey2-java8-swagger2/
7779
- samples/client/others/java/okhttp-gson-oneOf/
80+
- samples/client/others/java/okhttp-gson-oneOf-array/
7881
- samples/client/echo_api/java/okhttp-gson-user-defined-templates/
7982
- samples/client/others/java/resttemplate-useAbstractionForFiles/
8083
- samples/client/others/java/webclient-useAbstractionForFiles/

‎.github/workflows/samples-kotlin-server.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
# - samples/server/petstore/kotlin-spring-default/**
1818

1919
env:
20-
GRADLE_VERSION: 6.9
20+
GRADLE_VERSION: 7.6.4
2121

2222
jobs:
2323
build:

‎.travis.yml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -201,18 +201,19 @@ after_success:
201201
echo "Pushed to $DOCKER_CODEGEN_CLI_IMAGE_NAME";
202202
fi;
203203
fi;
204-
publish latest website, variables below are secure environment variables which are unavailable to PRs from forks.
205-
- if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
206-
sed -i "s/Vector{UInt8}/Vector\{UInt8\}/g" docs/generators/julia-client.md
207-
sed -i "s/Vector{UInt8}/Vector\{UInt8\}/g" docs/generators/julia-server.md
208-
cd website;
209-
git config --global user.name "${GH_NAME}";
210-
git config --global user.email "${GH_EMAIL}";
211-
echo "machine github.com login ${GH_NAME} password ${GH_TOKEN}" > ~/.netrc;
212-
yarn install;
213-
GIT_USER="${GH_NAME}" yarn run publish-gh-pages;
214-
fi;
215-
204+
## NOTE; we will do the followign manually instead as the page doesn't need to be updated in every single travis build
205+
## publish latest website, variables below are secure environment variables which are unavailable to PRs from forks.
206+
# - if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
207+
# sed -i "s/Vector{UInt8}/Vector\{UInt8\}/g" docs/generators/julia-client.md;
208+
# sed -i "s/Vector{UInt8}/Vector\{UInt8\}/g" docs/generators/julia-server.md;
209+
# cd website;
210+
# git config --global user.name "${GH_NAME}";
211+
# git config --global user.email "${GH_EMAIL}";
212+
# echo "machine github.com login ${GH_NAME} password ${GH_TOKEN}" > ~/.netrc;
213+
# yarn install;
214+
# GIT_USER="${GH_NAME}" yarn run publish-gh-pages;
215+
# fi;
216+
#
216217
env:
217218
- DOCKER_GENERATOR_IMAGE_NAME=openapitools/openapi-generator-online DOCKER_CODEGEN_CLI_IMAGE_NAME=openapitools/openapi-generator-cli NODE_ENV=test CC=gcc-5 CXX=g++-5
218219

‎CI/circle_parallel.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@ else
115115
(cd samples/client/petstore/java/jersey2-java8 && mvn integration-test)
116116
(cd samples/openapi3/client/petstore/java/jersey2-java8 && mvn integration-test)
117117
(cd samples/client/petstore/java/jersey3 && mvn integration-test)
118+
(cd samples/client/petstore/java/jersey3-oneOf && mvn integration-test)
118119
(cd samples/client/others/java/okhttp-gson-streaming && mvn integration-test)
119120
(cd samples/client/petstore/java/okhttp-gson && mvn integration-test)
120121
(cd samples/client/petstore/java/okhttp-gson-3.1 && mvn integration-test)

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1199,7 +1199,7 @@ If you want to join the committee, please kindly apply by sending an email to te
11991199
| JMeter | @kannkyo (2021/01) |
12001200
| Jetbrains HTTP Client | @jlengrand (2023/01) |
12011201
| Julia | @tanmaykm (2023/01) |
1202-
| Kotlin | @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03) @stefankoppier (2022/06) |
1202+
| Kotlin | @dr4ke616 (2018/08) @karismann (2019/03) @Zomzog (2019/04) @andrewemery (2019/10) @4brunu (2019/11) @yutaka0m (2020/03) @stefankoppier (2022/06) @e5l (2024/10) |
12031203
| Lua | @daurnimator (2017/08) |
12041204
| N4JS | @mmews-n4 (2023/03) |
12051205
| Nim | |

‎bin/configs/java-jersey3-oneOf.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
generatorName: java
2+
outputDir: samples/client/petstore/java/jersey3-oneOf
3+
library: jersey3
4+
inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf_additionalProperties.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/Java
6+
additionalProperties:
7+
hideGenerationTimestamp: true

‎bin/configs/java-okhttp-gson-oneOf-array.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
generatorName: java
2+
outputDir: samples/client/others/java/okhttp-gson-oneOf-array
3+
library: okhttp-gson
4+
inputSpec: modules/openapi-generator/src/test/resources/3_0/oneOf_array.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/Java
6+
additionalProperties:
7+
hideGenerationTimestamp: "true"
8+
useBeanValidation: "true"

‎bin/configs/kotlin-string.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ templateDir: modules/openapi-generator/src/main/resources/kotlin-client
55
additionalProperties:
66
artifactId: kotlin-petstore-string
77
serializableModel: "true"
8+
mapFileBinaryToByteArray: "true"
89
sortModelPropertiesByRequiredFlag: "false"
910
sortParamsByRequiredFlag: "false"
1011
dateLibrary: string

0 commit comments

Comments
 (0)