Merge pull request #1 from OpenAPITools/master

atualizar master

.circleci/config.yml

@@ -31,14 +31,25 @@ 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
@@ -47,7 +58,7 @@ commands: # a reusable command with parameters
       - run: sleep 30
       - run: cat /etc/hosts
       # Test
-      - run: mvn --no-snapshot-updates --quiet clean install -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+      - run: ./mvnw --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
@@ -193,8 +204,8 @@ jobs:
       - command_build_and_test:
           nodeNo: "3"
   node4:
-    docker:
-      - image: fkrull/multi-python
+    machine:
+      image: ubuntu-2004:202201-02
     working_directory: ~/OpenAPITools/openapi-generator
     shell: /bin/bash --login
     environment:
@@ -204,7 +215,7 @@ jobs:
       DOCKER_CODEGEN_CLI_IMAGE_NAME: openapitools/openapi-generator-cli
     steps:
       - checkout
-      - command_docker_build_and_test:
+      - command_build_and_test:
           nodeNo: "4"
 workflows:
   version: 2

.github/PULL_REQUEST_TEMPLATE.md

@@ -18,7 +18,7 @@
   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
+  ./bin/utils/ensure-up-to-date
   ``` 
   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)

.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.*"

.github/workflows/docker.yaml

@@ -0,0 +1,39 @@
+name: Docker tests
+
+on:
+  push:
+    paths:
+      - Dockerfile
+      - run-in-docker.sh
+      - pom.xml
+      - modules/openapi-generator-online/pom.xml
+      - modules/openapi-generator-online/Dockerfile
+  pull_request:
+    paths:
+      - Dockerfile
+      - run-in-docker.sh
+      - pom.xml
+      - modules/openapi-generator-online/pom.xml
+      - modules/openapi-generator-online/Dockerfile
+jobs:
+  build:
+    name: 'Build: Docker'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Test run-in-docker.sh
+        shell: bash
+        run: |
+          sed -i 's/ -it / /g' run-in-docker.sh
+          ./run-in-docker.sh mvn clean install
+
+      - name: Build Dockerfile
+        shell: bash
+        run: docker build .
+
+      - name: Build modules/openapi-generator-online
+        shell: bash
+        run: |
+          docker build modules/openapi-generator-online/ -t test

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

@@ -38,7 +38,7 @@ jobs:
         env:
           GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
         run: |
-          mvn --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
+          ./mvnw clean --no-snapshot-updates --batch-mode --quiet install -DskipTests -Dorg.slf4j.simpleLogger.defaultLogLevel=error
           (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildGoSdk) # using gradle-6.8.3 via wrapper
           (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew openApiGenerate)
           (cd modules/openapi-generator-gradle-plugin/samples/local-spec && ./gradlew buildDotnetSdk)

.github/workflows/gradle-test.yaml

@@ -28,6 +28,7 @@ jobs:
           - samples/client/petstore/java/jersey2-java8
           - samples/client/petstore/java/okhttp-gson
           - samples/client/petstore/java/okhttp-gson-group-parameter
+          - samples/client/petstore/java/webclient-swagger2
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-java@v3