Skip to content

Commit 5e02bc7

Browse files
AriehSchneierAriehSchneier
committed
Merge remote-tracking branch 'origin/master' into go-codegen-add-alias
2 parents b3f526d + e1513f7 commit 5e02bc7

19,580 files changed

Lines changed: 532787 additions & 304212 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.

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {},
1414
"ghcr.io/devcontainers/features/docker-in-docker:2": {
1515
"version": "latest",
16-
"moby": true
16+
"moby": false
1717
}
1818
},
1919
// Configure tool-specific properties.

‎.geminiignore‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# .geminiignore
2+
# This file specifies intentionally untracked files that Gemini CLI should ignore.
3+
# It uses the same pattern matching rules as .gitignore.
4+
5+
# Build artifacts
6+
target/
7+
build/
8+
*.jar
9+
*.war
10+
*.ear
11+
*.class
12+
*.log
13+
14+
# IDE and editor files
15+
.idea/
16+
.vscode/
17+
*.iml
18+
*.ipr
19+
*.iws
20+
21+
# Maven/Gradle wrapper directories
22+
.mvn/wrapper/
23+
.gradle/
24+
25+
# Node.js dependencies for website
26+
website/node_modules/
27+
website/build/
28+
29+
# Generated sources by OpenAPI Generator (usually not to be touched directly)
30+
# This includes sample outputs which are generated code for various languages.
31+
samples/
32+
33+
# Temporary files
34+
tmp/
35+
.DS_Store
36+
# Eclipse
37+
.classpath
38+
.project
39+
.settings
40+
41+
# IntelliJ IDEA
42+
.idea/
43+
*.iml
44+
*.iws
45+
*.iwp
46+
.vscode/
47+
48+
# MacOS
49+
.DS_Store
50+
51+
# ReSharper
52+
*.resharper
53+
54+
# Visual Studio
55+
.vs/
56+
*.user
57+
*.suo
58+
*.sln.docstates
59+
60+
# Other
61+
*.bak
62+
*.swp
63+
*~
64+
.#*

‎.github/workflows/docker-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ jobs:
3131

3232
# docker workflow
3333
- name: Set up QEMU
34-
uses: docker/setup-qemu-action@v3
34+
uses: docker/setup-qemu-action@v4
3535
- name: Set up Docker Buildx
36-
uses: docker/setup-buildx-action@v3
36+
uses: docker/setup-buildx-action@v4
3737
- name: Login to DockerHub
38-
uses: docker/login-action@v3
38+
uses: docker/login-action@v4
3939
with:
4040
username: ${{ secrets.DOCKER_USERNAME }}
4141
password: ${{ secrets.DOCKER_PASSWORD }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v5
17-
- name: Set up JDK 11
17+
- name: Set up JDK 21
1818
uses: actions/setup-java@v5
1919
with:
20-
java-version: 11
20+
java-version: 21
2121
distribution: 'temurin'
2222
cache: gradle
2323
- name: Cache maven dependencies

‎.github/workflows/linux.yaml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,13 @@ jobs:
4545
restore-keys: |
4646
${{ runner.os }}-gradle-
4747
48-
- uses: gradle/actions/setup-gradle@v5
48+
- uses: gradle/actions/setup-gradle@v6
4949
with:
50+
cache-disabled: true
5051
gradle-version: '8.14.3'
5152

5253
- name: Setup Maven
53-
uses: s4u/setup-maven-action@v1.19.0
54+
uses: s4u/setup-maven-action@v1.20.0
5455
with:
5556
java-version: ${{ matrix.java }}
5657
maven-version: 3.8.8
@@ -62,7 +63,7 @@ jobs:
6263
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
6364

6465
- name: Upload Maven build artifact
65-
uses: actions/upload-artifact@v6
66+
uses: actions/upload-artifact@v7
6667
if: matrix.java == '11' && matrix.os == 'ubuntu-latest'
6768
with:
6869
name: artifact
@@ -92,13 +93,13 @@ jobs:
9293
- name: Check out code
9394
uses: actions/checkout@v5
9495
- name: Setup Maven
95-
uses: s4u/setup-maven-action@v1.19.0
96+
uses: s4u/setup-maven-action@v1.20.0
9697
with:
9798
java-version: 11
9899
maven-version: 3.8.8
99100
cache: gradle
100101
- name: Download build artifact
101-
uses: actions/download-artifact@v7
102+
uses: actions/download-artifact@v8
102103
with:
103104
name: artifact
104105
- name: Run Ensures Script

‎.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/mill-plugin-tests.yaml‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
name: Mill plugin tests
2+
3+
on:
4+
push:
5+
paths:
6+
- modules/openapi-generator-mill-plugin/**
7+
pull_request:
8+
paths:
9+
- modules/openapi-generator-mill-plugin/**
10+
11+
jobs:
12+
test:
13+
name: Mill plugin tests
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v5
17+
- name: Set up JDK 11
18+
uses: actions/setup-java@v5
19+
with:
20+
java-version: 11
21+
distribution: 'temurin'
22+
- name: Restore cache (read-only)
23+
# only use restore keys, no save key because we need to clear the cache before running the examples
24+
uses: actions/cache/restore@v5
25+
with:
26+
path: |
27+
~/.m2/repository
28+
~/.gradle
29+
~/.cache/coursier
30+
!~/.gradle/caches/*/plugin-resolution/
31+
!~/.m2/repository/org/openapitools/
32+
!~/.cache/coursier/v1/https/repo1.maven.org/maven2/org/openapitools/
33+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/pom.xml') }}
34+
35+
- name: Maven Clean Install
36+
env:
37+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
38+
run: |
39+
./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
40+
41+
# This is needed because of differences in how Maven and Coursier download artifacts
42+
# Maven will only download the pom when the transitive dependency is not needed in the current projects compile classpath
43+
# whereas Coursier expects the artifact (jar) to be present in a Maven repository. When Coursier encounters a
44+
# artifact folder with a pom it considers the artifact to be available and will then crash when the jar is missing.
45+
- name: Clear m2 cache except openapitools (because otherwise coursier will fail to resolve artifacts where only poms are downloaded)
46+
run: |
47+
mv ~/.m2/repository/org/openapitools /tmp/openapitools-backup || true
48+
rm -rf ~/.m2/repository/*
49+
mkdir -p ~/.m2/repository/org
50+
mv /tmp/openapitools-backup ~/.m2/repository/org/openapitools || true
51+
52+
- name: Mill Example - Test Validation Command
53+
env:
54+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
55+
run: |
56+
(cd modules/openapi-generator-mill-plugin/example/ && ./mill validateOpenapiSpec $(pwd)/api/petstore-invalid.yaml)
57+
58+
- name: Mill Example - Test Validation Task
59+
env:
60+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
61+
run: |
62+
(cd modules/openapi-generator-mill-plugin/example/ && ./mill openapi.validate)
63+
64+
- name: Mill Example - Test Compile Task
65+
env:
66+
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
67+
run: |
68+
(cd modules/openapi-generator-mill-plugin/example/ && ./mill __.compile)
69+

‎.github/workflows/openapi-generator-test-results.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
report:
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: dorny/test-reporter@v2
14+
- uses: dorny/test-reporter@v3
1515
with:
1616
artifact: surefire-test-results
1717
name: JUnit Test results

‎.github/workflows/openapi-generator.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
4343
- run: ls -la modules/openapi-generator-cli/target
4444
- name: Upload openapi-generator-cli.jar artifact
45-
uses: actions/upload-artifact@v6
45+
uses: actions/upload-artifact@v7
4646
with:
4747
name: openapi-generator-cli.jar
4848
path: modules/openapi-generator-cli/target/openapi-generator-cli.jar
@@ -81,7 +81,7 @@ jobs:
8181
GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
8282
- name: Publish unit test reports
8383
if: ${{ always() }}
84-
uses: actions/upload-artifact@v6
84+
uses: actions/upload-artifact@v7
8585
with:
8686
name: surefire-test-results
8787
path: '**/surefire-reports/TEST-*.xml'
@@ -99,7 +99,7 @@ jobs:
9999
java-version: 11
100100
distribution: 'temurin'
101101
- name: Download openapi-generator-cli.jar artifact
102-
uses: actions/download-artifact@v7
102+
uses: actions/download-artifact@v8
103103
with:
104104
name: openapi-generator-cli.jar
105105
path: modules/openapi-generator-cli/target
@@ -138,7 +138,7 @@ jobs:
138138
java-version: 11
139139
distribution: 'temurin'
140140
- name: Download openapi-generator-cli.jar artifact
141-
uses: actions/download-artifact@v7
141+
uses: actions/download-artifact@v8
142142
with:
143143
name: openapi-generator-cli.jar
144144
path: modules/openapi-generator-cli/target

0 commit comments

Comments
 (0)