merge the 3_0_0 branch into master

.circleci/config.yml

@@ -2,8 +2,8 @@ version: 2.1
 commands: # a reusable command with parameters
   command_build_and_test:
     parameters:
-      nodeNo:
-        default: "0"
+      jobId:
+        default: "unset"
         type: string
     steps:
       # Restore the dependency cache
@@ -13,17 +13,6 @@ commands: # a reusable command with parameters
             - 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
-      - run:
-          name: Install Headless Chrome dependencies
-          command: |
-            sudo apt-get update && sudo apt-get install -yq \
-            gconf-service libasound2 libatk1.0-0 libatk-bridge2.0-0 libc6 libcairo2 libcups2 libdbus-1-3 \
-            libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 \
-            libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 \
-            libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates \
-            fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget libgbm1
       # 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.
@@ -32,67 +21,46 @@ commands: # a reusable command with parameters
       - 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 openapijsonschematools/openapi-petstore
-      #    - run: docker run -d -e OPENAPI_BASE_PATH=/v3 -e DISABLE_API_KEY=1 -e DISABLE_OAUTH=1 -p 80:8080 openapijsonschematools/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
+          command: java -version
       # 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
+          command: echo 'export CIRCLE_JOB_ID="<<parameters.jobId>>"' >> $BASH_ENV
+      - run: ./.circleci/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
-            - ~/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-json-schema-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
@@ -105,8 +73,8 @@ commands: # a reusable command with parameters
           path: /tmp/circleci-test-results
   command_docker_build_and_test:
     parameters:
-      nodeNo:
-        default: "0"
+      jobId:
+        default: "unset"
         type: string
     steps:
       # Machine Setup
@@ -117,16 +85,10 @@ commands: # a reusable command with parameters
       # 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
+          command: echo 'export CIRCLE_JOB_ID="<<parameters.jobId>>"' >> $BASH_ENV
+      - run: ./.circleci/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
@@ -138,18 +100,7 @@ commands: # a reusable command with parameters
       - store_artifacts:
           path: /tmp/circleci-test-results
 jobs:
-  node0:
-    machine:
-      image: ubuntu-2004:202201-02
-    working_directory: ~/OpenAPITools/openapi-json-schema-generator
-    shell: /bin/bash --login
-    environment:
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-    steps:
-      - command_build_and_test:
-          nodeNo: "0"
-  node1:
+  ensureSamplesAndGeneratorDocsUpToDate:
     machine:
       image: ubuntu-2004:202201-02
     working_directory: ~/OpenAPITools/openapi-json-schema-generator
@@ -159,8 +110,8 @@ jobs:
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
     steps:
       - command_build_and_test:
-          nodeNo: "1"
-  node2:
+          jobId: "ensureSamplesAndGeneratorDocsUpToDate"
+  mvnCleanInstall:
     machine:
       image: ubuntu-2004:202201-02
     working_directory: ~/OpenAPITools/openapi-json-schema-generator
@@ -170,22 +121,10 @@ jobs:
       CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
     steps:
       - command_build_and_test:
-          nodeNo: "2"
-  node3:
-    machine:
-      image: ubuntu-2004:202201-02
-    working_directory: ~/OpenAPITools/openapi-json-schema-generator
-    shell: /bin/bash --login
-    environment:
-      CIRCLE_ARTIFACTS: /tmp/circleci-artifacts
-      CIRCLE_TEST_REPORTS: /tmp/circleci-test-results
-    steps:
-      - checkout
-      - command_build_and_test:
-          nodeNo: "3"
-  node4:
+          jobId: "mvnCleanInstall"
+  testPythonClientSamples:
     docker:
-      - image: fkrull/multi-python
+      - image: python:3.8
     working_directory: ~/OpenAPITools/openapi-json-schema-generator
     shell: /bin/bash --login
     environment:
@@ -194,13 +133,11 @@ jobs:
     steps:
       - checkout
       - command_docker_build_and_test:
-          nodeNo: "4"
+          jobId: "testPythonClientSamples"
 workflows:
   version: 2
   build:
     jobs:
-      - node0
-      - node1
-      - node2
-      - node3
-      - node4
+      - ensureSamplesAndGeneratorDocsUpToDate
+      - mvnCleanInstall
+      - testPythonClientSamples

.circleci/parallel.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+#
+# A bash script to run CircleCI node/test in parallel
+#
+
+JOB_ID=${CIRCLE_JOB_ID:-"unset"}
+
+set -e
+
+export NODE_ENV=test
+
+if [ "$JOB_ID" = "ensureSamplesAndGeneratorDocsUpToDate" ]; then
+  echo "Running job $JOB_ID"
+  ./bin/utils/ensure-up-to-date
+
+elif [ "$JOB_ID" = "mvnCleanInstall" ]; then
+  echo "Running job $JOB_ID"
+  mvn --no-snapshot-updates --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+
+elif [ "$JOB_ID" = "testPythonClientSamples" ]; then
+  echo "Running job $JOB_ID ..."
+  (cd samples/client/petstore/python && make test)
+  (cd samples/client/3_0_3_unit_test/python && make test)
+  (cd samples/client/openapi_features/nonCompliantUseDiscriminatorIfCompositionFails/python && make test)
+  (cd samples/client/openapi_features/security/python && make test)
+
+else
+  echo "Running job $JOB_ID"
+
+fi
+
+

.github/CODEOWNERS

@@ -14,8 +14,6 @@ docs/ @OpenAPITools/generator-core-team
 
 ## Individual interests
 .github/**/* @jimschubert
-scripts/**/* @jimschubert
-website/**/* @jimschubert
 bin/ci/**/* @jimschubert
 
 ## Build related
@@ -27,9 +25,3 @@ bin/utils/**/* @OpenAPITools/build
 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/openapijsonschematools/codegen/languages/CppQtClientCodegen.java @martindelille
-/Users/martin/dev/clone/openapi-generator/modules/openapi-generator/src/main/java/org/openapijsonschematools/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

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,11 +3,11 @@
 <!-- Please check the completed items below -->
 ### PR checklist
 
-- [ ] Read the [contribution guidelines](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/blob/master/CONTRIBUTING.md).
+- [ ] Read the [contribution guidelines](https://github.com/openapi-json-schema-tools/openapi-json-schema-generator/blob/master/docs/contributing.md).
 - [ ] 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-json-schema-generator#14---build-projects) and update samples:
   ```
-  ./mvnw clean package 
+  mvn clean package 
   ./bin/generate-samples.sh
   ./bin/utils/export_docs_generators.sh
   ``` 

.github/workflows/check-supported-versions.yaml

@@ -10,10 +10,10 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [8, 11]
+        java: [11, 17]
         os: [ubuntu-latest]
         include:
-          - java: 8
+          - java: 11
             os: windows-latest
           - java: 17
             os: ubuntu-latest
@@ -51,7 +51,7 @@ jobs:
 
       - name: Upload Maven build artifact
         uses: actions/upload-artifact@v3
-        if: matrix.java == '8' && matrix.os == 'ubuntu-latest'
+        if: matrix.java == '11' && matrix.os == 'ubuntu-latest'
         with:
           name: artifact
           path: modules/openapi-generator-cli/target/openapi-generator-cli.jar
@@ -61,7 +61,7 @@ jobs:
         run: gradle -b modules/openapi-generator-gradle-plugin/samples/local-spec/build.gradle buildGoSdk --stacktrace
 
       - name: Test Maven plugin integration
-        if: matrix.java == '8'
+        if: matrix.java == '11'
         shell: bash
         run: |
           cd modules/openapi-generator-maven-plugin

.github/workflows/openapi-generator.yaml

@@ -16,10 +16,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
         uses: actions/cache@v3
@@ -52,10 +52,10 @@ jobs:
       - build
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: 'temurin'
       - name: Cache maven dependencies
         uses: actions/cache@v3
@@ -87,10 +87,10 @@ jobs:
       - build
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
         uses: actions/download-artifact@v3
@@ -101,7 +101,6 @@ jobs:
         run: |
           bash bin/meta-codegen.sh
           bash bin/utils/export_docs_generators.sh
-          bash bin/utils/copy-to-website.sh
           bash bin/utils/export_generators_readme.sh
       - name: Verify git status
         run: |
@@ -126,10 +125,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: actions/setup-java@v3
         with:
-          java-version: 8
+          java-version: 11
           distribution: 'temurin'
       - name: Download openapi-generator-cli.jar artifact
         uses: actions/download-artifact@v3