Skip to content

Commit 727c383

Browse files
frantumafrantuma
authored
Merge branch 'master' into default-interfaces
2 parents 477d4ff + 047b4ac commit 727c383

File tree

13 files changed

+71
-30
lines changed

13 files changed

+71
-30
lines changed

‎README.md

Lines changed: 2 additions & 2 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.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)
9+
- 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)
1010
[![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)
1111
[![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)
12-
- 3.0.14: [![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)
12+
- 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)
1313
[![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)
1414
[![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)
1515

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

‎modules/swagger-generator/pom.xml

Lines changed: 42 additions & 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.10</version>
7+
<version>2.4.11-SNAPSHOT</version>
88
<relativePath>../..</relativePath>
99
</parent>
1010
<artifactId>swagger-generator</artifactId>
@@ -37,6 +37,33 @@
3737
</execution>
3838
</executions>
3939
</plugin>
40+
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>
66+
4067
<plugin>
4168
<groupId>org.apache.maven.plugins</groupId>
4269
<artifactId>maven-war-plugin</artifactId>
@@ -74,6 +101,7 @@
74101
<artifactId>jetty-maven-plugin</artifactId>
75102
<version>${jetty-version}</version>
76103
<configuration>
104+
<classesDirectory>target/${project.artifactId}-${project.version}/WEB-INF/classes</classesDirectory>
77105
<webApp>
78106
<contextPath>/</contextPath>
79107
</webApp>
@@ -143,13 +171,25 @@
143171
<groupId>io.swagger</groupId>
144172
<artifactId>swagger-codegen</artifactId>
145173
<version>${project.parent.version}</version>
174+
<exclusions>
175+
<exclusion>
176+
<groupId>org.slf4j</groupId>
177+
<artifactId>slf4j-simple</artifactId>
178+
</exclusion>
179+
</exclusions>
146180
</dependency>
147181
<dependency>
148182
<groupId>io.swagger</groupId>
149183
<artifactId>swagger-codegen</artifactId>
150184
<version>${project.parent.version}</version>
151185
<type>test-jar</type>
152186
<scope>test</scope>
187+
<exclusions>
188+
<exclusion>
189+
<groupId>org.slf4j</groupId>
190+
<artifactId>slf4j-simple</artifactId>
191+
</exclusion>
192+
</exclusions>
153193
</dependency>
154194
<dependency>
155195
<groupId>ch.qos.logback</groupId>
@@ -166,6 +206,7 @@
166206
<groupId>javax.servlet</groupId>
167207
<artifactId>servlet-api</artifactId>
168208
<version>${servlet-api-version}</version>
209+
<scope>provided</scope>
169210
</dependency>
170211
<dependency>
171212
<groupId>org.glassfish.jersey.inject</groupId>

‎pom.xml

Lines changed: 3 additions & 3 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.10</version>
12+
<version>2.4.11-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>
@@ -938,10 +938,10 @@
938938
</repository>
939939
</repositories>
940940
<properties>
941-
<swagger-parser-version>1.0.48</swagger-parser-version>
941+
<swagger-parser-version>1.0.49-SNAPSHOT</swagger-parser-version>
942942
<scala-version>2.11.1</scala-version>
943943
<felix-version>3.3.0</felix-version>
944-
<swagger-core-version>1.6.0</swagger-core-version>
944+
<swagger-core-version>1.6.1-SNAPSHOT</swagger-core-version>
945945
<commons-io-version>2.4</commons-io-version>
946946
<commons-cli-version>1.2</commons-cli-version>
947947
<junit-version>4.8.1</junit-version>

‎pom.xml.bash

Lines changed: 3 additions & 3 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.10</version>
12+
<version>2.4.11-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>
@@ -914,10 +914,10 @@
914914
</repository>
915915
</repositories>
916916
<properties>
917-
<swagger-parser-version>1.0.48</swagger-parser-version>
917+
<swagger-parser-version>1.0.49-SNAPSHOT</swagger-parser-version>
918918
<scala-version>2.11.1</scala-version>
919919
<felix-version>3.3.0</felix-version>
920-
<swagger-core-version>1.6.0</swagger-core-version>
920+
<swagger-core-version>1.6.1-SNAPSHOT</swagger-core-version>
921921
<commons-io-version>2.4</commons-io-version>
922922
<commons-cli-version>1.2</commons-cli-version>
923923
<junit-version>4.8.1</junit-version>

‎pom.xml.circleci

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<artifactId>swagger-codegen-project</artifactId>
1111
<packaging>pom</packaging>
1212
<name>swagger-codegen-project</name>
13-
<version>2.4.10</version>
13+
<version>2.4.11-SNAPSHOT</version>
1414
<url>https://github.com/swagger-api/swagger-codegen</url>
1515
<scm>
1616
<connection>scm:git:[email protected]:swagger-api/swagger-codegen.git</connection>
@@ -962,10 +962,10 @@
962962
</repository>
963963
</repositories>
964964
<properties>
965-
<swagger-parser-version>1.0.48</swagger-parser-version>
965+
<swagger-parser-version>1.0.49-SNAPSHOT</swagger-parser-version>
966966
<scala-version>2.11.1</scala-version>
967967
<felix-version>3.3.0</felix-version>
968-
<swagger-core-version>1.6.0</swagger-core-version>
968+
<swagger-core-version>1.6.1-SNAPSHOT</swagger-core-version>
969969
<commons-io-version>2.4</commons-io-version>
970970
<commons-cli-version>1.2</commons-cli-version>
971971
<junit-version>4.8.1</junit-version>

‎pom.xml.circleci.java7

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<artifactId>swagger-codegen-project</artifactId>
1111
<packaging>pom</packaging>
1212
<name>swagger-codegen-project</name>
13-
<version>2.4.10</version>
13+
<version>2.4.11-SNAPSHOT</version>
1414
<url>https://github.com/swagger-api/swagger-codegen</url>
1515
<scm>
1616
<connection>scm:git:[email protected]:swagger-api/swagger-codegen.git</connection>
@@ -944,10 +944,10 @@
944944
</repository>
945945
</repositories>
946946
<properties>
947-
<swagger-parser-version>1.0.48</swagger-parser-version>
947+
<swagger-parser-version>1.0.49-SNAPSHOT</swagger-parser-version>
948948
<scala-version>2.11.1</scala-version>
949949
<felix-version>3.3.0</felix-version>
950-
<swagger-core-version>1.6.0</swagger-core-version>
950+
<swagger-core-version>1.6.1-SNAPSHOT</swagger-core-version>
951951
<commons-io-version>2.4</commons-io-version>
952952
<commons-cli-version>1.2</commons-cli-version>
953953
<junit-version>4.8.1</junit-version>

‎pom.xml.ios

Lines changed: 3 additions & 3 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.10</version>
12+
<version>2.4.11-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>
@@ -922,10 +922,10 @@
922922
</repository>
923923
</repositories>
924924
<properties>
925-
<swagger-parser-version>1.0.48</swagger-parser-version>
925+
<swagger-parser-version>1.0.49-SNAPSHOT</swagger-parser-version>
926926
<scala-version>2.11.1</scala-version>
927927
<felix-version>3.3.0</felix-version>
928-
<swagger-core-version>1.6.0</swagger-core-version>
928+
<swagger-core-version>1.6.1-SNAPSHOT</swagger-core-version>
929929
<commons-io-version>2.4</commons-io-version>
930930
<commons-cli-version>1.2</commons-cli-version>
931931
<junit-version>4.8.1</junit-version>

0 commit comments

Comments
 (0)