Pull in latest upstream code

.circleci/config.yml

@@ -1,118 +1,204 @@
-version: 2
+version: 2.1
+commands: # a reusable command with parameters
+  command_build_and_test:
+    parameters:
+      nodeNo:
+        default: "0"
+        type: string
+    steps:
+      # Restore the dependency cache
+      - restore_cache:
+          keys:
+            # Default branch if not
+            - source-v2-{{ .Branch }}-{{ .Revision }}
+            - source-v2-{{ .Branch }}-
+            - source-v2-
+      # Machine Setup
+      #   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
+      # The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
+      - checkout
+      # Prepare for artifact and test results  collection equivalent to how it was done on 1.0.
+      # In many cases you can simplify this from what is generated here.
+      # '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 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
+      #    - 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:
+          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
+            - ~/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
+            - ~/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
+      # 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
+      - store_test_results:
+          path: /tmp/circleci-test-results
+      # Save artifacts
+      - store_artifacts:
+          path: /tmp/circleci-artifacts
+      - store_artifacts:
+          path: /tmp/circleci-test-results
+  command_docker_build_and_test:
+    parameters:
+      nodeNo:
+        default: "0"
+        type: string
+    steps:
+      # Machine Setup
+      #   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
+      # The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
+      - checkout
+      # Prepare for artifact and test results  collection equivalent to how it was done on 1.0.
+      # In many cases you can simplify this from what is generated here.
+      # '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:
+      # Test
+      #      - run: mvn --no-snapshot-updates --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+      - run:
+          name: "Setup custom environment variables"
+          command: echo 'export CIRCLE_NODE_INDEX="<<parameters.nodeNo>>"' >> $BASH_ENV
+      - run: ./CI/circle_parallel.sh
+      # 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
+      - store_test_results:
+          path: /tmp/circleci-test-results
+      # Save artifacts
+      - store_artifacts:
+          path: /tmp/circleci-artifacts
+      - store_artifacts:
+          path: /tmp/circleci-test-results
 jobs:
-  build:
-    #    docker:
-    #      #- image: openapitools/openapi-generator
-    #      - image: swaggerapi/petstore
-    #        environment:
-    #          SWAGGER_HOST=http://petstore.swagger.io
-    #          SWAGGER_BASE_PATH=/v2
+  node0:
+    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:
+      - command_build_and_test:
+          nodeNo: "0"
+  node1:
     machine:
-      image: circleci/classic:latest
+      image: ubuntu-2004:202201-02
     working_directory: ~/OpenAPITools/openapi-generator
-    parallelism: 4
     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:
-    # Restore the dependency cache
-    - restore_cache:
-        keys:
-        # Default branch if not
-        - source-v2-{{ .Branch }}-{{ .Revision }}
-        - source-v2-{{ .Branch }}-
-        - source-v2-
-    # Machine Setup
-    #   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
-    # The following `checkout` command checks out your code to your working directory. In 1.0 we did this implicitly. In 2.0 you can choose where in the course of a job your code should be checked out.
-    - checkout
-    # Prepare for artifact and test results  collection equivalent to how it was done on 1.0.
-    # In many cases you can simplify this from what is generated here.
-    # '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 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
-    # Dependencies
-    # Install latest stable node for angular 6
-    - run:
-        name: Install node@stable (for angular 6)
-        command: |
-          set +e
-          curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.11/install.sh | bash
-          export NVM_DIR="/opt/circleci/.nvm"
-          [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-          nvm install stable
-          nvm alias default stable
-
-          # Each step uses the same `$BASH_ENV`, so need to modify it
-          echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
-          echo "[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"" >> $BASH_ENV
-    - run: node --version
-#    - 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: ./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
-        - ~/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
-        - ~/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
-    # 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
-    - store_test_results:
-        path: /tmp/circleci-test-results
-    # Save artifacts
-    - store_artifacts:
-        path: /tmp/circleci-artifacts
-    - store_artifacts:
-        path: /tmp/circleci-test-results
+      - command_build_and_test:
+          nodeNo: "1"
+  node2:
+    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:
+      - command_build_and_test:
+          nodeNo: "2"
+  node3:
+    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: "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:
+    jobs:
+      - node0
+      - node1
+      - node2
+      - node3
+      - node4

.github/.test/samples.json

@@ -145,12 +145,6 @@
         "Documentation: Cwiki"
       ]
     },
-    {
-      "input": "dart-jaguar-petstore.sh",
-      "matches": [
-        "Client: Dart"
-      ]
-    },
     {
       "input": "dart-dio-petstore.sh",
       "matches": [
@@ -223,12 +217,6 @@
         "Server: Scala"
       ]
     },
-    {
-      "input": "flash-petstore.sh",
-      "matches": [
-        "Client: Flash/ActionScript"
-      ]
-    },
     {
       "input": "go-gin-petstore-server.sh",
       "matches": [
@@ -722,18 +710,6 @@
         "Schema: MySQL"
       ]
     },
-    {
-      "input": "nancyfx-petstore-server-async.sh",
-      "matches": [
-        "Server: C-Sharp"
-      ]
-    },
-    {
-      "input": "nancyfx-petstore-server.sh",
-      "matches": [
-        "Server: C-Sharp"
-      ]
-    },
     {
       "input": "nodejs-petstore-google-cloud-functions.sh",
       "matches": [
@@ -944,24 +920,6 @@
         "Server: Spring"
       ]
     },
-    {
-      "input": "spring-mvc-petstore-j8-async-server.sh",
-      "matches": [
-        "Server: Spring"
-      ]
-    },
-    {
-      "input": "spring-mvc-petstore-j8-localdatetime.sh",
-      "matches": [
-        "Server: Spring"
-      ]
-    },
-    {
-      "input": "spring-mvc-petstore-server.sh",
-      "matches": [
-        "Server: Spring"
-      ]
-    },
     {
       "input": "spring-stubs.sh",
       "matches": [
@@ -1401,4 +1359,4 @@
       "matches": []
     }
   ]
-}
+}

.github/PULL_REQUEST_TEMPLATE.md

@@ -16,5 +16,4 @@
   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/).
-- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (5.3.0), `6.0.x`
 - [ ] 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.