Merge branch 'master' into PHP_beautify_templates

Author: SaloEater

.github/workflows/maven-pr.yml

@@ -17,8 +17,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         name: git checkout
-        with:
-          ref: master
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
@@ -51,11 +49,12 @@ jobs:
             }]
       - 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`
+          export MY_POM_VERSION=`mvn -Dswagger-codegen-version=3.0.38 -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}
-          export CODEGEN_VERSION=`mvn -q -Dexec.executable="echo" -Dexec.args='${swagger-codegen-version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
+          export CODEGEN_VERSION=`sed -n 's/<swagger\-codegen\-version>\([^\s]*\)<\/swagger\-codegen\-version>/\1/p' pom.xml`
+          export CODEGEN_VERSION=`echo ${CODEGEN_VERSION} | tr -d '[:space:]'`
           echo "CODEGEN_VERSION" ${CODEGEN_VERSION}
-          export CODEGEN_VERSION=""
+          export CODEGEN_VERSION_PROPERTY=""
           if [[ ! $MY_POM_VERSION =~ ^.*SNAPSHOT$ ]];
           then
             if [[ ! $CODEGEN_VERSION =~ ^.*SNAPSHOT$ ]];
@@ -72,7 +71,7 @@ jobs:
                 LAST_SNAP=`jq '.data | sort_by(.lastModified) | reverse | .[0].text' maven-metadata.json`
                 export LAST_SNAP=${LAST_SNAP:1:${#LAST_SNAP}-2}
                 echo "LAST_SNAP $LAST_SNAP"
-                export CODEGEN_VERSION_PROPERTY=-Dswagger-codgen-version=$LAST_SNAP
+                export CODEGEN_VERSION_PROPERTY=-Dswagger-codegen-version=$LAST_SNAP
               fi
             fi
           fi

.github/workflows/maven-push.yml

@@ -52,11 +52,12 @@ jobs:
             }]
       - 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`
+          export MY_POM_VERSION=`mvn -Dswagger-codegen-version=3.0.38 -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}
-          export CODEGEN_VERSION=`mvn -q -Dexec.executable="echo" -Dexec.args='${swagger-codegen-version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
+          export CODEGEN_VERSION=`sed -n 's/<swagger\-codegen\-version>\([^\s]*\)<\/swagger\-codegen\-version>/\1/p' pom.xml`
+          export CODEGEN_VERSION=`echo ${CODEGEN_VERSION} | tr -d '[:space:]'`
           echo "CODEGEN_VERSION" ${CODEGEN_VERSION}
-          export CODEGEN_VERSION=""
+          export CODEGEN_VERSION_PROPERTY=""
           if [[ ! $MY_POM_VERSION =~ ^.*SNAPSHOT$ ]];
           then
             if [[ ! $CODEGEN_VERSION =~ ^.*SNAPSHOT$ ]];
@@ -73,7 +74,7 @@ jobs:
                 LAST_SNAP=`jq '.data | sort_by(.lastModified) | reverse | .[0].text' maven-metadata.json`
                 export LAST_SNAP=${LAST_SNAP:1:${#LAST_SNAP}-2}
                 echo "LAST_SNAP $LAST_SNAP"
-                export CODEGEN_VERSION_PROPERTY=-Dswagger-codgen-version=$LAST_SNAP
+                export CODEGEN_VERSION_PROPERTY=-Dswagger-codegen-version=$LAST_SNAP
               fi
             fi
           fi
@@ -83,7 +84,7 @@ jobs:
       - name: Deploy Maven Snapshot
         if: ${{ matrix.java == 17 }}
         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`
+          export MY_POM_VERSION=`mvn -Dswagger-codegen-version=3.0.38 -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

pom.xml

@@ -12,7 +12,7 @@
 
     <groupId>io.swagger.codegen.v3</groupId>
     <artifactId>swagger-codegen-generators</artifactId>
-    <version>1.0.38-SNAPSHOT</version>
+    <version>1.0.39-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <build>
@@ -254,8 +254,8 @@
         </dependency>
     </dependencies>
     <properties>
-        <swagger-codegen-version>3.0.38-SNAPSHOT</swagger-codegen-version>
-        <swagger-parser-version>2.1.11</swagger-parser-version>
+        <swagger-codegen-version>3.0.42-SNAPSHOT</swagger-codegen-version>
+        <swagger-parser-version>2.1.12</swagger-parser-version>
         <swagger-core-version>2.2.8</swagger-core-version>
         <jackson-version>2.14.0</jackson-version>
         <jackson-databind-version>2.14.0</jackson-databind-version>