prepare release 3.0.36

swagger-api · Nov 11, 2022 · d0a489b · d0a489b
1 parent 4e164f2
commit d0a489b
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 51 deletions.
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.36-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.37-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.29-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.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)
 [![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.35</version>
+    <version>3.0.36</version>
 </dependency>
 ```
 
@@ -54,7 +54,7 @@ dependency example:
 <dependency>
     <groupId>io.swagger</groupId>
     <artifactId>swagger-codegen-maven-plugin</artifactId>
-    <version>2.4.28</version>
+    <version>2.4.29</version>
 </dependency>
 ```
 
@@ -112,8 +112,9 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 Swagger Codegen Version    | Release Date | OpenAPI Spec compatibility | Notes
 -------------------------- |--------------| -------------------------- | -----
-3.0.36-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.36-SNAPSHOT/)| TBD          | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
-[3.0.35](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.35) (**current stable**) | 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)
+3.0.37-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.37-SNAPSHOT/)| TBD          | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
+[3.0.36](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.36) (**current stable**) | 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)
 [3.0.34](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.34) | 2022-04-12   | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.34](https://github.com/swagger-api/swagger-codegen/tree/v3.0.34)
 [3.0.33](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.33) | 2022-02-07   | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.33](https://github.com/swagger-api/swagger-codegen/tree/v3.0.33)
 [3.0.32](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.32) | 2022-01-11   | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.32](https://github.com/swagger-api/swagger-codegen/tree/v3.0.32)
@@ -148,8 +149,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.29-SNAPSHOT (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.4.29-SNAPSHOT/)| TBD          | 1.0, 1.1, 1.2, 2.0   | Minor release
-[2.4.28](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.28) (**current stable**) | 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.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.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)
 [2.4.25](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.25) | 2021-12-28   | 1.0, 1.1, 1.2, 2.0   | [tag v2.4.25](https://github.com/swagger-api/swagger-codegen/tree/v2.4.25)
@@ -192,12 +194,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.35/swagger-codegen-cli-3.0.35.jar -O swagger-codegen-cli.jar
+wget https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.36/swagger-codegen-cli-3.0.36.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.35/swagger-codegen-cli-3.0.35.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.36/swagger-codegen-cli-3.0.36.jar`
 
 On a mac, it's even easier with `brew`:
 ```sh
@@ -382,7 +384,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.35/swagger-codegen-cli-3.0.35.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.36/swagger-codegen-cli-3.0.36.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.36-SNAPSHOT</version>
+        <version>3.0.36</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.36-SNAPSHOT</version>
+        <version>3.0.36</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.36-SNAPSHOT</version>
+        <version>3.0.36</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.29-SNAPSHOT</swagger-codegen-v2-version>
+        <swagger-codegen-v2-version>2.4.29</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.36-SNAPSHOT</version>
+        <version>3.0.36</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>swagger-generator</artifactId>
@@ -425,9 +425,9 @@
         <dockerfile.tag.skip>true</dockerfile.tag.skip>
         <docker-latest-tag>unstable</docker-latest-tag>
         <maven-plugin-version>1.0.0</maven-plugin-version>
-        <jetty-version>9.4.44.v20210927</jetty-version>
-        <inflector-version>2.0.5</inflector-version>
-        <junit-version>4.8.2</junit-version>
+        <jetty-version>9.4.49.v20220914</jetty-version>
+        <inflector-version>2.0.8</inflector-version>
+        <junit-version>4.13.2</junit-version>
         <servlet-api.version>3.1.0</servlet-api.version>
         <JETTY_TEST_HTTP_PORT>8080</JETTY_TEST_HTTP_PORT>
         <JETTY_TEST_STOP_PORT>8079</JETTY_TEST_STOP_PORT>

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.36-SNAPSHOT
+  version: 3.0.36
   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.36-SNAPSHOT</version>
+    <version>3.0.36</version>
     <url>https://github.com/swagger-api/swagger-codegen</url>
     <scm>
         <connection>scm:git:[email protected]:swagger-api/swagger-codegen.git</connection>
@@ -900,6 +900,11 @@
     <dependencyManagement>
         <dependencies>
             <!-- swagger-core v2 -->
+            <dependency>
+                <groupId>io.swagger.core.v3</groupId>
+                <artifactId>swagger-jaxrs2</artifactId>
+                <version>${swagger-core-version}</version>
+            </dependency>
             <dependency>
                 <groupId>io.swagger.core.v3</groupId>
                 <artifactId>swagger-core</artifactId>
@@ -1069,25 +1074,21 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-codegen-generators-version>1.0.36-SNAPSHOT</swagger-codegen-generators-version>
-        <swagger-core-version>2.2.2</swagger-core-version>
-        <swagger-core-version-v1>1.6.6</swagger-core-version-v1>
-        <swagger-parser-version>2.1.2</swagger-parser-version>
-        <swagger-parser-version-v1>1.0.61</swagger-parser-version-v1>
-        <jackson-version>2.13.2</jackson-version>
-        <!--
-          jackson-databind 2.13.2 is still affected by CVE-2020-36518.
-          This version pin for jackson-databind can be removed when bumping jackson to 2.14
-          -->
-        <jackson-databind-version>2.13.2.2</jackson-databind-version>
+        <swagger-codegen-generators-version>1.0.36</swagger-codegen-generators-version>
+        <swagger-core-version>2.2.6</swagger-core-version>
+        <swagger-core-version-v1>1.6.8</swagger-core-version-v1>
+        <swagger-parser-version>2.1.8</swagger-parser-version>
+        <swagger-parser-version-v1>1.0.63</swagger-parser-version-v1>
+        <jackson-version>2.14.0</jackson-version>
+        <jackson-databind-version>2.14.0</jackson-databind-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
         <commons-io-version>2.11.0</commons-io-version>
         <commons-cli-version>1.5.0</commons-cli-version>
-        <junit-version>4.13.1</junit-version>
+        <junit-version>4.13.2</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <commons-lang-version>3.12.0</commons-lang-version>
-        <slf4j-version>1.7.35</slf4j-version>
+        <slf4j-version>1.7.36</slf4j-version>
         <logback-version>1.2.10</logback-version>
         <scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
         <jmustache-version>1.15</jmustache-version>
@@ -1096,7 +1097,7 @@
         <jmockit-version>1.42</jmockit-version>
         <reflections-version>0.9.11</reflections-version>
         <jmockit-version>1.42</jmockit-version>
-        <snakeyaml-version>1.30</snakeyaml-version>
+        <snakeyaml-version>1.33</snakeyaml-version>
         <handlebars-version>4.3.0</handlebars-version>
     </properties>
 </project>
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.36-SNAPSHOT</version>
+    <version>3.0.36</version>
     <url>https://github.com/swagger-api/swagger-codegen</url>
     <scm>
         <connection>scm:git:[email protected]:swagger-api/swagger-codegen.git</connection>
@@ -1178,25 +1178,21 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-codegen-generators-version>1.0.36-SNAPSHOT</swagger-codegen-generators-version>
-        <swagger-core-version>2.2.2</swagger-core-version>
-        <swagger-core-version-v1>1.6.6</swagger-core-version-v1>
-        <swagger-parser-version>2.1.2</swagger-parser-version>
-        <swagger-parser-version-v1>1.0.61</swagger-parser-version-v1>
-        <jackson-version>2.13.2</jackson-version>
-        <!--
-          jackson-databind 2.13.2 is still affected by CVE-2020-36518.
-          This version pin for jackson-databind can be removed when bumping jackson to 2.14
-          -->
-        <jackson-databind-version>2.13.2.2</jackson-databind-version>
+        <swagger-codegen-generators-version>1.0.36</swagger-codegen-generators-version>
+        <swagger-core-version>2.2.6</swagger-core-version>
+        <swagger-core-version-v1>1.6.8</swagger-core-version-v1>
+        <swagger-parser-version>2.1.8</swagger-parser-version>
+        <swagger-parser-version-v1>1.0.63</swagger-parser-version-v1>
+        <jackson-version>2.14.0</jackson-version>
+        <jackson-databind-version>2.14.0</jackson-databind-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
         <commons-io-version>2.11.0</commons-io-version>
         <commons-cli-version>1.5.0</commons-cli-version>
-        <junit-version>4.13.1</junit-version>
+        <junit-version>4.13.2</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <commons-lang-version>3.12.0</commons-lang-version>
-        <slf4j-version>1.7.35</slf4j-version>
+        <slf4j-version>1.7.36</slf4j-version>
         <logback-version>1.2.10</logback-version>
         <scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
         <jmustache-version>1.15</jmustache-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.36-SNAPSHOT</swagger-codegen-version>
-        <swagger-codegen-generators-version>1.0.36-SNAPSHOT</swagger-codegen-generators-version>
+        <swagger-codegen-version>3.0.36</swagger-codegen-version>
+        <swagger-codegen-generators-version>1.0.36</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>