Merge pull request #9243 from swagger-api/update-snakeyaml-version-ma…

…ster update snakeyaml version
swagger-api · Mar 6, 2019 · cae64d0 · cae64d0
2 parents 5358d44 + cf05d46
commit cae64d0
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 0 deletions.
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/SwaggerYamlGenerator.java
@@ -79,6 +79,7 @@ public void processSwagger(Swagger swagger) {
         try {
             final ObjectMapper mapper = new ObjectMapper(new YAMLFactory()
                     .configure(YAMLGenerator.Feature.MINIMIZE_QUOTES, true)
+                    .configure(YAMLGenerator.Feature.SPLIT_LINES, false)
                     .configure(YAMLGenerator.Feature.ALWAYS_QUOTE_NUMBERS_AS_STRINGS, true));
             configureMapper(mapper);
             String swaggerString = mapper.writeValueAsString(swagger);

diff --git a/pom.xml b/pom.xml
@@ -903,6 +903,11 @@
     </reporting>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml-version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -950,5 +955,6 @@
         <surefire-version>2.19.1</surefire-version>
         <jmockit-version>1.25</jmockit-version>
         <reflections-version>0.9.11</reflections-version>
+        <snakeyaml-version>1.23</snakeyaml-version>
     </properties>
 </project>
diff --git a/pom.xml.bash b/pom.xml.bash
@@ -879,6 +879,11 @@
     </reporting>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml-version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -926,5 +931,6 @@
         <surefire-version>2.19.1</surefire-version>
         <jmockit-version>1.25</jmockit-version>
         <reflections-version>0.9.11</reflections-version>
+        <snakeyaml-version>1.23</snakeyaml-version>
     </properties>
 </project>
diff --git a/pom.xml.circleci b/pom.xml.circleci
@@ -927,6 +927,11 @@
     </reporting>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml-version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -974,5 +979,6 @@
         <surefire-version>2.19.1</surefire-version>
         <jmockit-version>1.25</jmockit-version>
         <reflections-version>0.9.11</reflections-version>
+        <snakeyaml-version>1.23</snakeyaml-version>
     </properties>
 </project>
diff --git a/pom.xml.circleci.java7 b/pom.xml.circleci.java7
@@ -909,6 +909,11 @@
     </reporting>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml-version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -956,5 +961,6 @@
         <surefire-version>2.19.1</surefire-version>
         <jmockit-version>1.25</jmockit-version>
         <reflections-version>0.9.11</reflections-version>
+        <snakeyaml-version>1.23</snakeyaml-version>
     </properties>
 </project>
diff --git a/pom.xml.ios b/pom.xml.ios
@@ -887,6 +887,11 @@
     </reporting>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml-version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -934,5 +939,6 @@
         <surefire-version>2.19.1</surefire-version>
         <jmockit-version>1.25</jmockit-version>
         <reflections-version>0.9.11</reflections-version>
+        <snakeyaml-version>1.23</snakeyaml-version>
     </properties>
 </project>
diff --git a/pom.xml.jenkins b/pom.xml.jenkins
@@ -969,6 +969,11 @@
     </reporting>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml-version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -1016,5 +1021,6 @@
         <surefire-version>2.19.1</surefire-version>
         <jmockit-version>1.25</jmockit-version>
         <reflections-version>0.9.11</reflections-version>
+        <snakeyaml-version>1.23</snakeyaml-version>
     </properties>
 </project>
diff --git a/pom.xml.jenkins.java7 b/pom.xml.jenkins.java7
@@ -891,6 +891,11 @@
     </reporting>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml-version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -938,5 +943,6 @@
         <surefire-version>2.19.1</surefire-version>
         <jmockit-version>1.25</jmockit-version>
         <reflections-version>0.9.11</reflections-version>
+        <snakeyaml-version>1.23</snakeyaml-version>
     </properties>
 </project>
diff --git a/pom.xml.travis b/pom.xml.travis
@@ -903,6 +903,11 @@
     </reporting>
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>org.yaml</groupId>
+                <artifactId>snakeyaml</artifactId>
+                <version>${snakeyaml-version}</version>
+            </dependency>
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
@@ -950,5 +955,6 @@
         <surefire-version>2.19.1</surefire-version>
         <jmockit-version>1.25</jmockit-version>
         <reflections-version>0.9.11</reflections-version>
+        <snakeyaml-version>1.23</snakeyaml-version>
     </properties>
 </project>