Merge branch 'OpenAPITools:master' into add-cli-syspath-docker

Author: ezrasingh

.circleci/config.yml

@@ -141,7 +141,7 @@ commands: # a reusable command with parameters
 jobs:
   node0:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -154,7 +154,7 @@ jobs:
           nodeNo: "0"
   node1:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -167,7 +167,7 @@ jobs:
           nodeNo: "1"
   node2:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -180,7 +180,7 @@ jobs:
           nodeNo: "2"
   node3:
     machine:
-      image: ubuntu-2004:202201-02
+      image: ubuntu-2004:2024.01.1
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -192,20 +192,6 @@ jobs:
       - checkout
       - command_build_and_test:
           nodeNo: "3"
-  node4:
-    machine:
-      image: ubuntu-2004:202201-02
-    working_directory: ~/OpenAPITools/openapi-generator
-    shell: /bin/bash --login
-    environment:
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-      DOCKER_GENERATOR_IMAGE_NAME: openapitools/openapi-generator
-      DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
-    steps:
-      - checkout
-      - command_build_and_test:
-          nodeNo: "4"
 workflows:
   version: 2
   build:
@@ -214,4 +200,3 @@ workflows:
       - node1
       - node2
       - node3
-      - node4

.ddev/web-build/Dockerfile.maven

@@ -0,0 +1 @@
+RUN apt update && apt install -y maven

.devcontainer/devcontainer.json

@@ -9,6 +9,7 @@
     "ghcr.io/devcontainers/features/node:1": {
       "version": "lts"
     },
+    "ghcr.io/devcontainers/features/rust:1": {},
     "ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {},
     "docker-in-docker": {
       "version": "latest",
@@ -25,8 +26,8 @@
         "java.configuration.runtimes": [
           {
             "name": "JavaSE-11",
-            "path": "/usr/local/sdkman/candidates/java/11.0.16.1-ms",
-            "sources": "/usr/local/sdkman/candidates/java/11.0.16.1-ms/lib/src.zip",
+            "path": "/usr/local/sdkman/candidates/java/current",
+            "sources": "/usr/local/sdkman/candidates/java/current/lib/src.zip",
             "javadoc": "https://docs.oracle.com/en/java/javase/11/docs/api",
             "default": true
           }
@@ -49,4 +50,4 @@
   // "postCreateCommand": "mvn clean package -DskipTests",
   // Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
   "remoteUser": "vscode"
-}
+}

.github/CODEOWNERS

@@ -12,22 +12,11 @@ modules/openapi-generator-core/**/* @OpenAPITools/generator-core-team
 # No need for auto-generated subdirectories (reduces noise)
 docs/ @OpenAPITools/generator-core-team
 
-## Individual interests
-.github/**/* @jimschubert
-scripts/**/* @jimschubert
-website/**/* @jimschubert
-bin/ci/**/* @jimschubert
-
 ## Build related
 CI/**/* @OpenAPITools/build
 .mvn/**/* @OpenAPITools/build
 bin/utils/**/* @OpenAPITools/build
 
-## Module-specific
-modules/openapi-generator-cli/**/* @jimschubert
-modules/openapi-generator-gradle-plugin/**/* @jimschubert
-modules/openapi-generator-maven-plugin/**/* @jimschubert
-
 # cpp-qt-client technical committee
 modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @ravinikam
 samples/client/petstore/cpp-qt/**/* @ravinikam

.github/ISSUE_TEMPLATE/bug_report.md

@@ -10,7 +10,7 @@ assignees: ''
 #### Bug Report Checklist
 
 - [ ] Have you provided a full/minimal spec to reproduce the issue?
-- [ ] Have you validated the input using an OpenAPI validator ([example](https://apidevtools.org/swagger-parser/online/))?
+- [ ] Have you validated the input using an OpenAPI validator ([example](https://apitools.dev/swagger-parser/online/))?
 - [ ] 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?
 - [ ] Have you searched for related issues/PRs?
 - [ ] What's the actual output vs expected output?

.github/PULL_REQUEST_TEMPLATE.md

@@ -7,15 +7,15 @@
 - [ ] Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
 - [ ] Run the following to [build the project](https://github.com/OpenAPITools/openapi-generator#14---build-projects) and update samples:
   ```
-  ./mvnw clean package 
-  ./bin/generate-samples.sh ./bin/configs/*.yaml
-  ./bin/utils/export_docs_generators.sh
+  ./mvnw clean package || exit
+  ./bin/generate-samples.sh ./bin/configs/*.yaml || exit
+  ./bin/utils/export_docs_generators.sh || exit
   ``` 
   (For Windows users, please run the script in [Git BASH](https://gitforwindows.org/))
   Commit all changed files. 
   This is important, as CI jobs will verify _all_ generator outputs of your HEAD commit as it would merge with master. 
   These must match the expectations made by your contribution. 
   You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example `./bin/generate-samples.sh bin/configs/java*`. 
   IMPORTANT: Do **NOT** purge/delete any folders/files (e.g. tests) when regenerating the samples as manually written tests may be removed.
-- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (upcoming 7.1.0 minor release - breaking changes with fallbacks), `8.0.x` (breaking changes without fallbacks)
+- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (upcoming `7.x.0` minor release - breaking changes with fallbacks), `8.0.x` (breaking changes without fallbacks)
 - [ ] If your PR is targeting a particular programming language, @mention the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) members, so they are more likely to review the pull request.

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

@@ -20,7 +20,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-repository
         with:

.github/workflows/gradle-test.yaml

@@ -10,7 +10,7 @@ on:
       - 'samples/client/petstore/java/**'
       - 'samples/openapi3/client/petstore/java/**'
 env:
-  GRADLE_VERSION: 7.2
+  GRADLE_VERSION: 8.7
 
 jobs:
   build:
@@ -29,6 +29,8 @@ jobs:
           - samples/client/petstore/java/okhttp-gson
           - samples/client/petstore/java/okhttp-gson-group-parameter
           - samples/client/petstore/java/webclient-swagger2
+          - samples/client/petstore/java/native
+          - samples/client/petstore/java/native-jakarta
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
@@ -37,14 +39,14 @@ jobs:
           java-version: 11
       # Cache Gradle Dependencies
       - name: Setup Gradle Dependencies Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-caches-${{ hashFiles('**/*.gradle', '**/*.gradle.kts') }}
 
       # Cache Gradle Wrapper
       - name: Setup Gradle Wrapper Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.gradle/wrapper
           key: ${{ runner.os }}-gradle-wrapper-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}

.github/workflows/linux.yaml

@@ -28,14 +28,14 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('pom.xml', 'modules/**/pom.xml') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         with:
           path: |
             ~/.gradle/caches
@@ -45,7 +45,7 @@ jobs:
             ${{ runner.os }}-gradle-
 
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.11.0
+        uses: s4u/setup-maven-action@v1.18.0
         with:
           java-version: ${{ matrix.java }}
           maven-version: 3.8.8
@@ -87,7 +87,7 @@ jobs:
       - name: Check out code
         uses: actions/checkout@v4
       - name: Setup Maven
-        uses: s4u/setup-maven-action@v1.11.0
+        uses: s4u/setup-maven-action@v1.18.0
         with:
           java-version: 11
           maven-version: 3.8.8

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

@@ -20,7 +20,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-repository
         with:
@@ -39,6 +39,7 @@ jobs:
         run: |
           ./mvnw clean install -DskipTests -Dmaven.javadoc.skip=true
           ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/java-client.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+          ./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
           ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/multi-module/pom.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
           ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/kotlin.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error
           ./mvnw --no-snapshot-updates --quiet clean compile -f modules/openapi-generator-maven-plugin/examples/spring.xml -Dorg.slf4j.simpleLogger.defaultLogLevel=error

.github/workflows/openapi-generator.yaml

@@ -22,7 +22,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-repository
         with:
@@ -60,7 +60,7 @@ jobs:
           java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         env:
           cache-name: cache-maven-repository
         with:
@@ -140,8 +140,42 @@ jobs:
         with:
           name: openapi-generator-cli.jar
           path: modules/openapi-generator-cli/target
+      - name: Delete samples that are entirely generated
+        run: |
+          rm -rf samples/client/petstore/csharp/generichost/latest/Tags
+
+          rm -rf samples/client/petstore/csharp/generichost/net8/AllOf
+          rm -rf samples/client/petstore/csharp/generichost/net8/AnyOf
+          rm -rf samples/client/petstore/csharp/generichost/net8/AnyOfNoCompare
+          rm -rf samples/client/petstore/csharp/generichost/net8/FormModels
+          rm -rf samples/client/petstore/csharp/generichost/net8/NullReferenceTypes
+          rm -rf samples/client/petstore/csharp/generichost/net8/OneOf
+          rm -rf samples/client/petstore/csharp/generichost/net8/Petstore
+          rm -rf samples/client/petstore/csharp/generichost/net8/SourceGeneration
+          rm -rf samples/client/petstore/csharp/generichost/net8/UseDateTimeForDate
+
+          rm -rf samples/client/petstore/csharp/generichost/standard2.0/Petstore
+
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/AllOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/AnyOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/AnyOfNoCompare
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/FormModels
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/OneOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/Petstore
+          rm -rf samples/client/petstore/csharp/generichost/net4.8/UseDateTimeForDate
+
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/AllOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/AnyOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/AnyOfNoCompare
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/FormModels
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/OneOf
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/Petstore
+          rm -rf samples/client/petstore/csharp/generichost/net4.7/UseDateTimeForDate
       - name: Generate samples
-        run: bash bin/generate-samples.sh
+        run: |
+          bash bin/generate-samples.sh
+          # when a sample is deleted, you have to generate it twice for all files to get created
+          bash bin/generate-samples.sh
       - name: Verify git status
         run: |
           if [[ "$(git status --porcelain)" != "" ]]; then

.github/workflows/samples-aspnet-fastenpoints-server.yaml

@@ -0,0 +1,34 @@
+name: Samples C# .Net 8 FastEndpoints Server
+
+on:
+  push:
+    paths:
+      - samples/server/petstore/aspnet/fastendpoints/**
+      - samples/server/petstore/aspnet/fastendpoints-*/**
+  pull_request:
+    paths:
+      - samples/server/petstore/aspnet/fastendpoints/**
+      - samples/server/petstore/aspnet/fastendpoints-*/**
+jobs:
+  build:
+    name: Build .Net 8 FastEndpoints servers
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - samples/server/petstore/aspnet/fastendpoints
+          - samples/server/petstore/aspnet/fastendpoints-useApiVersioning
+          - samples/server/petstore/aspnet/fastendpoints-useAuthentication
+          - samples/server/petstore/aspnet/fastendpoints-useProblemDetails
+          - samples/server/petstore/aspnet/fastendpoints-useRecords
+          - samples/server/petstore/aspnet/fastendpoints-useResponseCaching
+          - samples/server/petstore/aspnet/fastendpoints-useValidators
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/[email protected]
+        with:
+          dotnet-version: '8.0.x'
+      - name: Build
+        working-directory: ${{ matrix.sample }}
+        run: dotnet build Org.OpenAPITools.sln

.github/workflows/samples-c-libcurl-client.yaml

@@ -4,22 +4,34 @@ on:
   push:
     paths:
       - 'samples/client/petstore/c/**'
+      - 'samples/client/petstore/c-useJsonUnformatted/**'
+      - 'samples/client/others/c/bearerAuth/**'
   pull_request:
     paths:
       - 'samples/client/petstore/c/**'
+      - 'samples/client/petstore/c-useJsonUnformatted/**'
+      - 'samples/client/others/c/bearerAuth/**'
 
 jobs:
   build:
     name: Build c libcurl client
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sample:
+          - 'samples/client/petstore/c/'
+          - 'samples/client/petstore/c-useJsonUnformatted/'
+          - 'samples/client/others/c/bearerAuth/'
+
     steps:
       - uses: actions/checkout@v4
       - name: Prepare
         run: |
           sudo apt-get update
           sudo apt-get install -y libssl-dev libcurl4-openssl-dev
       - name: Build
-        working-directory: "samples/client/petstore/c"
+        working-directory: ${{ matrix.sample }}
         run: |
           mkdir build
           cd build