Skip to content

Commit cf6b820

Browse files
jpfinnejpfinne
committed
Merge remote-tracking branch 'origin/master' into feature/jspecify
2 parents 1540fcb + 8d32203 commit cf6b820

1,907 files changed

Lines changed: 66126 additions & 4526 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/workflows/maven-plugin-tests-jdk17.yaml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Maven plugin tests (JDK17)
2+
3+
on:
4+
push:
5+
paths:
6+
- modules/openapi-generator-maven-plugin/**
7+
pull_request:
8+
paths:
9+
- modules/openapi-generator-maven-plugin/**
10+
11+
jobs:
12+
test:
13+
name: Maven plugin tests
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v5
17+
- name: Set up JDK 17
18+
uses: actions/setup-java@v5
19+
with:
20+
java-version: 17
21+
distribution: 'temurin'
22+
- name: Cache maven dependencies
23+
uses: actions/cache@v5
24+
env:
25+
cache-name: cache-maven-repository
26+
with:
27+
path: |
28+
~/.m2/repository
29+
~/.gradle
30+
!~/.gradle/caches/*/plugin-resolution/
31+
!~/.m2/repository/org/openapitools/
32+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
33+
restore-keys: |
34+
${{ runner.os }}-test-maven-plugin-${{ env.cache-name }}-
35+
${{ runner.os }}-test-maven-plugin-
36+
- name: Run tests
37+
env:
38+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
39+
run: |
40+
./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
41+
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
42+
./mvnw --no-snapshot-updates --quiet clean install -f modules/openapi-generator-maven-plugin/examples/multi-module/sample-external-ref-schema/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
43+
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
44+
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error

‎.github/workflows/maven-plugin-tests.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ jobs:
4141
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
4242
./mvnw --no-snapshot-updates --quiet clean install -f modules/openapi-generator-maven-plugin/examples/multi-module/sample-external-ref-schema/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
4343
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
44-
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/kotlin.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
45-
./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
44+
# test in JDK17 workflow instead
45+
#./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error

‎.github/workflows/samples-dotnet10.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ jobs:
2828
- samples/client/petstore/csharp/generichost/latest/Tags
2929
- samples/client/petstore/csharp/generichost/latest/HelloWorld
3030
- samples/client/petstore/csharp/generichost/latest/OneOfList
31+
- samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset
3132
- samples/client/petstore/csharp/generichost/net10/AllOf
3233
- samples/client/petstore/csharp/generichost/net10/AnyOf
3334
- samples/client/petstore/csharp/generichost/net10/AnyOfNoCompare

‎bin/configs/csharp-generichost-latest-composedEnum.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,6 @@ additionalProperties:
77
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
88
modelPropertySorting: alphabetical
99
operationParameterSorting: alphabetical
10+
treatWarningsAsErrors: true
11+
warningsNotAsErrors: CS0612
1012
validateSpec: false

‎bin/configs/csharp-generichost-latest-dateTimeOffset.yaml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# for csharp generichost
2+
generatorName: csharp
3+
outputDir: samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset
4+
inputSpec: modules/openapi-generator/src/test/resources/3_0/csharp/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/csharp
6+
additionalProperties:
7+
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
8+
modelPropertySorting: alphabetical
9+
operationParameterSorting: alphabetical
10+
useDateTimeOffset: true
11+
treatWarningsAsErrors: true
12+
warningsNotAsErrors: CS0612

‎bin/configs/csharp-generichost-latest-helloWorld.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ additionalProperties:
77
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
88
modelPropertySorting: alphabetical
99
operationParameterSorting: alphabetical
10+
treatWarningsAsErrors: true
11+
warningsNotAsErrors: CS0612

‎bin/configs/csharp-generichost-latest-inlineEnumAnyOf.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ additionalProperties:
77
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
88
modelPropertySorting: alphabetical
99
operationParameterSorting: alphabetical
10+
treatWarningsAsErrors: true
11+
warningsNotAsErrors: CS0612
1012
validateSpec: false
1113
inlineSchemaOptions:
1214
RESOLVE_INLINE_ENUMS: true

‎bin/configs/csharp-generichost-latest-oneOfList.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ additionalProperties:
66
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
77
modelPropertySorting: alphabetical
88
operationParameterSorting: alphabetical
9+
treatWarningsAsErrors: true
10+
warningsNotAsErrors: CS0612

‎bin/configs/csharp-generichost-latest-tags.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@ additionalProperties:
77
packageGuid: '{321C8C3F-0156-40C1-AE42-D59761FB9B6C}'
88
modelPropertySorting: alphabetical
99
operationParameterSorting: alphabetical
10+
treatWarningsAsErrors: true
11+
warningsNotAsErrors: CS0612

‎bin/configs/csharp-generichost-net10-allOf.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ additionalProperties:
1212
targetFramework: net10.0
1313
modelPropertySorting: alphabetical
1414
operationParameterSorting: alphabetical
15+
treatWarningsAsErrors: true
16+
warningsNotAsErrors: CS0612

0 commit comments

Comments
 (0)