Skip to content

Commit 5de72a7

Browse files
wing328wing328
committed
Revert "Sync master to 5.0.x (#5968)"
This reverts commit 90dd7a0.
1 parent 90dd7a0 commit 5de72a7

File tree

3,836 files changed

+52977
-203006
lines changed

Some content is hidden

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

3,836 files changed

+52977
-203006
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ packages/
3030
.vagrant/
3131
.vscode/
3232
**/.vs
33+
bin
3334
.factorypath
3435

3536
.settings

‎.travis.yml

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ before_cache:
1111
- rm -fr $HOME/.m2/repository/org/openapitools/
1212

1313
cache:
14-
yarn: true
1514
directories:
1615
- $HOME/.m2
1716
- $HOME/.ivy2
@@ -57,8 +56,6 @@ addons:
5756
- petstore.swagger.io
5857

5958
before_install:
60-
- curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.22.0
61-
- export PATH="$HOME/.yarn/bin:$PATH"
6259
# install rust
6360
- curl https://sh.rustup.rs -sSf | sh -s -- -y -v
6461
# required when sudo: required for the Ruby petstore tests
@@ -110,7 +107,7 @@ before_install:
110107
gpg --keyserver keyserver.ubuntu.com --recv-key $SIGNING_KEY ;
111108
gpg --check-trustdb ;
112109
fi;
113-
- pushd .; cd website; yarn install; popd
110+
- pushd .; cd website; npm install; popd
114111

115112
install:
116113
# Add Godeps dependencies to GOPATH and PATH
@@ -177,41 +174,17 @@ after_success:
177174
fi;
178175
fi;
179176
## docker: build and push openapi-generator-online to DockerHub
180-
- if [ $DOCKER_HUB_USERNAME ]; then
181-
echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin;
182-
export cli_version=$(\mvn -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\[');
183-
export build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ");
184-
docker build --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-online --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_GENERATOR_IMAGE_NAME ./modules/openapi-generator-online;
185-
if [ ! -z "$TRAVIS_TAG" ]; then
186-
docker tag $DOCKER_GENERATOR_IMAGE_NAME:latest $DOCKER_GENERATOR_IMAGE_NAME:$TRAVIS_TAG;
187-
fi;
188-
if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then
189-
docker push $DOCKER_GENERATOR_IMAGE_NAME && echo "Pushed to $DOCKER_GENERATOR_IMAGE_NAME";
190-
fi;
191-
fi;
177+
- 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
192178
## docker: build cli image and push to Docker Hub
193-
- if [ $DOCKER_HUB_USERNAME ]; then
194-
echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin;
195-
cp docker-entrypoint.sh ./modules/openapi-generator-cli;
196-
export cli_version=$(\mvn -o org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\[');
197-
export build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ");
198-
docker build --label=org.opencontainers.image.created=$build_date --label=org.opencontainers.image.title=openapi-generator-cli --label=org.opencontainers.image.revision=$TRAVIS_COMMIT --label=org.opencontainers.image.version=$cli_version -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-cli;
199-
if [ ! -z "$TRAVIS_TAG" ]; then
200-
docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest $DOCKER_CODEGEN_CLI_IMAGE_NAME:$TRAVIS_TAG;
201-
fi;
202-
if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then
203-
docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME;
204-
echo "Pushed to $DOCKER_CODEGEN_CLI_IMAGE_NAME";
205-
fi;
206-
fi;
179+
- if [ $DOCKER_HUB_USERNAME ]; then echo "$DOCKER_HUB_PASSWORD" | docker login --username=$DOCKER_HUB_USERNAME --password-stdin && cp docker-entrypoint.sh ./modules/openapi-generator-cli && docker build -t $DOCKER_CODEGEN_CLI_IMAGE_NAME ./modules/openapi-generator-cli && if [ ! -z "$TRAVIS_TAG" ]; then docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:latest $DOCKER_CODEGEN_CLI_IMAGE_NAME:$TRAVIS_TAG; fi && if [ ! -z "$TRAVIS_TAG" ] || [ "$TRAVIS_BRANCH" = "master" ]; then docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME && echo "Pushed to $DOCKER_CODEGEN_CLI_IMAGE_NAME"; fi; fi
207180
## publish latest website, variables below are secure environment variables which are unavailable to PRs from forks.
208181
- if [ "$TRAVIS_BRANCH" = "master" ] && [ -z $TRAVIS_TAG ] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
209182
cd website;
210183
git config --global user.name "${GH_NAME}";
211184
git config --global user.email "${GH_EMAIL}";
212185
echo "machine github.com login ${GH_NAME} password ${GH_TOKEN}" > ~/.netrc;
213-
yarn install;
214-
GIT_USER="${GH_NAME}" yarn run publish-gh-pages;
186+
npm install;
187+
GIT_USER="${GH_NAME}" npm run-script publish-gh-pages;
215188
fi;
216189

217190
env:

‎CI/.drone.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@ steps:
1818
image: haskell:8.6.5
1919
commands:
2020
- (cd samples/client/petstore/haskell-http-client/ && stack --install-ghc --no-haddock-deps haddock --fast && stack test --fast)
21-
# below dart tests moved to circle ci
2221
# test Dart 2.x petstore client
23-
#- name: dart2x-test
24-
# image: google/dart
25-
# commands:
26-
# - (cd samples/client/petstore/dart-jaguar/openapi && pub get && pub run build_runner build --delete-conflicting-outputs)
27-
# - (cd samples/client/petstore/dart-jaguar/flutter_petstore/openapi && pub get && pub run build_runner build --delete-conflicting-outputs)
28-
# - (cd samples/client/petstore/dart2/petstore && pub get && pub run test)
22+
- name: dart2x-test
23+
image: google/dart
24+
commands:
25+
- (cd samples/client/petstore/dart-jaguar/openapi && pub get && pub run build_runner build --delete-conflicting-outputs)
26+
- (cd samples/client/petstore/dart-jaguar/flutter_petstore/openapi && pub get && pub run build_runner build --delete-conflicting-outputs)
27+
- (cd samples/client/petstore/dart2/petstore && pub get && pub run test)
2928
# test Java 11 HTTP client
3029
- name: java11-test
3130
image: openjdk:11.0

‎CI/bitrise.yml

Lines changed: 19 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,14 @@ workflows:
3131
mvn package -Dorg.slf4j.simpleLogger.defaultLogLevel=error
3232
title: Build openapi-generator
3333
- [email protected]:
34-
title: Update Swift samples
34+
title: Update Swift4 samples
3535
inputs:
3636
- content: |
3737
#!/usr/bin/env bash
3838
3939
set -e
4040
4141
sh bin/swift4-all.sh
42-
sh bin/swift5-all.sh
4342
- [email protected]:
4443
title: Run Swift4 tests
4544
inputs:
@@ -50,6 +49,15 @@ workflows:
5049
5150
./samples/client/petstore/swift4/swift4_test_all.sh
5251
./samples/client/test/swift4/swift4_test_all.sh
52+
- [email protected]:
53+
title: Update Swift5 samples
54+
inputs:
55+
- content: |
56+
#!/usr/bin/env bash
57+
58+
set -e
59+
60+
sh bin/swift5-all.sh
5361
- [email protected]:
5462
title: Run Swift5 tests
5563
inputs:
@@ -58,15 +66,14 @@ workflows:
5866
5967
set -e
6068
69+
./samples/client/petstore/swift5/swift5_test_all.sh
6170
./samples/client/test/swift5/swift5_test_all.sh
62-
# comment out the following as it's causing timeout
63-
# - [email protected]:
64-
# title: Run all bin scripts
65-
# inputs:
66-
# - content: |-
67-
# #!/usr/bin/env bash
68-
#
69-
# set -e
70-
#
71-
# ./bin/run-all-petstore
71+
- [email protected]:
72+
title: Run all bin scripts
73+
inputs:
74+
- content: |-
75+
#!/usr/bin/env bash
76+
77+
set -e
7278
79+
./bin/run-all-petstore

‎CI/circle_parallel.sh

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,10 @@ NODE_INDEX=${CIRCLE_NODE_INDEX:-0}
77

88
set -e
99

10-
function cleanup {
11-
# Show logs of 'petstore.swagger' container to troubleshoot Unit Test failures, if any.
12-
docker logs petstore.swagger # container name specified in circle.yml
13-
}
14-
15-
trap cleanup EXIT
16-
1710
if [ "$NODE_INDEX" = "1" ]; then
1811
echo "Running node $NODE_INDEX to test 'samples.circleci' defined in pom.xml ..."
12+
#cp CI/pom.xml.circleci pom.xml
1913
java -version
20-
# Install golang version 1.14
21-
go version
22-
sudo mkdir /usr/local/go1.14
23-
wget -c https://dl.google.com/go/go1.14.linux-amd64.tar.gz -O - | sudo tar -xz -C /usr/local/go1.14
24-
export PATH="/usr/local/go1.14/go/bin:$PATH"
25-
go version
26-
2714
mvn --quiet verify -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
2815
mvn --quiet javadoc:javadoc -Psamples.circleci -Dorg.slf4j.simpleLogger.defaultLogLevel=error
2916

@@ -56,23 +43,13 @@ elif [ "$NODE_INDEX" = "2" ]; then
5643
# install curl
5744
sudo apt-get -y build-dep libcurl4-gnutls-dev
5845
sudo apt-get -y install libcurl4-gnutls-dev
59-
6046
# run integration tests
6147
mvn --quiet verify -Psamples.misc -Dorg.slf4j.simpleLogger.defaultLogLevel=error
6248
else
6349
echo "Running node $NODE_INDEX to test 'samples.circleci.jdk7' defined in pom.xml ..."
6450
sudo update-java-alternatives -s java-1.7.0-openjdk-amd64
6551
java -version
66-
67-
# install dart2
68-
sudo apt-get update
69-
sudo apt-get install apt-transport-https
70-
sudo sh -c 'wget -qO- https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -'
71-
sudo sh -c 'wget -qO- https://storage.googleapis.com/download.dartlang.org/linux/debian/dart_stable.list > /etc/apt/sources.list.d/dart_stable.list'
72-
sudo apt-get update
73-
sudo apt-get install dart
74-
export PATH="$PATH:/usr/lib/dart/bin"
75-
52+
#cp CI/pom.xml.circleci.java7 pom.xml
7653
mvn --quiet verify -Psamples.circleci.jdk7 -Dorg.slf4j.simpleLogger.defaultLogLevel=error
7754
fi
7855

‎CI/samples.ci/client/petstore/csharp/OpenAPIClient/src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ OpenAPI Petstore
44
55
This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
66
7-
The version of the OpenAPI document: 1.0.0
7+
OpenAPI spec version: 1.0.0
88
99
-->
1010
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
@@ -47,16 +47,16 @@ The version of the OpenAPI document: 1.0.0
4747
<Reference Include="System.Runtime.Serialization" />
4848
<Reference Include="System.Xml" />
4949
<Reference Include="Newtonsoft.Json">
50-
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
51-
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
52-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
53-
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
50+
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
51+
<HintPath Condition="Exists('..\packages')">..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
52+
<HintPath Condition="Exists('..\..\packages')">..\..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
53+
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
5454
</Reference>
5555
<Reference Include="JsonSubTypes">
56-
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.6.0\lib\net45\JsonSubTypes.dll</HintPath>
57-
<HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.6.0\lib\net45\JsonSubTypes.dll</HintPath>
58-
<HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.6.0\lib\net45\JsonSubTypes.dll</HintPath>
59-
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.6.0\lib\net45\JsonSubTypes.dll</HintPath>
56+
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\JsonSubTypes.1.5.2\lib\net45\JsonSubTypes.dll</HintPath>
57+
<HintPath Condition="Exists('..\packages')">..\packages\JsonSubTypes.1.5.2\lib\net45\JsonSubTypes.dll</HintPath>
58+
<HintPath Condition="Exists('..\..\packages')">..\..\packages\JsonSubTypes.1.5.2\lib\net45\JsonSubTypes.dll</HintPath>
59+
<HintPath Condition="Exists('..\..\vendor')">..\..\vendor\JsonSubTypes.1.5.2\lib\net45\JsonSubTypes.dll</HintPath>
6060
</Reference>
6161
<Reference Include="RestSharp">
6262
<HintPath Condition="Exists('$(SolutionDir)\packages')">$(SolutionDir)\packages\RestSharp.105.1.0\lib\net45\RestSharp.dll</HintPath>
@@ -72,8 +72,7 @@ The version of the OpenAPI document: 1.0.0
7272
</Reference>
7373
</ItemGroup>
7474
<ItemGroup>
75-
<Compile Include="**\*.cs"
76-
Exclude="obj\**"/>
75+
<Compile Include="**\*.cs" Exclude="obj\**" />
7776
</ItemGroup>
7877
<ItemGroup>
7978
<None Include="packages.config" />

0 commit comments

Comments
 (0)