Skip to content
This repository was archived by the owner on May 9, 2025. It is now read-only.

Commit e3dcb2f

Browse files
committed
Merge branch 'master' into cleanup-template-management
* master: Fix ruby deprecation error (OpenAPITools#6450) [Java][Feign] decommission 9.x support (OpenAPITools#6445) fix struct export in rust reqwest (OpenAPITools#6453) [Rust][reqwest] add tests to CI (OpenAPITools#6454) set pester version (OpenAPITools#6448) update datadog logo update groovy petstore samples add datadog as sponsor (OpenAPITools#6444) Migrate Groovy samples to oas3 (OpenAPITools#6435) [samples] Renerate Kotlin coroutines
2 parents 8faa776 + dc48cfd commit e3dcb2f

File tree

176 files changed

+321
-18141
lines changed

Some content is hidden

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

176 files changed

+321
-18141
lines changed

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
4444
[![NamSor](https://openapi-generator.tech/img/companies/namsor.png)](https://www.namsor.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
4545
[![LightBow](https://openapi-generator.tech/img/companies/lightbow.png)](https://www.lightbow.net/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
4646
[<img src="https://openapi-generator.tech/img/companies/docspring.png" width="128" height="128">](https://docspring.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
47-
47+
[<img src="https://openapi-generator.tech/img/companies/datadog.png" width="128" height="128">](https://datadoghq.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
4848

4949
#### Thank you GoDaddy for sponsoring the domain names, Linode for sponsoring the VPS and Checkly for sponsoring the API monitoring
5050

@@ -579,6 +579,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
579579
- [Commencis](https://www.commencis.com/)
580580
- [Crossover Health](https://crossoverhealth.com/)
581581
- [Cupix](https://www.cupix.com/)
582+
- [Datadog](https://www.datadoghq.com)
582583
- [DB Systel](https://www.dbsystel.de)
583584
- [DocSpring](https://docspring.com/)
584585
- [dwango](https://dwango.co.jp/)

appveyor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ install:
3232
- git clone https://github.com/wing328/swagger-samples
3333
- ps: Start-Process -FilePath 'C:\maven\apache-maven-3.2.5\bin\mvn' -ArgumentList 'jetty:run' -WorkingDirectory "$env:appveyor_build_folder\swagger-samples\java\java-jersey-jaxrs-ci"
3434
- ps: $PSVersionTable.PSVersion
35-
- ps: Install-Module Pester -Force -Scope CurrentUser
35+
- ps: Install-Module Pester -Force -Scope CurrentUser -RequiredVersion 4.3.1
3636
build_script:
3737
- dotnet --info
3838
# build C# API client (netcore)

bin/groovy-petstore.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ fi
2727

2828
# if you've executed sbt assembly previously it will use that instead.
2929
export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
30-
ags="generate -t modules/openapi-generator/src/main/resources/Groovy/ -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g groovy -o samples/client/petstore/groovy --additional-properties hideGenerationTimestamp=true $@"
30+
ags="generate -t modules/openapi-generator/src/main/resources/Groovy/ -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g groovy -o samples/client/petstore/groovy --additional-properties hideGenerationTimestamp=true $@"
3131
java $JAVA_OPTS -jar $executable $ags

bin/java-petstore-all.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
# update java petstore clients for all supported http libraries
33

44
./bin/java-petstore-feign-10x.sh
5-
./bin/java-petstore-feign.sh
65
./bin/java-petstore-google-api-client.sh
76
./bin/java-petstore-jersey1.sh
87
./bin/java-petstore-jersey2-java8.sh

bin/java-petstore-feign-9x.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

bin/java-petstore-feign.json

Lines changed: 0 additions & 5 deletions
This file was deleted.

bin/java-petstore-feign.sh

Lines changed: 0 additions & 40 deletions
This file was deleted.

bin/openapi3/groovy-petstore.sh

Lines changed: 0 additions & 31 deletions
This file was deleted.

bin/windows/groovy-petstore.bat

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
2+
3+
If Not Exist %executable% (
4+
mvn clean package
5+
)
6+
7+
REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -DloggerPath=conf/log4j.properties
8+
set ags=generate --artifact-id "groovy-petstore-client" -i modules\openapi-generator\src\test\resources\3_0\petstore.yaml -g groovy -o samples\client\petstore\nim
9+
10+
java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/java-petstore-all.bat

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
call .\bin\windows\java-petstore-feign-10x.bat
2-
call .\bin\windows\java-petstore-feign.bat
32
call .\bin\windows\java-petstore-google-api-client.bat
43
call .\bin\windows\java-petstore-jersey1.bat
54
call .\bin\windows\java-petstore-jersey2-java8.bat

0 commit comments

Comments
 (0)