prepare release 3.0.41

swagger-api · Feb 16, 2023 · ed28322 · ed28322
1 parent 6306bbf
commit ed28322
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 34 deletions.
diff --git a/.github/workflows/maven-pr-3.0.yml b/.github/workflows/maven-pr-3.0.yml
@@ -17,8 +17,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
         name: git checkout 3.0.0
-        with:
-          ref: 3.0.0
       - name: Set up Java
         uses: actions/setup-java@v3
         with:
@@ -51,9 +49,10 @@ 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-generators-version=1.0.37 -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 GENERATORS_VERSION=`mvn -q -Dexec.executable="echo" -Dexec.args='${swagger-codegen-generators-version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
+          export GENERATORS_VERSION=`sed -n 's/<swagger\-codegen\-generators\-version>\([^\s]*\)<\/swagger\-codegen\-generators\-version>/\1/p' pom.xml`
+          export GENERATORS_VERSION=`echo ${GENERATORS_VERSION} | tr -d '[:space:]'`          
           echo "GENERATORS_VERSION" ${GENERATORS_VERSION}
           export GENERATORS_VERSION_PROPERTY=""
           if [[ ! $MY_POM_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 GENERATORS_VERSION_PROPERTY=-Dswagger-codgen-generators-version=$LAST_SNAP
+                export GENERATORS_VERSION_PROPERTY=-Dswagger-codegen-generators-version=$LAST_SNAP
               fi
             fi
           fi

diff --git a/.github/workflows/maven-push-3.0.yml b/.github/workflows/maven-push-3.0.yml
@@ -52,9 +52,10 @@ 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-generators-version=1.0.37 -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 GENERATORS_VERSION=`mvn -q -Dexec.executable="echo" -Dexec.args='${swagger-codegen-generators-version}' --non-recursive org.codehaus.mojo:exec-maven-plugin:1.3.1:exec`
+          export GENERATORS_VERSION=`sed -n 's/<swagger\-codegen\-generators\-version>\([^\s]*\)<\/swagger\-codegen\-generators\-version>/\1/p' pom.xml`
+          export GENERATORS_VERSION=`echo ${GENERATORS_VERSION} | tr -d '[:space:]'`          
           echo "GENERATORS_VERSION" ${GENERATORS_VERSION}
           export GENERATORS_VERSION_PROPERTY=""
           if [[ ! $MY_POM_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 GENERATORS_VERSION_PROPERTY=-Dswagger-codgen-generators-version=$LAST_SNAP
+                export GENERATORS_VERSION_PROPERTY=-Dswagger-codegen-generators-version=$LAST_SNAP
               fi
             fi
           fi
@@ -89,7 +90,7 @@ jobs:
       - name: docker cli and minimal build and push
         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-generators-version=1.0.37 -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 DOCKER_GENERATOR_IMAGE_NAME=swaggerapi/swagger-generator-v3-minimal
           export DOCKER_CODEGEN_CLI_IMAGE_NAME=swaggerapi/swagger-codegen-cli-v3

diff --git a/README.md b/README.md
@@ -2,9 +2,9 @@
 
 [![Build Status](https://img.shields.io/jenkins/build.svg?jobUrl=https://jenkins.swagger.io/job/oss-swagger-codegen-3)](https://jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-3)
 
-- 3.0.41-SNAPSHOT:  [![Build Status](https://img.shields.io/travis/swagger-api/swagger-codegen/3.0.0.svg?label=Petstore%20Integration%20Test)](https://travis-ci.org/swagger-api/swagger-codegen)
+- 3.0.42-SNAPSHOT:  [![Build Status](https://img.shields.io/travis/swagger-api/swagger-codegen/3.0.0.svg?label=Petstore%20Integration%20Test)](https://travis-ci.org/swagger-api/swagger-codegen)
 [![Java Test](https://img.shields.io/jenkins/build.svg?jobUrl=https://jenkins.swagger.io/job/oss-swagger-codegen-3)](https://jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-3)
-- Master (2.4.30-SNAPSHOT): [![Build Status](https://img.shields.io/travis/swagger-api/swagger-codegen/master.svg?label=Petstore%20Integration%20Test)](https://travis-ci.org/swagger-api/swagger-codegen)
+- Master (2.4.31-SNAPSHOT): [![Build Status](https://img.shields.io/travis/swagger-api/swagger-codegen/master.svg?label=Petstore%20Integration%20Test)](https://travis-ci.org/swagger-api/swagger-codegen)
 [![Java Test](https://img.shields.io/jenkins/build.svg?jobUrl=https://jenkins.swagger.io/job/oss-swagger-codegen-master)](https://jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-master)
 [![Windows Test](https://ci.appveyor.com/api/projects/status/github/swagger-api/swagger-codegen?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/swaggerhub-bot/swagger-codegen)
 
@@ -37,7 +37,7 @@ dependency example:
 <dependency>
     <groupId>io.swagger.codegen.v3</groupId>
     <artifactId>swagger-codegen-maven-plugin</artifactId>
-    <version>3.0.41-SNAPSHOT</version>
+    <version>3.0.41</version>
 </dependency>
 ```
 
@@ -54,7 +54,7 @@ dependency example:
 <dependency>
     <groupId>io.swagger</groupId>
     <artifactId>swagger-codegen-maven-plugin</artifactId>
-    <version>2.4.29</version>
+    <version>2.4.30</version>
 </dependency>
 ```
 
@@ -112,10 +112,11 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 Swagger Codegen Version    | Release Date | OpenAPI Spec compatibility | Notes
 -------------------------- |-------------| -------------------------- | -----
-3.0.41-SNAPSHOT (current 3.0.0, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/codegen/v3/swagger-codegen-cli/3.0.41-SNAPSHOT/)| TBD         | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
-[3.0.40](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.40) (**current stable**) | 2023-01-27  | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.40](https://github.com/swagger-api/swagger-codegen/tree/v3.0.40)
-[3.0.39](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.39) | 2023-01-25  | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.39](https://github.com/swagger-api/swagger-codegen/tree/v3.0.39)
-[3.0.38](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.38) | 2023-01-22  | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.38](https://github.com/swagger-api/swagger-codegen/tree/v3.0.38)
+3.0.42-SNAPSHOT (current 3.0.0, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/codegen/v3/swagger-codegen-cli/3.0.42-SNAPSHOT/)| TBD          | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
+[3.0.41](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.41) (**current stable**) | 2023-02-16   | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.41](https://github.com/swagger-api/swagger-codegen/tree/v3.0.41)
+[3.0.40](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.40) | 2023-01-27   | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.40](https://github.com/swagger-api/swagger-codegen/tree/v3.0.40)
+[3.0.39](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.39) | 2023-01-25   | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.39](https://github.com/swagger-api/swagger-codegen/tree/v3.0.39)
+[3.0.38](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.38) | 2023-01-22   | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.38](https://github.com/swagger-api/swagger-codegen/tree/v3.0.38)
 [3.0.37](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.37) | 2023-01-19  | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.37](https://github.com/swagger-api/swagger-codegen/tree/v3.0.37)
 [3.0.36](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.36) | 2022-11-10  | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.36](https://github.com/swagger-api/swagger-codegen/tree/v3.0.36)
 [3.0.35](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.35) | 2022-08-15  | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.35](https://github.com/swagger-api/swagger-codegen/tree/v3.0.35)
@@ -153,8 +154,9 @@ Swagger Codegen Version    | Release Date | OpenAPI Spec compatibility | Notes
 [3.0.2](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.2)| 2018-10-19  | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
 [3.0.1](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.1)| 2018-10-05  | 1.0, 1.1, 1.2, 2.0, 3.0 | Major release with breaking changes
 [3.0.0](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.0)| 2018-09-06  | 1.0, 1.1, 1.2, 2.0, 3.0 | Major release with breaking changes
-2.4.30-SNAPSHOT (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.4.30-SNAPSHOT/)| TBD         | 1.0, 1.1, 1.2, 2.0   | Minor release
-[2.4.29](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.29) (**current stable**) | 2022-11-10  | 1.0, 1.1, 1.2, 2.0   | [tag v2.4.29](https://github.com/swagger-api/swagger-codegen/tree/v2.4.29)
+2.4.31-SNAPSHOT (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.4.31-SNAPSHOT/)| TBD          | 1.0, 1.1, 1.2, 2.0   | Minor release
+[2.4.30](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.30) (**current stable**) | 2023-02-16   | 1.0, 1.1, 1.2, 2.0   | [tag v2.4.30](https://github.com/swagger-api/swagger-codegen/tree/v2.4.30)
+[2.4.29](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.29) | 2022-11-10   | 1.0, 1.1, 1.2, 2.0   | [tag v2.4.29](https://github.com/swagger-api/swagger-codegen/tree/v2.4.29)
 [2.4.28](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.28) | 2022-08-15  | 1.0, 1.1, 1.2, 2.0   | [tag v2.4.28](https://github.com/swagger-api/swagger-codegen/tree/v2.4.28)
 [2.4.27](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.27) | 2022-04-12  | 1.0, 1.1, 1.2, 2.0   | [tag v2.4.27](https://github.com/swagger-api/swagger-codegen/tree/v2.4.27)
 [2.4.26](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.26) | 2022-02-07  | 1.0, 1.1, 1.2, 2.0   | [tag v2.4.26](https://github.com/swagger-api/swagger-codegen/tree/v2.4.26)
@@ -198,12 +200,12 @@ Swagger Codegen Version    | Release Date | OpenAPI Spec compatibility | Notes
 If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 8 runtime at a minimum):
 
 ```sh
-wget https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.40/swagger-codegen-cli-3.0.40.jar -O swagger-codegen-cli.jar
+wget https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.41/swagger-codegen-cli-3.0.41.jar -O swagger-codegen-cli.jar
 
 java -jar swagger-codegen-cli.jar --help
 ```
 
-For Windows users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g. `Invoke-WebRequest -OutFile swagger-codegen-cli.jar https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.40/swagger-codegen-cli-3.0.40.jar`
+For Windows users, you will need to install [wget](http://gnuwin32.sourceforge.net/packages/wget.htm) or you can use Invoke-WebRequest in PowerShell (3.0+), e.g. `Invoke-WebRequest -OutFile swagger-codegen-cli.jar https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.41/swagger-codegen-cli-3.0.41.jar`
 
 On a mac, it's even easier with `brew`:
 ```sh
@@ -388,7 +390,7 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
 ```
 (if you're on Windows, replace the last command with `java -jar modules\swagger-codegen-cli\target\swagger-codegen-cli.jar generate -i http://petstore.swagger.io/v2/swagger.json -l php -o c:\temp\php_api_client`)
 
-You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.40/swagger-codegen-cli-3.0.40.jar)
+You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.41/swagger-codegen-cli-3.0.41.jar)
 
 To get a list of **general** options available, please run `java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate --help`
 

diff --git a/modules/swagger-codegen-cli/pom.xml b/modules/swagger-codegen-cli/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.codegen.v3</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>3.0.41-SNAPSHOT</version>
+        <version>3.0.41</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/modules/swagger-codegen-maven-plugin/pom.xml b/modules/swagger-codegen-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>io.swagger.codegen.v3</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>3.0.41-SNAPSHOT</version>
+        <version>3.0.41</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>swagger-codegen-maven-plugin</artifactId>

diff --git a/modules/swagger-codegen/pom.xml b/modules/swagger-codegen/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>io.swagger.codegen.v3</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>3.0.41-SNAPSHOT</version>
+        <version>3.0.41</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -200,7 +200,7 @@
     </reporting>
     <properties>
         <diffutils-version>1.3.0</diffutils-version>
-        <swagger-codegen-v2-version>2.4.30-SNAPSHOT</swagger-codegen-v2-version>
+        <swagger-codegen-v2-version>2.4.30</swagger-codegen-v2-version>
     </properties>
     <dependencies>
         <dependency>

diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>io.swagger.codegen.v3</groupId>
         <artifactId>swagger-codegen-project</artifactId>
-        <version>3.0.41-SNAPSHOT</version>
+        <version>3.0.41</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>swagger-generator</artifactId>

diff --git a/modules/swagger-generator/src/main/resources/openapi.yaml b/modules/swagger-generator/src/main/resources/openapi.yaml
@@ -4,7 +4,7 @@ servers:
 info:
   description: 'This is an online swagger codegen server.  You can find out more at
     https://github.com/swagger-api/swagger-codegen or on [irc.freenode.net, #swagger](http://swagger.io/irc/).'
-  version: 3.0.41-SNAPSHOT
+  version: 3.0.41
   title: Swagger Generator
   license:
     name: Apache 2.0

diff --git a/pom.docker.xml b/pom.docker.xml
@@ -9,7 +9,7 @@
     <artifactId>swagger-codegen-project</artifactId>
     <packaging>pom</packaging>
     <name>swagger-codegen-project</name>
-    <version>3.0.41-SNAPSHOT</version>
+    <version>3.0.41</version>
     <url>https://github.com/swagger-api/swagger-codegen</url>
     <scm>
         <connection>scm:git:[email protected]:swagger-api/swagger-codegen.git</connection>
@@ -1114,7 +1114,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-codegen-generators-version>1.0.38-SNAPSHOT</swagger-codegen-generators-version>
+        <swagger-codegen-generators-version>1.0.38</swagger-codegen-generators-version>
         <swagger-core-version>2.2.8</swagger-core-version>
         <swagger-core-version-v1>1.6.9</swagger-core-version-v1>
         <swagger-parser-version>2.1.12</swagger-parser-version>

diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
     <artifactId>swagger-codegen-project</artifactId>
     <packaging>pom</packaging>
     <name>swagger-codegen-project</name>
-    <version>3.0.41-SNAPSHOT</version>
+    <version>3.0.41</version>
     <url>https://github.com/swagger-api/swagger-codegen</url>
     <scm>
         <connection>scm:git:[email protected]:swagger-api/swagger-codegen.git</connection>
@@ -1218,7 +1218,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-codegen-generators-version>1.0.38-SNAPSHOT</swagger-codegen-generators-version>
+        <swagger-codegen-generators-version>1.0.38</swagger-codegen-generators-version>
         <swagger-core-version>2.2.8</swagger-core-version>
         <swagger-core-version-v1>1.6.9</swagger-core-version-v1>
         <swagger-parser-version>2.1.12</swagger-parser-version>

diff --git a/samples/meta-codegen/pom.xml b/samples/meta-codegen/pom.xml
@@ -120,8 +120,8 @@
     </dependencies>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <swagger-codegen-version>3.0.41-SNAPSHOT</swagger-codegen-version>
-        <swagger-codegen-generators-version>1.0.38-SNAPSHOT</swagger-codegen-generators-version>
+        <swagger-codegen-version>3.0.41</swagger-codegen-version>
+        <swagger-codegen-generators-version>1.0.38</swagger-codegen-generators-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.13.1</junit-version>
         <build-helper-maven-plugin>3.0.0</build-helper-maven-plugin>