From 17ad005a3f981b1c81f26e10f844d01f3625bdc9 Mon Sep 17 00:00:00 2001
From: "Melzer Dennis (BCI/ESW24)" <dennis.melzer@de.bosch.com>
Date: Mon, 8 Jul 2019 12:36:31 +0200
Subject: [PATCH 1/4] If a separate parent pom is specified, there should be no
 depdendency management

#3230
---
 .../resources/JavaSpring/libraries/spring-cloud/pom.mustache   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
index 4e1f61b8ae35..4f4d4209d8ec 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
@@ -29,6 +29,7 @@
         <sourceDirectory>src/main/java</sourceDirectory>
     </build>
 
+{{^parentOverridden}}
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -40,7 +41,7 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-
+{{/parentOverridden}}
     <dependencies>
         <dependency>
             <groupId>io.swagger</groupId>

From be4804b8ee4e06a468b14e875e6455b37dbd1567 Mon Sep 17 00:00:00 2001
From: "Melzer Dennis (BCI/ESW24)" <dennis.melzer@de.bosch.com>
Date: Mon, 8 Jul 2019 13:05:18 +0200
Subject: [PATCH 2/4] Add Bean Validation framework

---
 .../libraries/spring-cloud/pom.mustache           | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
index 4f4d4209d8ec..15567b475182 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
@@ -46,7 +46,9 @@
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
+{{^parentOverridden}}
             <version>${swagger-core-version}</version>
+{{/parentOverridden}}
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
@@ -79,13 +81,17 @@
         <dependency>
             <groupId>com.github.joschi.jackson</groupId>
             <artifactId>jackson-datatype-threetenbp</artifactId>
+        {{^parentOverridden}}
             <version>2.6.4</version>
+        {{/parentOverridden}}
         </dependency>
         {{/threetenbp}}
         <dependency>
             <groupId>org.openapitools</groupId>
             <artifactId>jackson-databind-nullable</artifactId>
+{{^parentOverridden}}
             <version>0.1.0</version>
+{{/parentOverridden}}
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -99,5 +105,14 @@
             <artifactId>spring-boot-starter-hateoas</artifactId>
         </dependency>
 {{/hateoas}}
+{{#useBeanValidation}}
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+        {{^parentOverridden}}
+            <version>6.0.2.Final</version>
+        {{/parentOverridden}}
+        </dependency>
+{{/useBeanValidation}}
     </dependencies>
 </project>

From 1d11f85bad60fcb4c197cd95e00d513a720f1fbd Mon Sep 17 00:00:00 2001
From: "Melzer Dennis (BCI/ESW24)" <dennis.melzer@de.bosch.com>
Date: Mon, 8 Jul 2019 15:41:17 +0200
Subject: [PATCH 3/4] Fix test and depedencies

---
 .../resources/JavaSpring/libraries/spring-cloud/pom.mustache | 2 +-
 samples/client/petstore/spring-cloud/pom.xml                 | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
index 15567b475182..6a5584ccce13 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
@@ -110,7 +110,7 @@
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
         {{^parentOverridden}}
-            <version>6.0.2.Final</version>
+            <version>6.0.16.Final</version>
         {{/parentOverridden}}
         </dependency>
 {{/useBeanValidation}}
diff --git a/samples/client/petstore/spring-cloud/pom.xml b/samples/client/petstore/spring-cloud/pom.xml
index 1ee79c2f74d0..4cfac88947ed 100644
--- a/samples/client/petstore/spring-cloud/pom.xml
+++ b/samples/client/petstore/spring-cloud/pom.xml
@@ -60,5 +60,10 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+            <version>6.0.16.Final</version>
+        </dependency>
     </dependencies>
 </project>

From 0df517976f435ff931a4a41c6c2cc7f86217387f Mon Sep 17 00:00:00 2001
From: "Melzer Dennis (BCI/ESW24)" <dennis.melzer@de.bosch.com>
Date: Wed, 10 Jul 2019 08:02:27 +0200
Subject: [PATCH 4/4] Format pom

---
 .../resources/JavaSpring/libraries/spring-cloud/pom.mustache    | 1 +
 .../petstore/kotlin-springboot/.openapi-generator/VERSION       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
index 6a5584ccce13..98d9e4d1b219 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
@@ -41,6 +41,7 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
+
 {{/parentOverridden}}
     <dependencies>
         <dependency>
diff --git a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION
index 479c313e87b9..d96260ba335d 100644
--- a/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION
+++ b/samples/server/petstore/kotlin-springboot/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.3-SNAPSHOT
\ No newline at end of file
+4.0.2-SNAPSHOT
\ No newline at end of file