Skip to content

Commit 7214bc6

Browse files
viktorsmlviktorsml
authored
Merge branch 'master' into #11852-fix-override-in-typescript
2 parents 9137a48 + a620537 commit 7214bc6

File tree

9 files changed

+29
-26
lines changed

9 files changed

+29
-26
lines changed

‎README.md‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
[![Build Status](https://jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-master-java7/badge/icon?subject=jenkins%20build%20-%20java%207)](https://jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-master-java7/)
88

9-
- Master (2.4.32-SNAPSHOT): [![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)
9+
- Master (2.4.33-SNAPSHOT): [![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)
1010
[![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)
1111

12-
- 3.0.42-SNAPSHOT: [![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)
12+
- 3.0.44-SNAPSHOT: [![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)
1313
[![Windows Test](https://ci.appveyor.com/api/projects/status/github/swagger-api/swagger-codegen?branch=3.0.0&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/swaggerhub-bot/swagger-codegen)
1414

1515

@@ -50,7 +50,7 @@ dependency example:
5050
<dependency>
5151
<groupId>io.swagger</groupId>
5252
<artifactId>swagger-codegen-maven-plugin</artifactId>
53-
<version>2.4.31</version>
53+
<version>2.4.32</version>
5454
</dependency>
5555
```
5656

@@ -68,7 +68,7 @@ dependency example:
6868
<dependency>
6969
<groupId>io.swagger.codegen.v3</groupId>
7070
<artifactId>swagger-codegen-maven-plugin</artifactId>
71-
<version>3.0.41</version>
71+
<version>3.0.43</version>
7272
</dependency>
7373
```
7474

@@ -132,8 +132,10 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
132132

133133
Swagger Codegen Version | Release Date | OpenAPI Spec compatibility | Notes
134134
-------------------------- |--------------| -------------------------- | -----
135-
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
136-
[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)
135+
3.0.44-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.44-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
136+
[3.0.43](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.43) (**current stable**) | 2023-05-17 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.43](https://github.com/swagger-api/swagger-codegen/tree/v3.0.43)
137+
[3.0.42](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.42) | 2023-04-05 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.42](https://github.com/swagger-api/swagger-codegen/tree/v3.0.42)
138+
[3.0.41](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.41) | 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)
137139
[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)
138140
[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)
139141
[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)
@@ -174,8 +176,9 @@ Swagger Codegen Version | Release Date | OpenAPI Spec compatibility | Notes
174176
[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
175177
[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
176178
[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
177-
2.4.32-SNAPSHOT (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.4.32-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0 | Minor release
178-
[2.4.31](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.31) (**current stable**) | 2023-04-02 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.31](https://github.com/swagger-api/swagger-codegen/tree/v2.4.31)
179+
2.4.33-SNAPSHOT (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.4.33-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0 | Minor release
180+
[2.4.32](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.32) (**current stable**) | 2023-05-17 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.32](https://github.com/swagger-api/swagger-codegen/tree/v2.4.32)
181+
[2.4.31](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.31) | 2023-04-02 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.31](https://github.com/swagger-api/swagger-codegen/tree/v2.4.31)
179182
[2.4.30](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.30) | 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)
180183
[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)
181184
[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)
@@ -220,17 +223,17 @@ If you're looking for the latest stable version, you can grab it directly from M
220223

221224
```sh
222225
# Download current stable 2.x.x branch (Swagger and OpenAPI version 2)
223-
wget https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.31/swagger-codegen-cli-2.4.31.jar -O swagger-codegen-cli.jar
226+
wget https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.32/swagger-codegen-cli-2.4.32.jar -O swagger-codegen-cli.jar
224227

225228
java -jar swagger-codegen-cli.jar help
226229

227230
# Download current stable 3.x.x branch (OpenAPI version 3)
228-
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
231+
wget https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.43/swagger-codegen-cli-3.0.43.jar -O swagger-codegen-cli.jar
229232

230233
java -jar swagger-codegen-cli.jar --help
231234
```
232235

233-
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/swagger-codegen-cli/2.4.31/swagger-codegen-cli-2.4.31.jar`
236+
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/swagger-codegen-cli/2.4.32/swagger-codegen-cli-2.4.32.jar`
234237

235238
On a mac, it's even easier with `brew`:
236239
```sh
@@ -378,7 +381,7 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
378381
```
379382
(if you're on Windows, replace the last command with `java -jar modules\swagger-codegen-cli\target\swagger-codegen-cli.jar generate -i https://petstore.swagger.io/v2/swagger.json -l php -o c:\temp\php_api_client`)
380383

381-
You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.31/swagger-codegen-cli-2.4.31.jar)
384+
You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.32/swagger-codegen-cli-2.4.32.jar)
382385

383386
To get a list of **general** options available, please run `java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar help generate` (for version 3.x check [3.0.0 branch](https://github.com/swagger-api/swagger-codegen/tree/3.0.0))
384387

‎modules/swagger-codegen-cli/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.swagger</groupId>
55
<artifactId>swagger-codegen-project</artifactId>
6-
<version>2.4.32-SNAPSHOT</version>
6+
<version>2.4.33-SNAPSHOT</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎modules/swagger-codegen-maven-plugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.swagger</groupId>
66
<artifactId>swagger-codegen-project</artifactId>
7-
<version>2.4.32-SNAPSHOT</version>
7+
<version>2.4.33-SNAPSHOT</version>
88
<relativePath>../..</relativePath>
99
</parent>
1010
<artifactId>swagger-codegen-maven-plugin</artifactId>

‎modules/swagger-codegen/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.swagger</groupId>
55
<artifactId>swagger-codegen-project</artifactId>
6-
<version>2.4.32-SNAPSHOT</version>
6+
<version>2.4.33-SNAPSHOT</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎modules/swagger-codegen/src/test/java/io/swagger/codegen/CodegenTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ public void testPattern() throws Exception {
503503
final CodegenModel codegenModel = codegen.fromModel("Amount", amount, swagger.getDefinitions());
504504
for (CodegenProperty codegenProperty : codegenModel.vars) {
505505
if ("currency".equalsIgnoreCase(codegenProperty.name)) {
506-
Assert.assertEquals(codegenProperty.pattern, "^[A-Z]{3,3}$");
506+
Assert.assertEquals(codegenProperty.pattern, "/^[A-Z]{3,3}$/");
507507
break;
508508
}
509509
}

‎modules/swagger-generator/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.swagger</groupId>
66
<artifactId>swagger-codegen-project</artifactId>
7-
<version>2.4.32-SNAPSHOT</version>
7+
<version>2.4.33-SNAPSHOT</version>
88
<relativePath>../..</relativePath>
99
</parent>
1010
<artifactId>swagger-generator</artifactId>

‎modules/swagger-generator/pom.xml.jenkins‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.swagger</groupId>
66
<artifactId>swagger-codegen-project</artifactId>
7-
<version>2.4.32-SNAPSHOT</version>
7+
<version>2.4.33-SNAPSHOT</version>
88
<relativePath>../..</relativePath>
99
</parent>
1010
<artifactId>swagger-generator</artifactId>

‎pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<artifactId>swagger-codegen-project</artifactId>
1010
<packaging>pom</packaging>
1111
<name>swagger-codegen-project</name>
12-
<version>2.4.32-SNAPSHOT</version>
12+
<version>2.4.33-SNAPSHOT</version>
1313
<url>https://github.com/swagger-api/swagger-codegen</url>
1414
<scm>
1515
<connection>scm:git:[email protected]:swagger-api/swagger-codegen.git</connection>
@@ -978,14 +978,14 @@
978978
</repositories>
979979
<properties>
980980
<maven.compiler.release>8</maven.compiler.release>
981-
<swagger-parser-version>1.0.65</swagger-parser-version>
981+
<swagger-parser-version>1.0.66</swagger-parser-version>
982982
<scala-version>2.11.1</scala-version>
983983
<felix-version>3.3.0</felix-version>
984-
<swagger-core-version>1.6.10</swagger-core-version>
984+
<swagger-core-version>1.6.11</swagger-core-version>
985985
<commons-io-version>2.11.0</commons-io-version>
986986
<commons-cli-version>1.5.0</commons-cli-version>
987987
<junit-version>4.13.2</junit-version>
988-
<jackson-version>2.14.2</jackson-version>
988+
<jackson-version>2.15.1</jackson-version>
989989
<maven-plugin-version>1.0.0</maven-plugin-version>
990990
<commons-lang-version>3.12.0</commons-lang-version>
991991
<slf4j-version>1.7.36</slf4j-version>

‎pom.xml.jenkins‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<artifactId>swagger-codegen-project</artifactId>
1010
<packaging>pom</packaging>
1111
<name>swagger-codegen-project</name>
12-
<version>2.4.32-SNAPSHOT</version>
12+
<version>2.4.33-SNAPSHOT</version>
1313
<url>https://github.com/swagger-api/swagger-codegen</url>
1414
<scm>
1515
<connection>scm:git:[email protected]:swagger-api/swagger-codegen.git</connection>
@@ -1002,14 +1002,14 @@
10021002
</repository>
10031003
</repositories>
10041004
<properties>
1005-
<swagger-parser-version>1.0.65</swagger-parser-version>
1005+
<swagger-parser-version>1.0.66</swagger-parser-version>
10061006
<scala-version>2.11.1</scala-version>
10071007
<felix-version>3.3.0</felix-version>
1008-
<swagger-core-version>1.6.10</swagger-core-version>
1008+
<swagger-core-version>1.6.11</swagger-core-version>
10091009
<commons-io-version>2.11.0</commons-io-version>
10101010
<commons-cli-version>1.5.0</commons-cli-version>
10111011
<junit-version>4.13.2</junit-version>
1012-
<jackson-version>2.14.2</jackson-version>
1012+
<jackson-version>2.15.1</jackson-version>
10131013
<maven-plugin-version>1.0.0</maven-plugin-version>
10141014
<commons-lang-version>3.12.0</commons-lang-version>
10151015
<slf4j-version>1.7.36</slf4j-version>

0 commit comments

Comments
 (0)