Skip to content

Commit 0646258

Browse files
frantumafrantuma
authored
Merge pull request #9877 from swagger-api/bump-snapshot
bump next snapshot 3.0.15-SNAPSHOT - fixes dependencies
2 parents 4c829a5 + 89e8425 commit 0646258

File tree

11 files changed

+105
-37
lines changed

11 files changed

+105
-37
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
- 3.0.15-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/s/https/jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-3.svg)](https://jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-3)
7-
- Master (2.4.10): [![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.11-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/s/https/jenkins.swagger.io/view/OSS%20-%20Java/job/oss-swagger-codegen-master.svg)](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

‎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.14</version>
6+
<version>3.0.15-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.14</version>
9+
<version>3.0.15-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.14</version>
6+
<version>3.0.15-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.10</swagger-codegen-v2-version>
203+
<swagger-codegen-v2-version>2.4.11-SNAPSHOT</swagger-codegen-v2-version>
204204
</properties>
205205
<dependencies>
206206
<dependency>

‎modules/swagger-generator/pom.xml‎

Lines changed: 69 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.swagger.codegen.v3</groupId>
66
<artifactId>swagger-codegen-project</artifactId>
7-
<version>3.0.14</version>
7+
<version>3.0.15-SNAPSHOT</version>
88
<relativePath>../..</relativePath>
99
</parent>
1010
<artifactId>swagger-generator</artifactId>
@@ -38,6 +38,31 @@
3838
</execution>
3939
</executions>
4040
</plugin>
41+
<!-- <plugin>
42+
<groupId>org.codehaus.mojo</groupId>
43+
<artifactId>properties-maven-plugin</artifactId>
44+
<version>1.0.0</version>
45+
<executions>
46+
<execution>
47+
<phase>pre-integration-test</phase>
48+
<goals>
49+
<goal>set-system-properties</goal>
50+
</goals>
51+
<configuration>
52+
<properties>
53+
<property>
54+
<name>org.eclipse.jetty.util.log.class</name>
55+
<value>org.eclipse.jetty.util.log.StdErrLog</value>
56+
</property>
57+
<property>
58+
<name>org.eclipse.jetty.annotations.AnnotationParser.LEVEL</name>
59+
<value>OFF</value>
60+
</property>
61+
</properties>
62+
</configuration>
63+
</execution>
64+
</executions>
65+
</plugin>-->
4166
<plugin>
4267
<groupId>org.apache.maven.plugins</groupId>
4368
<artifactId>maven-failsafe-plugin</artifactId>
@@ -293,15 +318,36 @@
293318
<groupId>javax.servlet</groupId>
294319
<artifactId>javax.servlet-api</artifactId>
295320
<version>${servlet-api.version}</version>
321+
<scope>provided</scope>
296322
</dependency>
297323
<dependency>
298324
<groupId>io.swagger.codegen.v3</groupId>
299325
<artifactId>swagger-codegen</artifactId>
300326
<version>${project.version}</version>
327+
<exclusions>
328+
<exclusion>
329+
<groupId>javax.activation</groupId>
330+
<artifactId>activation</artifactId>
331+
</exclusion>
332+
<exclusion>
333+
<groupId>javax.xml.bind</groupId>
334+
<artifactId>jaxb-api</artifactId>
335+
</exclusion>
336+
</exclusions>
301337
</dependency>
302338
<dependency>
303339
<groupId>io.swagger.codegen.v3</groupId>
304340
<artifactId>swagger-codegen-generators</artifactId>
341+
<exclusions>
342+
<exclusion>
343+
<groupId>javax.activation</groupId>
344+
<artifactId>activation</artifactId>
345+
</exclusion>
346+
<exclusion>
347+
<groupId>javax.xml.bind</groupId>
348+
<artifactId>jaxb-api</artifactId>
349+
</exclusion>
350+
</exclusions>
305351
</dependency>
306352
<dependency>
307353
<groupId>io.swagger</groupId>
@@ -312,12 +358,34 @@
312358
<groupId>org.codehaus.woodstox</groupId>
313359
<artifactId>woodstox-core-asl</artifactId>
314360
</exclusion>
361+
<exclusion>
362+
<groupId>javax.activation</groupId>
363+
<artifactId>activation</artifactId>
364+
</exclusion>
365+
<exclusion>
366+
<groupId>javax.xml.bind</groupId>
367+
<artifactId>jaxb-api</artifactId>
368+
</exclusion>
369+
<exclusion>
370+
<groupId>javax.inject</groupId>
371+
<artifactId>javax.inject</artifactId>
372+
</exclusion>
315373
</exclusions>
316374
</dependency>
317375
<dependency>
318376
<groupId>org.testng</groupId>
319377
<artifactId>testng</artifactId>
320378
<scope>test</scope>
379+
<exclusions>
380+
<exclusion>
381+
<groupId>javax.inject</groupId>
382+
<artifactId>javax.inject</artifactId>
383+
</exclusion>
384+
<exclusion>
385+
<groupId>aopalliance</groupId>
386+
<artifactId>aopalliance</artifactId>
387+
</exclusion>
388+
</exclusions>
321389
</dependency>
322390
</dependencies>
323391
<properties>

‎modules/swagger-generator/src/main/resources/openapi.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ servers:
44
info:
55
description: 'This is an online swagger codegen server. You can find out more at
66
https://github.com/swagger-api/swagger-codegen or on [irc.freenode.net, #swagger](http://swagger.io/irc/).'
7-
version: 3.0.14
7+
version: 3.0.15-SNAPSHOT
88
title: Swagger Generator
99
license:
1010
name: Apache 2.0

‎pom.docker.xml‎

Lines changed: 7 additions & 7 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>3.0.14</version>
12+
<version>3.0.15-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>
@@ -1070,11 +1070,11 @@
10701070
</repository>
10711071
</repositories>
10721072
<properties>
1073-
<swagger-codegen-generators-version>1.0.14</swagger-codegen-generators-version>
1074-
<swagger-core-version>2.1.0</swagger-core-version>
1075-
<swagger-core-version-v1>1.6.0</swagger-core-version-v1>
1076-
<swagger-parser-version>2.0.16</swagger-parser-version>
1077-
<swagger-parser-version-v1>1.0.48</swagger-parser-version-v1>
1073+
<swagger-codegen-generators-version>1.0.15-SNAPSHOT</swagger-codegen-generators-version>
1074+
<swagger-core-version>2.1.1-SNAPSHOT</swagger-core-version>
1075+
<swagger-core-version-v1>1.6.1-SNAPSHOT</swagger-core-version-v1>
1076+
<swagger-parser-version>2.0.17-SNAPSHOT</swagger-parser-version>
1077+
<swagger-parser-version-v1>1.0.49-SNAPSHOT</swagger-parser-version-v1>
10781078
<jackson-version>2.10.1</jackson-version>
10791079
<scala-version>2.11.1</scala-version>
10801080
<felix-version>3.3.0</felix-version>
@@ -1092,7 +1092,7 @@
10921092
<jmockit-version>1.25</jmockit-version>
10931093
<reflections-version>0.9.11</reflections-version>
10941094
<jmockit-version>1.42</jmockit-version>
1095-
<snakeyaml-version>1.23</snakeyaml-version>
1095+
<snakeyaml-version>1.24</snakeyaml-version>
10961096
<handlebars-version>4.1.2</handlebars-version>
10971097
</properties>
10981098
</project>

‎pom.xml‎

Lines changed: 7 additions & 7 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>3.0.14</version>
12+
<version>3.0.15-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>
@@ -1161,11 +1161,11 @@
11611161
</repository>
11621162
</repositories>
11631163
<properties>
1164-
<swagger-codegen-generators-version>1.0.14</swagger-codegen-generators-version>
1165-
<swagger-core-version>2.1.0</swagger-core-version>
1166-
<swagger-core-version-v1>1.6.0</swagger-core-version-v1>
1167-
<swagger-parser-version>2.0.16</swagger-parser-version>
1168-
<swagger-parser-version-v1>1.0.48</swagger-parser-version-v1>
1164+
<swagger-codegen-generators-version>1.0.15-SNAPSHOT</swagger-codegen-generators-version>
1165+
<swagger-core-version>2.1.1-SNAPSHOT</swagger-core-version>
1166+
<swagger-core-version-v1>1.6.1-SNAPSHOT</swagger-core-version-v1>
1167+
<swagger-parser-version>2.0.17-SNAPSHOT</swagger-parser-version>
1168+
<swagger-parser-version-v1>1.0.49-SNAPSHOT</swagger-parser-version-v1>
11691169
<jackson-version>2.10.1</jackson-version>
11701170
<scala-version>2.11.1</scala-version>
11711171
<felix-version>3.3.0</felix-version>
@@ -1183,7 +1183,7 @@
11831183
<jmockit-version>1.25</jmockit-version>
11841184
<reflections-version>0.9.11</reflections-version>
11851185
<jmockit-version>1.42</jmockit-version>
1186-
<snakeyaml-version>1.23</snakeyaml-version>
1186+
<snakeyaml-version>1.24</snakeyaml-version>
11871187
<handlebars-version>4.1.2</handlebars-version>
11881188
</properties>
11891189
</project>

‎pom.xml.bash‎

Lines changed: 7 additions & 7 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>3.0.14</version>
12+
<version>3.0.15-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>
@@ -1058,11 +1058,11 @@
10581058
</repository>
10591059
</repositories>
10601060
<properties>
1061-
<swagger-codegen-generators-version>1.0.14</swagger-codegen-generators-version>
1062-
<swagger-core-version>2.1.0</swagger-core-version>
1063-
<swagger-core-version-v1>1.6.0</swagger-core-version-v1>
1064-
<swagger-parser-version>2.0.16</swagger-parser-version>
1065-
<swagger-parser-version-v1>1.0.48</swagger-parser-version-v1>
1061+
<swagger-codegen-generators-version>1.0.15-SNAPSHOT</swagger-codegen-generators-version>
1062+
<swagger-core-version>2.1.1-SNAPSHOT</swagger-core-version>
1063+
<swagger-core-version-v1>1.6.1-SNAPSHOT</swagger-core-version-v1>
1064+
<swagger-parser-version>2.0.17-SNAPSHOT</swagger-parser-version>
1065+
<swagger-parser-version-v1>1.0.49-SNAPSHOT</swagger-parser-version-v1>
10661066
<jackson-version>2.10.1</jackson-version>
10671067
<scala-version>2.11.1</scala-version>
10681068
<felix-version>3.3.0</felix-version>
@@ -1080,7 +1080,7 @@
10801080
<jmockit-version>1.25</jmockit-version>
10811081
<reflections-version>0.9.11</reflections-version>
10821082
<jmockit-version>1.42</jmockit-version>
1083-
<snakeyaml-version>1.23</snakeyaml-version>
1083+
<snakeyaml-version>1.24</snakeyaml-version>
10841084
<handlebars-version>4.1.2</handlebars-version>
10851085
</properties>
10861086
</project>

‎pom.xml.shippable‎

Lines changed: 7 additions & 7 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>3.0.14</version>
12+
<version>3.0.15-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>
@@ -1060,11 +1060,11 @@
10601060
</repository>
10611061
</repositories>
10621062
<properties>
1063-
<swagger-codegen-generators-version>1.0.14</swagger-codegen-generators-version>
1064-
<swagger-core-version>2.1.0</swagger-core-version>
1065-
<swagger-core-version-v1>1.6.0</swagger-core-version-v1>
1066-
<swagger-parser-version>2.0.16</swagger-parser-version>
1067-
<swagger-parser-version-v1>1.0.48</swagger-parser-version-v1>
1063+
<swagger-codegen-generators-version>1.0.15-SNAPSHOT</swagger-codegen-generators-version>
1064+
<swagger-core-version>2.1.1-SNAPSHOT</swagger-core-version>
1065+
<swagger-core-version-v1>1.6.1-SNAPSHOT</swagger-core-version-v1>
1066+
<swagger-parser-version>2.0.17-SNAPSHOT</swagger-parser-version>
1067+
<swagger-parser-version-v1>1.0.49-SNAPSHOT</swagger-parser-version-v1>
10681068
<jackson-version>2.10.1</jackson-version>
10691069
<scala-version>2.11.1</scala-version>
10701070
<felix-version>3.3.0</felix-version>
@@ -1082,7 +1082,7 @@
10821082
<jmockit-version>1.25</jmockit-version>
10831083
<reflections-version>0.9.11</reflections-version>
10841084
<jmockit-version>1.42</jmockit-version>
1085-
<snakeyaml-version>1.23</snakeyaml-version>
1085+
<snakeyaml-version>1.24</snakeyaml-version>
10861086
<handlebars-version>4.1.2</handlebars-version>
10871087
</properties>
10881088
</project>

0 commit comments

Comments
 (0)