Skip to content

Commit b821aab

Browse files
authored
Merge pull request #10453 from swagger-api/security_npm_advisories_1071_1500
package-lock fix npm advisories 1071 1500
2 parents 1ffcd68 + 6ac35f4 commit b821aab

File tree

6 files changed

+2771
-3763
lines changed

6 files changed

+2771
-3763
lines changed

.travis.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ before_install:
3939
- gem install bundler -v '< 2'
4040
- gem update --system 2.7.8
4141
- gem --version
42+
# install node version 10.x
43+
- nvm install 10.22.0
44+
- nvm use 10.22.0
45+
# install typescript
4246
- npm install -g typescript
4347
- npm install -g npm
4448
- npm config set registry http://registry.npmjs.org/
@@ -64,7 +68,18 @@ before_install:
6468
- cat /etc/hosts
6569
# show java version
6670
- java -version
67-
71+
# show node version
72+
- node -v
73+
# show node executable
74+
- which node
75+
# show npm version
76+
- npm -v
77+
# show npm executable
78+
- which npm
79+
# show typescript version
80+
- tsc -v
81+
# show tsc executable
82+
- which tsc
6883
install:
6984
# Add Godeps dependencies to GOPATH and PATH
7085
- eval "$(curl -sL https://raw.githubusercontent.com/travis-ci/gimme/master/gimme | GIMME_GO_VERSION=1.4 bash)"

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -849,8 +849,13 @@
849849
<module>samples/client/petstore/python-asyncio</module>
850850
<module>samples/client/petstore/typescript-fetch/builds/default</module>
851851
<module>samples/client/petstore/typescript-fetch/builds/es6-target</module>
852+
<!--
853+
comment out due to error experienced since Sept 6th 2020 due to removed support
854+
for ts 2.x in DefinitivelyTyped. see https://github.com/swagger-api/swagger-codegen/issues/10454
855+
852856
<module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>
853857
<module>samples/client/petstore/typescript-fetch/tests/default</module>
858+
-->
854859
<module>samples/client/petstore/typescript-node/npm</module>
855860
<!-- comment out due to github rate limit error
856861
<module>samples/client/petstore/typescript-angularjs</module>-->

pom.xml.travis

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -849,8 +849,13 @@
849849
<module>samples/client/petstore/python-asyncio</module>
850850
<module>samples/client/petstore/typescript-fetch/builds/default</module>
851851
<module>samples/client/petstore/typescript-fetch/builds/es6-target</module>
852+
<!--
853+
comment out due to error experienced since Sept 6th 2020 due to removed support
854+
for ts 2.x in DefinitivelyTyped. see https://github.com/swagger-api/swagger-codegen/issues/10454
855+
852856
<module>samples/client/petstore/typescript-fetch/builds/with-npm-version</module>
853857
<module>samples/client/petstore/typescript-fetch/tests/default</module>
858+
-->
854859
<module>samples/client/petstore/typescript-node/npm</module>
855860
<!-- comment out due to github rate limit error
856861
<module>samples/client/petstore/typescript-angularjs</module>-->

0 commit comments

Comments
 (0)