Skip to content

Commit 39398d7

Browse files
authored
Merge pull request #11313 from swagger-api/logback-3.0
2 parents bf214b7 + 6425f26 commit 39398d7

File tree

17 files changed

+46
-46
lines changed

17 files changed

+46
-46
lines changed

pom.docker.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,9 +1064,9 @@
10641064
</repositories>
10651065
<properties>
10661066
<swagger-codegen-generators-version>1.0.31-SNAPSHOT</swagger-codegen-generators-version>
1067-
<swagger-core-version>2.1.11</swagger-core-version>
1068-
<swagger-core-version-v1>1.6.3</swagger-core-version-v1>
1069-
<swagger-parser-version>2.0.28</swagger-parser-version>
1067+
<swagger-core-version>2.1.12</swagger-core-version>
1068+
<swagger-core-version-v1>1.6.4</swagger-core-version-v1>
1069+
<swagger-parser-version>2.0.29</swagger-parser-version>
10701070
<swagger-parser-version-v1>1.0.56</swagger-parser-version-v1>
10711071
<jackson-version>2.12.1</jackson-version>
10721072
<scala-version>2.11.1</scala-version>
@@ -1077,7 +1077,7 @@
10771077
<maven-plugin-version>1.0.0</maven-plugin-version>
10781078
<commons-lang-version>3.4</commons-lang-version>
10791079
<slf4j-version>1.7.32</slf4j-version>
1080-
<logback-version>1.2.3</logback-version>
1080+
<logback-version>1.2.9</logback-version>
10811081
<scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
10821082
<jmustache-version>1.12</jmustache-version>
10831083
<testng-version>6.9.6</testng-version>

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1157,9 +1157,9 @@
11571157
</repositories>
11581158
<properties>
11591159
<swagger-codegen-generators-version>1.0.31-SNAPSHOT</swagger-codegen-generators-version>
1160-
<swagger-core-version>2.1.11</swagger-core-version>
1161-
<swagger-core-version-v1>1.6.3</swagger-core-version-v1>
1162-
<swagger-parser-version>2.0.28</swagger-parser-version>
1160+
<swagger-core-version>2.1.12</swagger-core-version>
1161+
<swagger-core-version-v1>1.6.4</swagger-core-version-v1>
1162+
<swagger-parser-version>2.0.29</swagger-parser-version>
11631163
<swagger-parser-version-v1>1.0.56</swagger-parser-version-v1>
11641164
<jackson-version>2.12.1</jackson-version>
11651165
<scala-version>2.11.1</scala-version>
@@ -1170,7 +1170,7 @@
11701170
<maven-plugin-version>1.0.0</maven-plugin-version>
11711171
<commons-lang-version>3.4</commons-lang-version>
11721172
<slf4j-version>1.7.32</slf4j-version>
1173-
<logback-version>1.2.3</logback-version>
1173+
<logback-version>1.2.9</logback-version>
11741174
<scala-maven-plugin-version>3.2.1</scala-maven-plugin-version>
11751175
<jmustache-version>1.12</jmustache-version>
11761176
<testng-version>6.9.6</testng-version>

samples/client/petstore/jaxrs-cxf-client/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<version>${cxf-version}</version>
112112
<scope>test</scope>
113113
</dependency>
114-
114+
115115
<!-- CXF server -->
116116
<dependency>
117117
<groupId>org.apache.cxf</groupId>
@@ -175,7 +175,7 @@
175175
<swagger-core-version>2.0.0</swagger-core-version>
176176
<jetty-version>9.2.9.v20150224</jetty-version>
177177
<junit-version>4.13.1</junit-version>
178-
<logback-version>1.1.7</logback-version>
178+
<logback-version>1.2.9</logback-version>
179179
<servlet-api-version>2.5</servlet-api-version>
180180
<cxf-version>3.2.4</cxf-version>
181181
<jackson-jaxrs-version>2.9.1</jackson-jaxrs-version>

samples/client/petstore/jaxrs-cxf/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
<version>${cxf-version}</version>
111111
<scope>test</scope>
112112
</dependency>
113-
113+
114114
<!-- CXF server -->
115115
<dependency>
116116
<groupId>org.apache.cxf</groupId>
@@ -165,7 +165,7 @@
165165
<swagger-core-version>1.5.15</swagger-core-version>
166166
<jetty-version>9.2.9.v20150224</jetty-version>
167167
<junit-version>4.13.1</junit-version>
168-
<logback-version>1.1.7</logback-version>
168+
<logback-version>1.2.9</logback-version>
169169
<servlet-api-version>2.5</servlet-api-version>
170170
<cxf-version>3.1.11</cxf-version>
171171
<jackson-jaxrs-version>2.8.9</jackson-jaxrs-version>

samples/composed/client/petstore/jaxrs-cxf-client/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<version>${cxf-version}</version>
112112
<scope>test</scope>
113113
</dependency>
114-
114+
115115
<!-- CXF server -->
116116
<dependency>
117117
<groupId>org.apache.cxf</groupId>
@@ -175,7 +175,7 @@
175175
<swagger-core-version>2.0.0</swagger-core-version>
176176
<jetty-version>9.2.9.v20150224</jetty-version>
177177
<junit-version>4.13.1</junit-version>
178-
<logback-version>1.1.7</logback-version>
178+
<logback-version>1.2.9</logback-version>
179179
<servlet-api-version>2.5</servlet-api-version>
180180
<cxf-version>3.2.4</cxf-version>
181181
<jackson-jaxrs-version>2.9.1</jackson-jaxrs-version>

samples/composed/server/petstore/java-inflector/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
121121
<maven-plugin-version>1.0.0</maven-plugin-version>
122122
<jetty-version>9.4.9.v20180320</jetty-version>
123-
<logback-version>1.0.1</logback-version>
123+
<logback-version>1.2.9</logback-version>
124124
<junit-version>4.8.2</junit-version>
125125
<slf4j-version>1.6.3</slf4j-version>
126126
<swagger-inflector-version>2.0.0</swagger-inflector-version>

samples/composed/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</execution>
8585
</executions>
8686
</plugin>
87-
87+
8888
<!-- build WAR file -->
8989
<plugin>
9090
<artifactId>maven-war-plugin</artifactId>
@@ -134,7 +134,7 @@
134134
<version>${cxf-version}</version>
135135
<scope>test</scope>
136136
</dependency>
137-
137+
138138
<!-- CXF server -->
139139
<dependency>
140140
<groupId>org.apache.cxf</groupId>
@@ -204,7 +204,7 @@
204204
<swagger-core-version>2.0.0</swagger-core-version>
205205
<jetty-version>9.2.9.v20150224</jetty-version>
206206
<junit-version>4.13.1</junit-version>
207-
<logback-version>1.1.7</logback-version>
207+
<logback-version>1.2.9</logback-version>
208208
<servlet-api-version>2.5</servlet-api-version>
209209
<beanvalidation-version>1.1.0.Final</beanvalidation-version>
210210
<cxf-version>3.2.4</cxf-version>

samples/composed/server/petstore/jaxrs-cxf-non-spring-app/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</execution>
8585
</executions>
8686
</plugin>
87-
87+
8888
<!-- build WAR file -->
8989
<plugin>
9090
<artifactId>maven-war-plugin</artifactId>
@@ -134,7 +134,7 @@
134134
<version>${cxf-version}</version>
135135
<scope>test</scope>
136136
</dependency>
137-
137+
138138
<!-- CXF server -->
139139
<dependency>
140140
<groupId>org.apache.cxf</groupId>
@@ -204,7 +204,7 @@
204204
<swagger-core-version>2.0.0</swagger-core-version>
205205
<jetty-version>9.2.9.v20150224</jetty-version>
206206
<junit-version>4.13.1</junit-version>
207-
<logback-version>1.1.7</logback-version>
207+
<logback-version>1.2.9</logback-version>
208208
<servlet-api-version>2.5</servlet-api-version>
209209
<beanvalidation-version>1.1.0.Final</beanvalidation-version>
210210
<cxf-version>3.2.4</cxf-version>

samples/composed/server/petstore/jaxrs-cxf/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</execution>
8585
</executions>
8686
</plugin>
87-
87+
8888
<!-- build WAR file -->
8989
<plugin>
9090
<artifactId>maven-war-plugin</artifactId>
@@ -134,7 +134,7 @@
134134
<version>${cxf-version}</version>
135135
<scope>test</scope>
136136
</dependency>
137-
137+
138138
<!-- CXF server -->
139139
<dependency>
140140
<groupId>org.apache.cxf</groupId>
@@ -204,7 +204,7 @@
204204
<swagger-core-version>2.0.0</swagger-core-version>
205205
<jetty-version>9.2.9.v20150224</jetty-version>
206206
<junit-version>4.13.1</junit-version>
207-
<logback-version>1.1.7</logback-version>
207+
<logback-version>1.2.9</logback-version>
208208
<servlet-api-version>2.5</servlet-api-version>
209209
<beanvalidation-version>1.1.0.Final</beanvalidation-version>
210210
<cxf-version>3.2.4</cxf-version>

samples/composed/server/petstore/jaxrs/jersey2-useTags/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<distribution>repo</distribution>
1414
</license>
1515
</licenses>
16-
16+
1717
<build>
1818
<sourceDirectory>src/main/java</sourceDirectory>
1919
<plugins>
@@ -167,7 +167,7 @@
167167
<version>2.2</version>
168168
</dependency>
169169

170-
170+
171171
<!-- Bean Validation API support -->
172172
<dependency>
173173
<groupId>javax.validation</groupId>
@@ -195,7 +195,7 @@
195195
<jersey2-version>2.27</jersey2-version>
196196
<jackson-version>2.9.5</jackson-version>
197197
<junit-version>4.13.1</junit-version>
198-
<logback-version>1.1.7</logback-version>
198+
<logback-version>1.2.9</logback-version>
199199
<servlet-api-version>2.5</servlet-api-version>
200200
<beanvalidation-version>1.1.0.Final</beanvalidation-version>
201201
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

0 commit comments

Comments
 (0)