Skip to content

Commit 738274f

Browse files
authored
Merge branch '3.0.0' into feature/11016_unnecessary_printSackTrace
2 parents 8359f47 + 021c81f commit 738274f

File tree

16 files changed

+36
-2418
lines changed

16 files changed

+36
-2418
lines changed

.travis.yml

Lines changed: 0 additions & 97 deletions
This file was deleted.

.travis.yml.bash

Lines changed: 0 additions & 38 deletions
This file was deleted.

.travis/settings.xml

Lines changed: 0 additions & 18 deletions
This file was deleted.

README.md

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
[![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)
44

5-
- 3.0.26-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)
5+
- 3.0.27-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)
66
[![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)
7-
- Master (2.4.20-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)
7+
- Master (2.4.21-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)
88
[![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)
99
[![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)
1010

@@ -37,7 +37,7 @@ dependency example:
3737
<dependency>
3838
<groupId>io.swagger.codegen.v3</groupId>
3939
<artifactId>swagger-codegen-maven-plugin</artifactId>
40-
<version>3.0.25</version>
40+
<version>3.0.26</version>
4141
</dependency>
4242
```
4343

@@ -54,7 +54,7 @@ dependency example:
5454
<dependency>
5555
<groupId>io.swagger</groupId>
5656
<artifactId>swagger-codegen-maven-plugin</artifactId>
57-
<version>2.4.19</version>
57+
<version>2.4.20</version>
5858
</dependency>
5959
```
6060

@@ -112,8 +112,9 @@ The OpenAPI Specification has undergone 3 revisions since initial creation in 20
112112

113113
Swagger Codegen Version | Release Date | OpenAPI Spec compatibility | Notes
114114
-------------------------- | ------------ | -------------------------- | -----
115-
3.0.26-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.26-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
116-
[3.0.25](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.25) (**current stable**) | 2021-03-04 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.25](https://github.com/swagger-api/swagger-codegen/tree/v3.0.25)
115+
3.0.27-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.27-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0, 3.0 | Minor release
116+
[3.0.26](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.26) (**current stable**) | 2021-05-28 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.26](https://github.com/swagger-api/swagger-codegen/tree/v3.0.26)
117+
[3.0.25](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.25) | 2021-03-04 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.25](https://github.com/swagger-api/swagger-codegen/tree/v3.0.25)
117118
[3.0.24](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.24) | 2020-12-29 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.24](https://github.com/swagger-api/swagger-codegen/tree/v3.0.24)
118119
[3.0.23](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.23) | 2020-11-02 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.23](https://github.com/swagger-api/swagger-codegen/tree/v3.0.23)
119120
[3.0.22](https://github.com/swagger-api/swagger-codegen/releases/tag/v3.0.22) | 2020-10-05 | 1.0, 1.1, 1.2, 2.0, 3.0 | [tag v3.0.22](https://github.com/swagger-api/swagger-codegen/tree/v3.0.22)
@@ -138,8 +139,9 @@ Swagger Codegen Version | Release Date | OpenAPI Spec compatibility | Notes
138139
[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
139140
[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
140141
[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
141-
2.4.20-SNAPSHOT (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.4.20-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0 | Minor release
142-
[2.4.19](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.19) (**current stable**) | 2021-03-04 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.19](https://github.com/swagger-api/swagger-codegen/tree/v2.4.19)
142+
2.4.21-SNAPSHOT (current master, upcoming minor release) [SNAPSHOT](https://oss.sonatype.org/content/repositories/snapshots/io/swagger/swagger-codegen-cli/2.4.21-SNAPSHOT/)| TBD | 1.0, 1.1, 1.2, 2.0 | Minor release
143+
[2.4.20](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.20) (**current stable**) | 2021-05-28 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.20](https://github.com/swagger-api/swagger-codegen/tree/v2.4.20)
144+
[2.4.19](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.19) | 2021-03-04 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.19](https://github.com/swagger-api/swagger-codegen/tree/v2.4.19)
143145
[2.4.18](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.18) | 2020-12-29 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.18](https://github.com/swagger-api/swagger-codegen/tree/v2.4.18)
144146
[2.4.17](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.17) | 2020-11-02 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.17](https://github.com/swagger-api/swagger-codegen/tree/v2.4.17)
145147
[2.4.16](https://github.com/swagger-api/swagger-codegen/releases/tag/v2.4.16) | 2020-10-05 | 1.0, 1.1, 1.2, 2.0 | [tag v2.4.16](https://github.com/swagger-api/swagger-codegen/tree/v2.4.16)
@@ -172,12 +174,12 @@ Swagger Codegen Version | Release Date | OpenAPI Spec compatibility | Notes
172174
If you're looking for the latest stable version, you can grab it directly from Maven.org (Java 8 runtime at a minimum):
173175

174176
```sh
175-
wget https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.25/swagger-codegen-cli-3.0.25.jar -O swagger-codegen-cli.jar
177+
wget https://repo1.maven.org/maven2/io/swagger/codegen/v3/swagger-codegen-cli/3.0.26/swagger-codegen-cli-3.0.26.jar -O swagger-codegen-cli.jar
176178

177179
java -jar swagger-codegen-cli.jar --help
178180
```
179181

180-
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.25/swagger-codegen-cli-3.0.25.jar`
182+
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.26/swagger-codegen-cli-3.0.26.jar`
181183

182184
On a mac, it's even easier with `brew`:
183185
```sh

circle.yml.disabled

Lines changed: 0 additions & 51 deletions
This file was deleted.

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.codegen.v3</groupId>
55
<artifactId>swagger-codegen-project</artifactId>
6-
<version>3.0.26-SNAPSHOT</version>
6+
<version>3.0.27-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
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.swagger.codegen.v3</groupId>
88
<artifactId>swagger-codegen-project</artifactId>
9-
<version>3.0.26-SNAPSHOT</version>
9+
<version>3.0.27-SNAPSHOT</version>
1010
<relativePath>../..</relativePath>
1111
</parent>
1212
<artifactId>swagger-codegen-maven-plugin</artifactId>

modules/swagger-codegen/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<parent>
44
<groupId>io.swagger.codegen.v3</groupId>
55
<artifactId>swagger-codegen-project</artifactId>
6-
<version>3.0.26-SNAPSHOT</version>
6+
<version>3.0.27-SNAPSHOT</version>
77
<relativePath>../..</relativePath>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
@@ -200,7 +200,7 @@
200200
</reporting>
201201
<properties>
202202
<diffutils-version>1.3.0</diffutils-version>
203-
<swagger-codegen-v2-version>2.4.20-SNAPSHOT</swagger-codegen-v2-version>
203+
<swagger-codegen-v2-version>2.4.21-SNAPSHOT</swagger-codegen-v2-version>
204204
</properties>
205205
<dependencies>
206206
<dependency>

modules/swagger-codegen/src/test/java/io/swagger/codegen/v3/service/GeneratorServiceTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -599,7 +599,7 @@ public void testGeneratorService_ResolvedSpec() throws IOException {
599599
new GeneratorService().generationRequest(request).generate();
600600
String spec = FileUtils.readFileToString(new File(path + File.separator + "openapi.json"));
601601
Assert.assertFalse(spec.contains("#/components/schemas/inline_response_200"));
602-
Assert.assertFalse(spec.contains("#/components/schemas/body"));
602+
Assert.assertFalse(spec.contains("#/components/schemas/productflatten_body"));
603603

604604
path = getTmpFolder().getAbsolutePath();
605605
request = new GenerationRequest();
@@ -618,7 +618,7 @@ public void testGeneratorService_ResolvedSpec() throws IOException {
618618
new GeneratorService().generationRequest(request).generate();
619619
spec = FileUtils.readFileToString(new File(path + File.separator + "openapi.yaml"));
620620
Assert.assertFalse(spec.contains("#/components/schemas/inline_response_200"));
621-
Assert.assertFalse(spec.contains("#/components/schemas/body"));
621+
Assert.assertFalse(spec.contains("#/components/schemas/productflatten_body"));
622622

623623

624624
path = getTmpFolder().getAbsolutePath();
@@ -636,7 +636,7 @@ public void testGeneratorService_ResolvedSpec() throws IOException {
636636
new GeneratorService().generationRequest(request).generate();
637637
spec = FileUtils.readFileToString(new File(path + File.separator + "openapi.json"));
638638
Assert.assertTrue(spec.contains("#/components/schemas/inline_response_200"));
639-
Assert.assertTrue(spec.contains("#/components/schemas/body"));
639+
Assert.assertTrue(spec.contains("#/components/schemas/productflatten_body"));
640640

641641

642642
path = getTmpFolder().getAbsolutePath();
@@ -654,7 +654,7 @@ public void testGeneratorService_ResolvedSpec() throws IOException {
654654
new GeneratorService().generationRequest(request).generate();
655655
spec = FileUtils.readFileToString(new File(path + File.separator + "openapi.yaml"));
656656
Assert.assertTrue(spec.contains("#/components/schemas/inline_response_200"));
657-
Assert.assertTrue(spec.contains("#/components/schemas/body"));
657+
Assert.assertTrue(spec.contains("#/components/schemas/productflatten_body"));
658658

659659
path = getTmpFolder().getAbsolutePath();
660660
request = new GenerationRequest();

0 commit comments

Comments
 (0)