Merge pull request #11312 from swagger-api/logback

frantuma · web-flow · commit 1c5b1ab00e05 · 2021-12-23T22:06:03.000+01:00
diff --git a/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaInflector/pom.mustache
@@ -145,7 +145,7 @@
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <swagger-inflector-version>1.0.14</swagger-inflector-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
-        <logback-version>1.0.1</logback-version>
+        <logback-version>1.2.9</logback-version>
         <junit-version>4.8.2</junit-version>
         <slf4j-version>1.6.3</slf4j-version>
     </properties>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/pom.mustache
@@ -192,7 +192,7 @@
     <swagger-core-version>1.5.24</swagger-core-version>
     <jetty-version>9.3.27.v20190418</jetty-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.9</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
 {{#useBeanValidation}}
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/cxf/server/pom.mustache
@@ -243,7 +243,7 @@
     <swagger-core-version>1.5.24</swagger-core-version>
     <jetty-version>9.3.27.v20190418</jetty-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.9</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
 {{#useBeanValidation}}
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache
@@ -205,7 +205,7 @@
     <commons_lang3_version>3.5</commons_lang3_version>
   {{/supportJava6}}
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.9</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
diff --git a/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache b/modules/swagger-codegen/src/main/resources/MSF4J/pom.mustache
@@ -79,7 +79,7 @@
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.22.2</jersey2-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.9</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <jersey2-version>2.22.2</jersey2-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/modules/swagger-codegen/src/main/resources/java-pkmst/pom.mustache b/modules/swagger-codegen/src/main/resources/java-pkmst/pom.mustache
@@ -19,8 +19,8 @@
       <springfox-swagger-ui>2.6.0</springfox-swagger-ui>
       <slf4j-api>1.7.25</slf4j-api>
       <logstash-logback-encoder>4.11</logstash-logback-encoder>
-      <logback-core>1.2.3</logback-core>
-      <logback-classic>1.2.3</logback-classic>
+      <logback-core>1.2.9</logback-core>
+      <logback-classic>1.2.9</logback-classic>
       <gatling.version>2.3.0</gatling.version>
       <gatling-plugin.version>2.2.4</gatling-plugin.version>
       <scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
@@ -299,7 +299,7 @@
                      </excludes>
                   </configuration>
                </plugin>
-               
+
                <plugin>
                   <groupId>net.alchim31.maven</groupId>
                   <artifactId>scala-maven-plugin</artifactId>
@@ -315,7 +315,7 @@
 							<runMultipleSimulations>true</runMultipleSimulations>
 							<includes>
 								<simulationClass>testapi</simulationClass>
-								
+
 							</includes>
 						</configuration>
 						<executions>
diff --git a/modules/swagger-codegen/src/main/resources/kotlin-server/libraries/ktor/build.gradle.mustache b/modules/swagger-codegen/src/main/resources/kotlin-server/libraries/ktor/build.gradle.mustache
@@ -69,6 +69,6 @@ dependencies {
     compile "io.ktor:ktor-gson:$ktor_version"
     compile "io.ktor:ktor-client-core:$ktor_version"
     compile "io.ktor:ktor-client-apache:$ktor_version"
-    compile "ch.qos.logback:logback-classic:1.2.1"
+    compile "ch.qos.logback:logback-classic:1.2.9"
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
diff --git a/modules/swagger-codegen/src/main/resources/scalatra/build.sbt b/modules/swagger-codegen/src/main/resources/scalatra/build.sbt
@@ -15,7 +15,7 @@ libraryDependencies ++= Seq(
   "org.eclipse.jetty" %  "jetty-server"         % "9.4.8.v20171121",
   "org.eclipse.jetty" %  "jetty-webapp"         % "9.4.8.v20171121",
   "javax.servlet"     %  "javax.servlet-api"    % "3.1.0",
-  "ch.qos.logback"    %  "logback-classic"      % "1.2.3" % Provided
+  "ch.qos.logback"    %  "logback-classic"      % "1.2.9" % Provided
 )
 
-enablePlugins(JettyPlugin)
+enablePlugins(JettyPlugin)
diff --git a/modules/swagger-codegen/src/main/resources/undertow/pom.mustache b/modules/swagger-codegen/src/main/resources/undertow/pom.mustache
@@ -25,7 +25,7 @@
         <version.commons.codec>1.10</version.commons.codec>
         <version.encoder>1.2</version.encoder>
         <version.metrics>3.1.2</version.metrics>
-        <version.logback>1.1.7</version.logback>
+        <version.logback>1.2.9</version.logback>
         <version.junit>4.12</version.junit>
         <version.mockito>2.1.0-beta.124</version.mockito>
         <version.undertow>1.4.0.Final</version.undertow>
diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml
@@ -316,7 +316,7 @@
     </dependencies>
     <properties>
         <servlet-api-version>2.5</servlet-api-version>
-        <logback-version>1.0.1</logback-version>
+        <logback-version>1.2.9</logback-version>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <servlet-api-version>2.5</servlet-api-version>
         <zip-version>1.3.2</zip-version>
diff --git a/pom.xml b/pom.xml
@@ -933,7 +933,7 @@
         <swagger-parser-version>1.0.56</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>1.6.3</swagger-core-version>
+        <swagger-core-version>1.6.4</swagger-core-version>
         <commons-io-version>2.11.0</commons-io-version>
         <commons-cli-version>1.2</commons-cli-version>
         <junit-version>4.13.1</junit-version>
diff --git a/pom.xml.jenkins b/pom.xml.jenkins
@@ -995,7 +995,7 @@
         <swagger-parser-version>1.0.56</swagger-parser-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>
-        <swagger-core-version>1.6.3</swagger-core-version>
+        <swagger-core-version>1.6.4</swagger-core-version>
         <commons-io-version>2.11.0</commons-io-version>
         <commons-cli-version>1.2</commons-cli-version>
         <junit-version>4.13.1</junit-version>
diff --git a/samples/client/petstore/async-scala/build.sbt b/samples/client/petstore/async-scala/build.sbt
@@ -6,7 +6,7 @@ libraryDependencies ++= Seq(
   "com.wordnik.swagger" %% "swagger-async-httpclient" % "0.3.5",
   "joda-time" % "joda-time" % "2.3",
   "org.joda" % "joda-convert" % "1.3.1",
-  "ch.qos.logback" % "logback-classic" % "1.0.13" % "provided",
+  "ch.qos.logback" % "logback-classic" % "1.2.9" % "provided",
   "org.scalatest" %% "scalatest" % "2.2.1" % "test",
   "junit" % "junit" % "4.11" % "test"
 )
diff --git a/samples/client/petstore/jaxrs-cxf-client/pom.xml b/samples/client/petstore/jaxrs-cxf-client/pom.xml
@@ -165,7 +165,7 @@
     <swagger-core-version>1.5.24</swagger-core-version>
     <jetty-version>9.3.27.v20190418</jetty-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.9</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <cxf-version>3.2.1</cxf-version>
     <jackson-jaxrs-version>2.11.4</jackson-jaxrs-version>
diff --git a/samples/client/petstore/jaxrs-cxf/pom.xml b/samples/client/petstore/jaxrs-cxf/pom.xml
@@ -110,7 +110,7 @@
         <version>${cxf-version}</version>
         <scope>test</scope>
     </dependency>
-    
+
      <!-- CXF server -->
     <dependency>
         <groupId>org.apache.cxf</groupId>
@@ -165,7 +165,7 @@
     <swagger-core-version>1.5.24</swagger-core-version>
     <jetty-version>9.2.9.v20150224</jetty-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.9</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <cxf-version>3.2.1</cxf-version>
     <jackson-jaxrs-version>2.9.1</jackson-jaxrs-version>
diff --git a/samples/server/petstore/java-inflector/pom.xml b/samples/server/petstore/java-inflector/pom.xml
@@ -21,7 +21,7 @@
         <distribution>repo</distribution>
       </license>
     </licenses>
-    
+
     <build>
         <defaultGoal>install</defaultGoal>
         <directory>target</directory>
@@ -121,7 +121,7 @@
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <swagger-inflector-version>1.0.14</swagger-inflector-version>
         <jetty-version>9.2.9.v20150224</jetty-version>
-        <logback-version>1.0.1</logback-version>
+        <logback-version>1.2.9</logback-version>
         <junit-version>4.8.2</junit-version>
         <slf4j-version>1.6.3</slf4j-version>
     </properties>
diff --git a/samples/server/petstore/java-msf4j/pom.xml b/samples/server/petstore/java-msf4j/pom.xml
@@ -79,7 +79,7 @@
     <jetty-version>9.2.9.v20150224</jetty-version>
     <jersey2-version>2.22.2</jersey2-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.9</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <jersey2-version>2.22.2</jersey2-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/samples/server/petstore/java-pkmst/pom.xml b/samples/server/petstore/java-pkmst/pom.xml
@@ -19,8 +19,8 @@
       <springfox-swagger-ui>2.6.0</springfox-swagger-ui>
       <slf4j-api>1.7.25</slf4j-api>
       <logstash-logback-encoder>4.11</logstash-logback-encoder>
-      <logback-core>1.2.3</logback-core>
-      <logback-classic>1.2.3</logback-classic>
+      <logback-core>1.2.9</logback-core>
+      <logback-classic>1.2.9</logback-classic>
       <gatling.version>2.3.0</gatling.version>
       <gatling-plugin.version>2.2.4</gatling-plugin.version>
       <scala-maven-plugin.version>3.2.2</scala-maven-plugin.version>
@@ -268,7 +268,7 @@
                      </excludes>
                   </configuration>
                </plugin>
-               
+
                <plugin>
                   <groupId>net.alchim31.maven</groupId>
                   <artifactId>scala-maven-plugin</artifactId>
@@ -284,7 +284,7 @@
 							<runMultipleSimulations>true</runMultipleSimulations>
 							<includes>
 								<simulationClass>testapi</simulationClass>
-								
+
 							</includes>
 						</configuration>
 						<executions>
diff --git a/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml b/samples/server/petstore/jaxrs-cxf-annotated-base-path/pom.xml
@@ -187,7 +187,7 @@
     <swagger-core-version>1.5.24</swagger-core-version>
     <jetty-version>9.3.27.v20190418</jetty-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.9</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
     <cxf-version>3.2.1</cxf-version>
diff --git a/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml b/samples/server/petstore/jaxrs-cxf-non-spring-app/pom.xml
@@ -187,7 +187,7 @@
     <swagger-core-version>1.5.24</swagger-core-version>
     <jetty-version>9.3.27.v20190418</jetty-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.9</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
     <cxf-version>3.2.1</cxf-version>
diff --git a/samples/server/petstore/jaxrs-cxf/pom.xml b/samples/server/petstore/jaxrs-cxf/pom.xml
@@ -189,7 +189,7 @@
     <swagger-core-version>1.5.24</swagger-core-version>
     <jetty-version>9.3.27.v20190418</jetty-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.9</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
     <cxf-version>3.2.1</cxf-version>
diff --git a/samples/server/petstore/jaxrs-datelib-j8/pom.xml b/samples/server/petstore/jaxrs-datelib-j8/pom.xml
@@ -13,7 +13,7 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
-  
+
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
@@ -150,7 +150,7 @@
       <version>2.2</version>
     </dependency>
 
-  
+
     <!-- Bean Validation API support -->
     <dependency>
         <groupId>javax.validation</groupId>
@@ -178,7 +178,7 @@
     <jersey2-version>2.22.2</jersey2-version>
     <jackson-version>2.8.9</jackson-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.9</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml b/samples/server/petstore/jaxrs/jersey2-useTags/pom.xml
@@ -177,7 +177,7 @@
     <jersey2-version>2.22.2</jersey2-version>
     <jackson-version>2.11.4</jackson-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.9</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
diff --git a/samples/server/petstore/jaxrs/jersey2/pom.xml b/samples/server/petstore/jaxrs/jersey2/pom.xml
@@ -177,7 +177,7 @@
     <jersey2-version>2.22.2</jersey2-version>
     <jackson-version>2.11.4</jackson-version>
     <junit-version>4.13.1</junit-version>
-    <logback-version>1.1.7</logback-version>
+    <logback-version>1.2.9</logback-version>
     <servlet-api-version>2.5</servlet-api-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
diff --git a/samples/server/petstore/kotlin-server/ktor/build.gradle b/samples/server/petstore/kotlin-server/ktor/build.gradle
@@ -69,6 +69,6 @@ dependencies {
     compile "io.ktor:ktor-gson:$ktor_version"
     compile "io.ktor:ktor-client-core:$ktor_version"
     compile "io.ktor:ktor-client-apache:$ktor_version"
-    compile "ch.qos.logback:logback-classic:1.2.1"
+    compile "ch.qos.logback:logback-classic:1.2.9"
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
diff --git a/samples/server/petstore/scalatra/build.sbt b/samples/server/petstore/scalatra/build.sbt
@@ -15,7 +15,7 @@ libraryDependencies ++= Seq(
   "org.eclipse.jetty" %  "jetty-server"         % "9.4.8.v20171121",
   "org.eclipse.jetty" %  "jetty-webapp"         % "9.4.8.v20171121",
   "javax.servlet"     %  "javax.servlet-api"    % "3.1.0",
-  "ch.qos.logback"    %  "logback-classic"      % "1.2.3" % Provided
+  "ch.qos.logback"    %  "logback-classic"      % "1.2.9" % Provided
 )
 
-enablePlugins(JettyPlugin)
+enablePlugins(JettyPlugin)
diff --git a/samples/server/petstore/undertow/dependency-reduced-pom.xml b/samples/server/petstore/undertow/dependency-reduced-pom.xml
@@ -106,7 +106,7 @@
     <version.mockito>2.1.0-beta.124</version.mockito>
     <version.slf4j>1.7.21</version.slf4j>
     <version.commons.io>2.5</version.commons.io>
-    <version.logback>1.1.7</version.logback>
+    <version.logback>1.2.9</version.logback>
     <version.junit>4.12</version.junit>
     <version.antlr4>4.5.3</version.antlr4>
   </properties>
diff --git a/samples/server/petstore/undertow/pom.xml b/samples/server/petstore/undertow/pom.xml
@@ -25,7 +25,7 @@
         <version.commons.codec>1.10</version.commons.codec>
         <version.encoder>1.2</version.encoder>
         <version.metrics>3.1.2</version.metrics>
-        <version.logback>1.1.7</version.logback>
+        <version.logback>1.2.9</version.logback>
         <version.junit>4.12</version.junit>
         <version.mockito>2.1.0-beta.124</version.mockito>
         <version.undertow>1.4.0.Final</version.undertow>

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,6 @@ dependencies {`
`69`	`69`	`compile "io.ktor:ktor-gson:$ktor_version"`
`70`	`70`	`compile "io.ktor:ktor-client-core:$ktor_version"`
`71`	`71`	`compile "io.ktor:ktor-client-apache:$ktor_version"`
`72`		`- compile "ch.qos.logback:logback-classic:1.2.1"`
	`72`	`+ compile "ch.qos.logback:logback-classic:1.2.9"`
`73`	`73`	`testCompile group: 'junit', name: 'junit', version: '4.12'`
`74`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ libraryDependencies ++= Seq(`
`15`	`15`	`"org.eclipse.jetty" % "jetty-server" % "9.4.8.v20171121",`
`16`	`16`	`"org.eclipse.jetty" % "jetty-webapp" % "9.4.8.v20171121",`
`17`	`17`	`"javax.servlet" % "javax.servlet-api" % "3.1.0",`
`18`		`- "ch.qos.logback" % "logback-classic" % "1.2.3" % Provided`
	`18`	`+ "ch.qos.logback" % "logback-classic" % "1.2.9" % Provided`
`19`	`19`	`)`
`20`	`20`
`21`		`-enablePlugins(JettyPlugin)`
	`21`	`+enablePlugins(JettyPlugin)`