Skip to content

Commit 9144f83

Browse files
committed
Merge branch 'master' into issue-20139
2 parents a3cdf7c + e948355 commit 9144f83

9,172 files changed

Lines changed: 59882 additions & 78417 deletions

File tree

Some content is hidden

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

.github/CODEOWNERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,7 @@ modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @martindelille
2828
samples/client/petstore/cpp-qt/**/* @martindelille
2929
modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @muttleyxd
3030
samples/client/petstore/cpp-qt/**/* @muttleyxd
31+
32+
# cpp-rest-client technical committee
33+
modules/openapi-generator/src/main/resources/cpp-rest-client/**/* @aminya
34+
samples/client/petstore/cpp-restsdk/**/* @aminya

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ assignees: ''
1010
#### Bug Report Checklist
1111

1212
- [ ] Have you provided a full/minimal spec to reproduce the issue?
13-
- [ ] Have you validated the input using an OpenAPI validator ([example](https://apitools.dev/swagger-parser/online/))?
13+
- [ ] Have you validated the input using an OpenAPI validator?
1414
- [ ] Have you [tested with the latest master](https://github.com/OpenAPITools/openapi-generator/wiki/FAQ#how-to-test-with-the-latest-master-of-openapi-generator) to confirm the issue still exists?
1515
- [ ] Have you searched for related issues/PRs?
1616
- [ ] What's the actual output vs expected output?

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
./bin/generate-samples.sh ./bin/configs/*.yaml || exit
1212
./bin/utils/export_docs_generators.sh || exit
1313
```
14-
(For Windows users, please run the script in [Git BASH](https://gitforwindows.org/))
14+
(For Windows users, please run the script in [WSL](https://learn.microsoft.com/en-us/windows/wsl/install))
1515
Commit all changed files.
1616
This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master.
1717
These must match the expectations made by your contribution.

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

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,27 @@ jobs:
110110
path: |
111111
~/.m2
112112
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
113-
- name: Build
113+
- name: Build with Maven
114114
working-directory: ${{ matrix.sample }}
115115
run: mvn clean package --no-transfer-progress
116+
117+
- name: Cache gradle dependencies
118+
uses: actions/cache@v4
119+
env:
120+
cache-name: gradle-caches
121+
with:
122+
path: ~/.gradle/caches
123+
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
124+
125+
- name: Cache gradle wrapper
126+
uses: actions/cache@v4
127+
env:
128+
cache-name: gradle-wrapper
129+
with:
130+
path: ~/.gradle/wrapper
131+
key: ${{ runner.os }}-${{ github.job }}-${{ env.cache-name }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
132+
133+
- name: Build with Gradle
134+
working-directory: ${{ matrix.sample }}
135+
if: ${{ hashFiles('./gradlew') != '' }}
136+
run: ./gradlew build -x test

.github/workflows/samples-java-client-jdk17.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@ on:
77
- samples/client/petstore/java/webclient-jakarta/**
88
- samples/client/petstore/java/restclient-*/**
99
- samples/client/petstore/java/webclient-useSingleRequestParameter/**
10+
- samples/client/others/java/restclient-enum-in-multipart/**
1011
pull_request:
1112
paths:
1213
- samples/client/petstore/java/resttemplate-jakarta/**
1314
- samples/client/petstore/java/webclient-jakarta/**
1415
- samples/client/petstore/java/restclient-*/**
1516
- samples/client/petstore/java/webclient-useSingleRequestParameter/**
17+
- samples/client/others/java/restclient-enum-in-multipart/**
1618
jobs:
1719
build:
1820
name: Build Java Client JDK17
@@ -30,6 +32,7 @@ jobs:
3032
- samples/client/petstore/java/restclient-useSingleRequestParameter
3133
- samples/client/petstore/java/restclient-useSingleRequestParameter-static
3234
- samples/client/petstore/java/webclient-useSingleRequestParameter
35+
- samples/client/others/java/restclient-enum-in-multipart
3336
steps:
3437
- uses: actions/checkout@v4
3538
- uses: actions/setup-java@v4

.github/workflows/samples-kotlin-client.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ jobs:
6565
- samples/client/echo_api/kotlin-jvm-spring-3-restclient
6666
- samples/client/petstore/kotlin-name-parameter-mappings
6767
- samples/client/others/kotlin-jvm-okhttp-parameter-tests
68+
- samples/client/others/kotlin-jvm-okhttp-path-comments
6869
steps:
6970
- uses: actions/checkout@v4
7071
- uses: actions/setup-java@v4

.github/workflows/samples-php8.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ on:
66
- samples/server/petstore/php-symfony/SymfonyBundle-php/**
77
- samples/server/petstore/php-flight/**
88
- samples/server/petstore/php-laravel/**
9+
- samples/server/petstore/php-laravel-issue-21334/**
910
pull_request:
1011
paths:
1112
- samples/server/petstore/php-symfony/SymfonyBundle-php/**
1213
- samples/server/petstore/php-flight/**
1314
- samples/server/petstore/php-laravel/**
15+
- samples/server/petstore/php-laravel-issue-21334/**
1416
jobs:
1517
build:
1618
name: Build PHP projects
@@ -28,6 +30,7 @@ jobs:
2830
- samples/server/petstore/php-symfony/SymfonyBundle-php/
2931
- samples/server/petstore/php-flight/
3032
- samples/server/petstore/php-laravel/
33+
- samples/server/petstore/php-laravel-issue-21334/
3134
steps:
3235
- uses: actions/checkout@v4
3336
- name: Setup PHP with tools

.github/workflows/samples-python-petstore.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@ on:
88
- .github/workflows/samples-python-petstore.yaml
99

1010
jobs:
11+
validate-pyproject-toml:
12+
name: Validate pyproject.toml
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v4
16+
- uses: actions/setup-python@v5
17+
with:
18+
python-version: "3.13"
19+
- name: Install validator
20+
run: pip install 'validate-pyproject[all]'
21+
- name: Validate
22+
run: validate-pyproject samples/openapi3/client/petstore/python/pyproject.toml
1123
build:
1224
name: Test Python client
1325
runs-on: ubuntu-latest

.github/workflows/samples-python-pydantic-v1-petstore.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
python-version:
18-
- "3.8"
1918
- "3.9"
2019
- "3.10"
2120
- "3.11"

.mvn/extensions.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
<extension>
44
<groupId>com.gradle</groupId>
55
<artifactId>develocity-maven-extension</artifactId>
6-
<version>1.21.6</version>
6+
<version>1.23.2</version>
77
</extension>
88
<extension>
99
<groupId>com.gradle</groupId>
1010
<artifactId>common-custom-user-data-maven-extension</artifactId>
11-
<version>1.12.5</version>
11+
<version>2.0.2</version>
1212
</extension>
1313
</extensions>

0 commit comments

Comments
 (0)