Merge branch 'master' into myapp

Author: AAkira

.circleci/config.yml

@@ -31,69 +31,69 @@ commands: # a reusable command with parameters
       # 'See docs on artifact collection here https://circleci.com/docs/2.0/artifacts/'
       - run: mkdir -p $CIRCLE_ARTIFACTS $CIRCLE_TEST_REPORTS
       # This is based on your 1.0 configuration file or project settings
+      #- run:
+      #    command: sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java; sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac; echo -e "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $BASH_ENV
       - run:
-          command: sudo update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java; sudo update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac; echo -e "export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64" >> $BASH_ENV
+          command: java -version
       - run:
           command: 'sudo docker info >/dev/null 2>&1 || sudo service docker start; '
       - run:
-          command: |-
-            printf '127.0.0.1       petstore.swagger.io
-            ' | sudo tee -a /etc/hosts
+          command: |
+            sudo tee -a /etc/hosts \<<< "127.0.0.1       path.v1.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.1       path.v2.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.111     path.v3.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.1       operation.v1.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.1       operation.v2.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.111     operation.v3.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.1       server.v1.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.1       server.v2.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.111     server.v3.test.openapi-generator.tech"
+            sudo tee -a /etc/hosts \<<< "127.0.0.1       petstore.swagger.io"
+            cat /etc/hosts
       #    - run: docker pull openapitools/openapi-petstore
       #    - run: docker run -d -e OPENAPI_BASE_PATH=/v3 -e DISABLE_API_KEY=1 -e DISABLE_OAUTH=1 -p 80:8080 openapitools/openapi-petstore
       - run: docker pull swaggerapi/petstore
       - run: docker run --name petstore.swagger -d -e SWAGGER_HOST=http://petstore.swagger.io -e SWAGGER_BASE_PATH=/v2 -p 80:8080 swaggerapi/petstore
       - run: docker ps -a
       - run: sleep 30
       - run: cat /etc/hosts
-      # Test
-      - run: mvn --no-snapshot-updates --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+      - run: export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
       - run:
           name: "Setup custom environment variables"
           command: echo 'export CIRCLE_NODE_INDEX="<<parameters.nodeNo>>"' >> $BASH_ENV
       - run: ./CI/circle_parallel.sh
       # Save dependency cache
-      - save_cache:
-          key: source-v2-{{ .Branch }}-{{ .Revision }}
-          paths:
-            # This is a broad list of cache paths to include many possible development environments
-            # You can probably delete some of these entries
-            - vendor/bundle
-            - ~/.nvm
-            - ~/.pyenv
-            - ~/virtualenvs
-            - ~/.m2
-            - ~/.ivy2
-            - ~/.sbt
-            - ~/.bundle
-            - ~/.go_workspace
-            - ~/.gradle
-            - ~/.cache/bower
-            - ".git"
-            - ~/.stack
-            - /home/circleci/OpenAPITools/openapi-generator/samples/client/petstore/haskell-http-client/.stack-work
-            - ~/R
-      # save "default" cache using the key "source-v2-"
-      - save_cache:
-          key: source-v2-
-          paths:
-            # This is a broad list of cache paths to include many possible development environments
-            # You can probably delete some of these entries
-            - vendor/bundle
-            - ~/.nvm
-            - ~/.pyenv
-            - ~/virtualenvs
-            - ~/.m2
-            - ~/.ivy2
-            - ~/.sbt
-            - ~/.bundle
-            - ~/.go_workspace
-            - ~/.gradle
-            - ~/.cache/bower
-            - ".git"
-            - ~/.stack
-            - /home/circleci/OpenAPITools/openapi-generator/samples/client/petstore/haskell-http-client/.stack-work
-            - ~/R
+      #- save_cache:
+      #    key: source-v2-{{ .Branch }}-{{ .Revision }}
+      #    paths:
+      #      # This is a broad list of cache paths to include many possible development environments
+      #      # You can probably delete some of these entries
+      #      - ~/.m2
+      #      - ~/.ivy2
+      #      - ~/.sbt
+      #      - ~/.bundle
+      #      - ~/.go_workspace
+      #      - ~/.gradle
+      #      - ".git"
+      #      - ~/.stack
+      #      - ~/R
+      ## save "default" cache using the key "source-v2-"
+      #- save_cache:
+      #    key: source-v2-
+      #    paths:
+      #      # This is a broad list of cache paths to include many possible development environments
+      #      # You can probably delete some of these entries
+      #      - vendor/bundle
+      #      - ~/.m2
+      #      - ~/.ivy2
+      #      - ~/.sbt
+      #      - ~/.bundle
+      #      - ~/.go_workspace
+      #      - ~/.gradle
+      #      - ~/.cache/bower
+      #      - ".git"
+      #      - ~/.stack
+      #      - ~/R
       # Teardown
       #   If you break your build into multiple jobs with workflows, you will probably want to do the parts of this that are relevant in each
       # Save test results
@@ -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:
-    docker:
-      - image: fkrull/multi-python
-    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_docker_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,7 +9,13 @@
     "ghcr.io/devcontainers/features/node:1": {
       "version": "lts"
     },
-    "ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {}
+    "ghcr.io/devcontainers/features/rust:1": {},
+    "ghcr.io/snebjorn/devcontainer-feature/chromium:latest": {},
+    "docker-in-docker": {
+      "version": "latest",
+      "moby": true,
+      "dockerDashComposeVersion": "v1"
+    }
   },
   // Configure tool-specific properties.
   "customizations": {
@@ -20,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
           }

.envrc

@@ -1 +1 @@
-use flake
+has nix && use flake

.github/.test/samples.json

@@ -319,12 +319,6 @@
         "Client: Java"
       ]
     },
-    {
-      "input": "java-petstore-jersey1.sh",
-      "matches": [
-        "Client: Java"
-      ]
-    },
     {
       "input": "java-petstore-jersey2-java6.sh",
       "matches": [
@@ -584,18 +578,6 @@
         "Server: Java"
       ]
     },
-    {
-      "input": "jaxrs-jersey1-petstore-server.sh",
-      "matches": [
-        "Server: Java"
-      ]
-    },
-    {
-      "input": "jaxrs-jersey1-usetags-petstore-server.sh",
-      "matches": [
-        "Server: Java"
-      ]
-    },
     {
       "input": "jaxrs-petstore-server-datelib-j8.sh",
       "matches": [
@@ -800,12 +782,6 @@
         "Client: Python"
       ]
     },
-    {
-      "input": "python-server-flask-petstore-python2.sh",
-      "matches": [
-        "Server: Python"
-      ]
-    },
     {
       "input": "python-server-flask-petstore.sh",
       "matches": [

.github/CODEOWNERS

@@ -12,24 +12,19 @@ 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
-
-# Martin Delille
-/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtClientCodegen.java @martindelille
-/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQtAbstractCodegen.java @martindelille
-/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/resources/cpp-qt-client @martindelille
-/Users/martin/dev/clone/openapi-generator/samples/client/petstore/cpp-qt @martindelille
+# cpp-qt-client technical committee
+modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @ravinikam
+samples/client/petstore/cpp-qt/**/* @ravinikam
+modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @stkrwork
+samples/client/petstore/cpp-qt/**/* @stkrwork
+modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @etherealjoy
+samples/client/petstore/cpp-qt/**/* @etherealjoy
+modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @martindelille
+samples/client/petstore/cpp-qt/**/* @martindelille
+modules/openapi-generator/src/main/resources/cpp-qt-client/**/* @muttleyxd
+samples/client/petstore/cpp-qt/**/* @muttleyxd

.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,19 +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/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*`. 
-  For Windows users, please run the script in [Git BASH](https://gitforwindows.org/).
-- [ ] In case you are adding a new generator, run the following additional script : 
-  ```
-  ./bin/utils/ensure-up-to-date.sh
-  ``` 
-  Commit all changed files.
-- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (6.3.0) (minor release - breaking changes with fallbacks), `7.0.x` (breaking changes without fallbacks)
+  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.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/actions/run-samples/action.yaml

@@ -15,5 +15,5 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - run: mvn --no-snapshot-updates --batch-mode --quiet ${{ inputs.goal }} -P${{ inputs.name }} -Dintegration-test -Dmaven.javadoc.skip=true ${{ inputs.args }}
-      shell: bash
+    - run: ./mvnw clean --no-snapshot-updates --batch-mode --quiet ${{ inputs.goal }} -P${{ inputs.name }} -Dintegration-test -Dmaven.javadoc.skip=true ${{ inputs.args }}
+      shell: bash

.github/dependabot.yml

@@ -4,3 +4,9 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "maven"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    allow:
+      - dependency-name: "com.gradle.*"