Merge branch '3.0.0' into 3.0.0

swagger-api · Oct 17, 2024 · ccef509 · ccef509
2 parents 63fa1f8 + e06aaa1
commit ccef509
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -84,14 +84,14 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
 
 Swagger Codegen Version    | Release Date | Swagger / OpenAPI Spec compatibility | Notes
 -------------------------- |--------------| -------------------------- | -----
-[3.0.62](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.62) (**current stable**) | 2024-08-27   | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.62](https://github.com/swagger-api/swagger-codegen/tree/v3.0.62)
+[3.0.63](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.63) (**current stable**) | 2024-10-16   | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.63](https://github.com/swagger-api/swagger-codegen/tree/v3.0.63)
 [2.4.43](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.43) (**current stable**) | 2024-08-09   | 1.0, 1.1, 1.2, 2.0   | [tag v2.4.42](https://github.com/swagger-api/swagger-codegen/tree/v2.4.43)
 
 💁 Here's also an overview of what's coming around the corner:
 
 Swagger Codegen Version    | Release Date | Swagger / OpenAPI Spec compatibility | Notes
 -------------------------- |--------------| -------------------------- | -----
-3.0.63-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.63-SNAPSHOT/)| TBD          | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
+3.0.64-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.64-SNAPSHOT/)| TBD          | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
 2.4.44-SNAPSHOT (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.4.44-SNAPSHOT/)| TBD          | 1.0, 1.1, 1.2, 2.0   | Minor release
 
 For detailed breakdown of all versions, please see the [full compatibility listing](./docs/compatibility.md).
@@ -126,7 +126,7 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
 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.62/swagger-codegen-cli-3.0.62.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.63/swagger-codegen-cli-3.0.63.jar).
 
 To get a list of **general** options available, please run:
 

diff --git a/docs/compatibility.md b/docs/compatibility.md
@@ -4,8 +4,9 @@ The Swagger Codegen project has the following compatibilities with the OpenAPI S
 
 Swagger Codegen Version    | Release Date | OpenAPI Spec compatibility | Notes
 -------------------------- |--------------| -------------------------- | -----
-3.0.63-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.63-SNAPSHOT/)| TBD          | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
-[3.0.62](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.62) (**current stable**) | 2024-08-27   | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.62](https://github.com/swagger-api/swagger-codegen/tree/v3.0.62)
+3.0.64-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.64-SNAPSHOT/)| TBD          | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
+[3.0.63](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.63) (**current stable**) | 2024-10-16   | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.63](https://github.com/swagger-api/swagger-codegen/tree/v3.0.63)
+[3.0.62](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.62) | 2024-08-27   | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.62](https://github.com/swagger-api/swagger-codegen/tree/v3.0.62)
 [3.0.61](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.61) | 2024-08-09   | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.61](https://github.com/swagger-api/swagger-codegen/tree/v3.0.61)
 [3.0.60](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.60) | 2024-08-01   | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.60](https://github.com/swagger-api/swagger-codegen/tree/v3.0.60)
 [3.0.59](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.59) | 2024-07-22   | 1.0, 1.1, 1.2, 2.0, 3.0   | [tag v3.0.59](https://github.com/swagger-api/swagger-codegen/tree/v3.0.59)

diff --git a/docs/prerequisites.md b/docs/prerequisites.md
@@ -3,15 +3,15 @@
 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.62/swagger-codegen-cli-3.0.62.jar -O swagger-codegen-cli.jar
+wget https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.63/swagger-codegen-cli-3.0.63.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+). For example:
 
 ```powershell
-Invoke-WebRequest -OutFile swagger-codegen-cli.jar https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.62/swagger-codegen-cli-3.0.62.jar
+Invoke-WebRequest -OutFile swagger-codegen-cli.jar https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.63/swagger-codegen-cli-3.0.63.jar
 ```
 
 On a Mac, it's even easier with `brew`:

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.63-SNAPSHOT</version>
+        <version>3.0.64-SNAPSHOT</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.63-SNAPSHOT</version>
+        <version>3.0.64-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <artifactId>swagger-codegen-maven-plugin</artifactId>
@@ -18,7 +18,7 @@
     </prerequisites>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.version>3.9.5</maven.version>
+        <maven.version>3.9.9</maven.version>
     </properties>
     <dependencies>
         <dependency>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.maven.plugin-tools</groupId>
             <artifactId>maven-plugin-annotations</artifactId>
-            <version>3.4</version>
+            <version>3.15.0</version>
         </dependency>
         <dependency>
             <groupId>io.swagger.codegen.v3</groupId>

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.63-SNAPSHOT</version>
+        <version>3.0.64-SNAPSHOT</version>
         <relativePath>../..</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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.63-SNAPSHOT</version>
+        <version>3.0.64-SNAPSHOT</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.63-SNAPSHOT
+  version: 3.0.64-SNAPSHOT
   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.63-SNAPSHOT</version>
+    <version>3.0.64-SNAPSHOT</version>
     <url>https://github.com/swagger-api/swagger-codegen</url>
     <scm>
         <connection>scm:git:[email protected]:swagger-api/swagger-codegen.git</connection>
@@ -1118,7 +1118,7 @@
     </repositories>
     <properties>
         <maven.compiler.release>8</maven.compiler.release>
-        <swagger-codegen-generators-version>1.0.53-SNAPSHOT</swagger-codegen-generators-version>
+        <swagger-codegen-generators-version>1.0.54-SNAPSHOT</swagger-codegen-generators-version>
         <swagger-core-version>2.2.22</swagger-core-version>
         <swagger-core-version-v1>1.6.14</swagger-core-version-v1>
         <swagger-parser-version>2.1.22</swagger-parser-version>

diff --git a/pom.java11.xml b/pom.java11.xml
@@ -9,7 +9,7 @@
     <artifactId>swagger-codegen-project</artifactId>
     <packaging>pom</packaging>
     <name>swagger-codegen-project</name>
-    <version>3.0.63-SNAPSHOT</version>
+    <version>3.0.64-SNAPSHOT</version>
     <url>https://github.com/swagger-api/swagger-codegen</url>
     <scm>
         <connection>scm:git:[email protected]:swagger-api/swagger-codegen.git</connection>
@@ -1219,7 +1219,7 @@
     </repositories>
     <properties>
         <maven.compiler.release>8</maven.compiler.release>
-        <swagger-codegen-generators-version>1.0.53-SNAPSHOT</swagger-codegen-generators-version>
+        <swagger-codegen-generators-version>1.0.54-SNAPSHOT</swagger-codegen-generators-version>
         <swagger-core-version>2.2.22</swagger-core-version>
         <swagger-core-version-v1>1.6.14</swagger-core-version-v1>
         <swagger-parser-version>2.1.22</swagger-parser-version>

diff --git a/pom.java8.xml b/pom.java8.xml
@@ -9,7 +9,7 @@
     <artifactId>swagger-codegen-project</artifactId>
     <packaging>pom</packaging>
     <name>swagger-codegen-project</name>
-    <version>3.0.63-SNAPSHOT</version>
+    <version>3.0.64-SNAPSHOT</version>
     <url>https://github.com/swagger-api/swagger-codegen</url>
     <scm>
         <connection>scm:git:[email protected]:swagger-api/swagger-codegen.git</connection>
@@ -1222,7 +1222,7 @@
         </repository>
     </repositories>
     <properties>
-        <swagger-codegen-generators-version>1.0.53-SNAPSHOT</swagger-codegen-generators-version>
+        <swagger-codegen-generators-version>1.0.54-SNAPSHOT</swagger-codegen-generators-version>
         <swagger-core-version>2.2.22</swagger-core-version>
         <swagger-core-version-v1>1.6.14</swagger-core-version-v1>
         <swagger-parser-version>2.1.22</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.63-SNAPSHOT</version>
+    <version>3.0.64-SNAPSHOT</version>
     <url>https://github.com/swagger-api/swagger-codegen</url>
     <scm>
         <connection>scm:git:[email protected]:swagger-api/swagger-codegen.git</connection>
@@ -1201,33 +1201,33 @@
     </repositories>
     <properties>
         <maven.compiler.release>8</maven.compiler.release>
-        <swagger-codegen-generators-version>1.0.53-SNAPSHOT</swagger-codegen-generators-version>
-        <swagger-core-version>2.2.22</swagger-core-version>
+        <swagger-codegen-generators-version>1.0.54-SNAPSHOT</swagger-codegen-generators-version>
+        <swagger-core-version>2.2.25</swagger-core-version>
         <swagger-core-version-v1>1.6.14</swagger-core-version-v1>
         <swagger-parser-version>2.1.22</swagger-parser-version>
         <swagger-parser-version-v1>1.0.71</swagger-parser-version-v1>
         <jackson-version>2.16.1</jackson-version>
         <jackson-databind-version>2.16.1</jackson-databind-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <commons-io-version>2.16.1</commons-io-version>
+        <commons-io-version>2.17.0</commons-io-version>
         <commons-cli-version>1.9.0</commons-cli-version>
         <junit-version>4.13.2</junit-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
-        <commons-lang-version>3.16.0</commons-lang-version>
+        <commons-lang-version>3.17.0</commons-lang-version>
         <slf4j-version>2.0.9</slf4j-version>
-        <logback-version>1.5.7</logback-version>
+        <logback-version>1.5.11</logback-version>
         <scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
         <jmustache-version>1.16</jmustache-version>
         <testng-version>7.10.2</testng-version>
-        <surefire-version>3.4.0</surefire-version>
+        <surefire-version>3.5.1</surefire-version>
         <jmockit-version>1.49</jmockit-version>
         <reflections-version>0.10.2</reflections-version>
-        <mockito-version>5.12.0</mockito-version>
-        <snakeyaml-version>2.2</snakeyaml-version>
+        <mockito-version>5.14.2</mockito-version>
+        <snakeyaml-version>2.3</snakeyaml-version>
         <handlebars-version>4.3.1</handlebars-version>
         <httpclient-version>4.5.14</httpclient-version>
-        <jersey-version>2.44</jersey-version>
+        <jersey-version>2.45</jersey-version>
         <json-version>20231013</json-version>
     </properties>
 </project>
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.63-SNAPSHOT</swagger-codegen-version>
-        <swagger-codegen-generators-version>1.0.53-SNAPSHOT</swagger-codegen-generators-version>
+        <swagger-codegen-version>3.0.64-SNAPSHOT</swagger-codegen-version>
+        <swagger-codegen-generators-version>1.0.54-SNAPSHOT</swagger-codegen-generators-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <junit-version>4.13.2</junit-version>
         <build-helper-maven-plugin>3.0.0</build-helper-maven-plugin>