Merge pull request #1000 from swagger-api/logback

Author: frantuma

pom.xml

@@ -255,8 +255,8 @@
     </dependencies>
     <properties>
         <swagger-codegen-version>3.0.31-SNAPSHOT</swagger-codegen-version>
-        <swagger-parser-version>2.0.28</swagger-parser-version>
-        <swagger-core-version>2.1.11</swagger-core-version>
+        <swagger-parser-version>2.0.29</swagger-parser-version>
+        <swagger-core-version>2.1.12</swagger-core-version>
         <jackson-version>2.12.1</jackson-version>
         <scala-version>2.11.1</scala-version>
         <felix-version>3.3.0</felix-version>

src/main/resources/handlebars/JavaInflector/pom.mustache

@@ -124,7 +124,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven-plugin-version>1.0.0</maven-plugin-version>
         <jetty-version>9.4.9.v20180320</jetty-version>
-        <logback-version>1.0.1</logback-version>
+        <logback-version>1.2.9</logback-version>
         <junit-version>4.13.1</junit-version>
         <slf4j-version>1.6.3</slf4j-version>
         <swagger-inflector-version>2.0.0</swagger-inflector-version>

src/main/resources/handlebars/JavaJaxRS/cxf/pom.mustache

@@ -141,7 +141,7 @@
         <version>${cxf-version}</version>
         <scope>test</scope>
     </dependency>
-    
+
      <!-- CXF server -->
     <dependency>
         <groupId>org.apache.cxf</groupId>
@@ -187,7 +187,7 @@
         <version>${jackson-jaxrs-version}</version>
     </dependency>
 {{/java8}}
-{{#useBeanValidationFeature}}    
+{{#useBeanValidationFeature}}
     <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-validator</artifactId>
@@ -226,7 +226,7 @@
     {{/useOas2}}
     <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>
 {{#useBeanValidation}}
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>

src/main/resources/handlebars/JavaJaxRS/cxf/server/pom.mustache

@@ -88,7 +88,7 @@
           </execution>
         </executions>
       </plugin>
-      
+
       <!-- build WAR file -->
       <plugin>
         <artifactId>maven-war-plugin</artifactId>
@@ -150,7 +150,7 @@
         <version>${cxf-version}</version>
         <scope>test</scope>
     </dependency>
-    
+
      <!-- CXF server -->
     <dependency>
         <groupId>org.apache.cxf</groupId>
@@ -212,7 +212,7 @@
         <version>${jackson-jaxrs-version}</version>
     </dependency>
 {{/java8}}
-{{#generateSpringApplication}}    
+{{#generateSpringApplication}}
     <!-- Spring -->
     <dependency>
         <groupId>org.springframework</groupId>
@@ -223,7 +223,7 @@
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
         <version>${spring-version}</version>
-    </dependency>    
+    </dependency>
 {{/generateSpringApplication}}
 {{#generateSpringBootApplication}}
 <!-- Spring Boot dependencies für Integrationstests -->
@@ -240,7 +240,7 @@
             <version>${spring.boot-version}</version>
             <scope>test</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-spring-boot-starter-jaxrs</artifactId>
@@ -287,17 +287,17 @@
     {{/useOas2}}
     <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>
 {{#useBeanValidation}}
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>
 {{/useBeanValidation}}
-{{#generateSpringApplication}}    
+{{#generateSpringApplication}}
     <spring-version>4.3.13.RELEASE</spring-version>
-{{/generateSpringApplication}}    
+{{/generateSpringApplication}}
 {{#generateSpringBootApplication}}
     <spring.boot-version>1.5.9.RELEASE</spring.boot-version>
-{{/generateSpringBootApplication}}    
+{{/generateSpringBootApplication}}
     <cxf-version>3.2.4</cxf-version>
     <jackson-jaxrs-version>2.9.1</jackson-jaxrs-version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

src/main/resources/handlebars/JavaJaxRS/pom.mustache

@@ -13,7 +13,7 @@
       <distribution>repo</distribution>
     </license>
   </licenses>
-  
+
   <build>
     <sourceDirectory>src/main/java</sourceDirectory>
     <plugins>
@@ -201,7 +201,7 @@
       <version>${commons_io_version}</version>
     </dependency>
   {{/supportJava6}}
-  
+
 {{#useBeanValidation}}
     <!-- Bean Validation API support -->
     <dependency>
@@ -240,7 +240,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>
 {{#useBeanValidation}}
     <beanvalidation-version>1.1.0.Final</beanvalidation-version>

src/main/resources/handlebars/kotlin-server/libraries/ktor/build.gradle.mustache

@@ -66,6 +66,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'
 }