Merge branch 'master' into issue-11234

Author: frantuma

.github/workflows/maven-master.yml

@@ -1,4 +1,4 @@
-name: PR build - master
+name: Build - master
 
 on:
   push:
@@ -38,27 +38,21 @@ jobs:
                 "username": "${{ secrets.OSSRH_USERNAME }}",
                 "password": "${{ secrets.OSSRH_TOKEN }}"
             }]
-      - name: Build with Maven
-        run: |
-          export MY_POM_VERSION=`mvn -q -Dexec.executable="echo" -Dexec.args='${projects.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
-          echo "POM VERSION" ${MY_POM_VERSION}
-          if [[ ! $MY_POM_VERSION =~ ^.*SNAPSHOT$ ]];
-          then
       - name: Build with Maven
         run: mvn -B -U verify --file pom.xml
       - name: Deploy Maven Snapshot
         if: ${{ matrix.java == 11 }}
         run: |
+          export DOCKER_GENERATOR_IMAGE_NAME=swaggerapi/swagger-generator
+          export DOCKER_CODEGEN_CLI_IMAGE_NAME=swaggerapi/swagger-codegen-cli          
           export MY_POM_VERSION=`mvn -q -Dexec.executable="echo" -Dexec.args='${projects.version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
           echo "POM VERSION" ${MY_POM_VERSION}
-          if [[ ! $MY_POM_VERSION =~ ^.*SNAPSHOT$ ]];
+          if [[ $MY_POM_VERSION =~ ^.*SNAPSHOT$ ]];
           then
             ./mvnw clean deploy -U  --settings $HOME/.m2/settings.xml
             docker build --rm=false -t $DOCKER_GENERATOR_IMAGE_NAME:unstable ./modules/swagger-generator
-            docker tag $DOCKER_GENERATOR_IMAGE_NAME:unstable
             docker push $DOCKER_GENERATOR_IMAGE_NAME:unstable
             docker build --rm=false -t $DOCKER_CODEGEN_CLI_IMAGE_NAME:unstable ./modules/swagger-codegen-cli
-            docker tag $DOCKER_CODEGEN_CLI_IMAGE_NAME:unstable
             docker push $DOCKER_CODEGEN_CLI_IMAGE_NAME:unstable          
           else
             echo "not deploying release nor building and pushing release docker image: " ${MY_POM_VERSION}

.mvn/wrapper/maven-wrapper.jar

@@ -1 +1,18 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.3.3/apache-maven-3.3.3-bin.zip
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar