Skip to content

Commit db49210

Browse files
fgreinacherfgreinacher
authored
Merge branch 'master' into fix/use-generator-host
2 parents 58c1678 + b08cae9 commit db49210

File tree

7 files changed

+26
-24
lines changed

7 files changed

+26
-24
lines changed

‎README.md

Lines changed: 14 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.27-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.28-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.33-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.34-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.26</version>
53+
<version>2.4.27</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.32</version>
71+
<version>3.0.34</version>
7272
</dependency>
7373
```
7474

@@ -132,8 +132,9 @@ 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.34-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.34-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
136-
[3.0.33](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.33) (**current stable**) | 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)
135+
3.0.35-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.35-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
136+
[3.0.34](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.34) (**current stable**) | 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)
137+
[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)
137138
[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)
138139
[3.0.31](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.31) | 2021-12-28 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.31](https://github.com/swagger-api/swagger-codegen/tree/v3.0.31)
139140
[3.0.30](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.30) | 2021-11-18 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.30](https://github.com/swagger-api/swagger-codegen/tree/v3.0.30)
@@ -166,8 +167,9 @@ Swagger Codegen Version | Release Date | OpenAPI Spec compatibility | Notes
166167
[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
167168
[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
168169
[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
169-
2.4.27-SNAPSHOT (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.4.27-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0 | Minor release
170-
[2.4.26](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.26) (**current stable**) | 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)
170+
2.4.28-SNAPSHOT (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.4.28-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0 | Minor release
171+
[2.4.27](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.27) (**current stable**) | 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)
172+
[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)
171173
[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)
172174
[2.4.24](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.24) | 2021-11-18 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.24](https://github.com/swagger-api/swagger-codegen/tree/v2.4.24)
173175
[2.4.23](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.23) | 2021-10-08 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.23](https://github.com/swagger-api/swagger-codegen/tree/v2.4.23)
@@ -207,17 +209,17 @@ If you're looking for the latest stable version, you can grab it directly from M
207209

208210
```sh
209211
# Download current stable 2.x.x branch (Swagger and OpenAPI version 2)
210-
wget https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.26/swagger-codegen-cli-2.4.26.jar -O swagger-codegen-cli.jar
212+
wget https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.27/swagger-codegen-cli-2.4.27.jar -O swagger-codegen-cli.jar
211213

212214
java -jar swagger-codegen-cli.jar help
213215

214216
# Download current stable 3.x.x branch (OpenAPI version 3)
215-
wget https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.31/swagger-codegen-cli-3.0.31.jar -O swagger-codegen-cli.jar
217+
wget https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.34/swagger-codegen-cli-3.0.34.jar -O swagger-codegen-cli.jar
216218

217219
java -jar swagger-codegen-cli.jar --help
218220
```
219221

220-
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.26/swagger-codegen-cli-2.4.26.jar`
222+
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.27/swagger-codegen-cli-2.4.27.jar`
221223

222224
On a mac, it's even easier with `brew`:
223225
```sh
@@ -365,7 +367,7 @@ java -jar modules/swagger-codegen-cli/target/swagger-codegen-cli.jar generate \
365367
```
366368
(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`)
367369

368-
You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.26/swagger-codegen-cli-2.4.26.jar)
370+
You can also download the JAR (latest release) directly from [maven.org](https://repo1.maven.org/maven2/io/swagger/swagger-codegen-cli/2.4.27/swagger-codegen-cli-2.4.27.jar)
369371

370372
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))
371373

‎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.27-SNAPSHOT</version>
6+
<version>2.4.28-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.27-SNAPSHOT</version>
7+
<version>2.4.28-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.27-SNAPSHOT</version>
6+
<version>2.4.28-SNAPSHOT</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>

‎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.27-SNAPSHOT</version>
7+
<version>2.4.28-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.27-SNAPSHOT</version>
12+
<version>2.4.28-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>
@@ -952,14 +952,14 @@
952952
</repository>
953953
</repositories>
954954
<properties>
955-
<swagger-parser-version>1.0.57</swagger-parser-version>
955+
<swagger-parser-version>1.0.59</swagger-parser-version>
956956
<scala-version>2.11.1</scala-version>
957957
<felix-version>3.3.0</felix-version>
958-
<swagger-core-version>1.6.5</swagger-core-version>
958+
<swagger-core-version>1.6.6</swagger-core-version>
959959
<commons-io-version>2.11.0</commons-io-version>
960960
<commons-cli-version>1.5.0</commons-cli-version>
961961
<junit-version>4.13.1</junit-version>
962-
<jackson-version>2.12.1</jackson-version>
962+
<jackson-version>2.13.2</jackson-version>
963963
<maven-plugin-version>1.0.0</maven-plugin-version>
964964
<commons-lang-version>3.12.0</commons-lang-version>
965965
<slf4j-version>1.7.35</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.27-SNAPSHOT</version>
12+
<version>2.4.28-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>
@@ -992,14 +992,14 @@
992992
</repository>
993993
</repositories>
994994
<properties>
995-
<swagger-parser-version>1.0.57</swagger-parser-version>
995+
<swagger-parser-version>1.0.59</swagger-parser-version>
996996
<scala-version>2.11.1</scala-version>
997997
<felix-version>3.3.0</felix-version>
998-
<swagger-core-version>1.6.5</swagger-core-version>
998+
<swagger-core-version>1.6.6</swagger-core-version>
999999
<commons-io-version>2.11.0</commons-io-version>
10001000
<commons-cli-version>1.5.0</commons-cli-version>
10011001
<junit-version>4.13.1</junit-version>
1002-
<jackson-version>2.12.1</jackson-version>
1002+
<jackson-version>2.13.2</jackson-version>
10031003
<maven-plugin-version>1.0.0</maven-plugin-version>
10041004
<commons-lang-version>3.12.0</commons-lang-version>
10051005
<slf4j-version>1.7.35</slf4j-version>

0 commit comments

Comments
 (0)