From b20118b87c705b8f0f9ef6968aa75bfb61bdc67a Mon Sep 17 00:00:00 2001
From: Dennis Melzer <dennis.melzer@de.bosch.com>
Date: Mon, 5 Aug 2019 10:49:58 +0200
Subject: [PATCH] java-springcloud: No dependency management if parent
 overridden (#3301)

* If a separate parent pom is specified, there
should be no depdendency management

#3230

* Add Bean Validation framework

* Fix test and depedencies

* Format pom
---
 .../libraries/spring-cloud/pom.mustache         | 17 +++++++++++++++++
 samples/client/petstore/spring-cloud/pom.xml    |  5 +++++
 2 files changed, 22 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 1ba3588ac5a..6421924b76d 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>
@@ -41,11 +42,14 @@
         </dependencies>
     </dependencyManagement>
 
+{{/parentOverridden}}
     <dependencies>
         <dependency>
             <groupId>io.swagger</groupId>
             <artifactId>swagger-annotations</artifactId>
+{{^parentOverridden}}
             <version>${swagger-core-version}</version>
+{{/parentOverridden}}
         </dependency>
         <!-- @Nullable annotation -->
         <dependency>
@@ -84,13 +88,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>
@@ -104,5 +112,14 @@
             <artifactId>spring-boot-starter-hateoas</artifactId>
         </dependency>
 {{/hateoas}}
+{{#useBeanValidation}}
+        <dependency>
+            <groupId>org.hibernate.validator</groupId>
+            <artifactId>hibernate-validator</artifactId>
+        {{^parentOverridden}}
+            <version>6.0.16.Final</version>
+        {{/parentOverridden}}
+        </dependency>
+{{/useBeanValidation}}
     </dependencies>
 </project>
diff --git a/samples/client/petstore/spring-cloud/pom.xml b/samples/client/petstore/spring-cloud/pom.xml
index b14446583fb..db09f2e2596 100644
--- a/samples/client/petstore/spring-cloud/pom.xml
+++ b/samples/client/petstore/spring-cloud/pom.xml
@@ -66,5 +66,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>