loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

java-springcloud: No dependency management if parent overridden (#3301)

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

#3230

* Add Bean Validation framework

* Fix test and depedencies

* Format pom
This commit is contained in:
Dennis Melzer 2019-08-05 10:49:58 +02:00 committed by Esteban Gehring
parent a48df102d6
commit b20118b87c
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache vendored
View File

@ -29,6 +29,7 @@
<sourceDirectory>src/main/java</sourceDirectory> <sourceDirectory>src/main/java</sourceDirectory>
</build> </build>
{{^parentOverridden}}
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
@ -41,11 +42,14 @@
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
{{/parentOverridden}}
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
{{^parentOverridden}}
<version>${swagger-core-version}</version> <version>${swagger-core-version}</version>
{{/parentOverridden}}
</dependency> </dependency>
<!-- @Nullable annotation --> <!-- @Nullable annotation -->
<dependency> <dependency>
@ -84,13 +88,17 @@
<dependency> <dependency>
<groupId>com.github.joschi.jackson</groupId> <groupId>com.github.joschi.jackson</groupId>
<artifactId>jackson-datatype-threetenbp</artifactId> <artifactId>jackson-datatype-threetenbp</artifactId>
{{^parentOverridden}}
<version>2.6.4</version> <version>2.6.4</version>
{{/parentOverridden}}
</dependency> </dependency>
{{/threetenbp}} {{/threetenbp}}
<dependency> <dependency>
<groupId>org.openapitools</groupId> <groupId>org.openapitools</groupId>
<artifactId>jackson-databind-nullable</artifactId> <artifactId>jackson-databind-nullable</artifactId>
{{^parentOverridden}}
<version>0.1.0</version> <version>0.1.0</version>
{{/parentOverridden}}
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -104,5 +112,14 @@
<artifactId>spring-boot-starter-hateoas</artifactId> <artifactId>spring-boot-starter-hateoas</artifactId>
</dependency> </dependency>
{{/hateoas}} {{/hateoas}}
{{#useBeanValidation}}
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
{{^parentOverridden}}
<version>6.0.16.Final</version>
{{/parentOverridden}}
</dependency>
{{/useBeanValidation}}
</dependencies> </dependencies>
</project> </project>

5
samples/client/petstore/spring-cloud/pom.xml
View File

@ -66,5 +66,10 @@
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.hibernate.validator</groupId>
<artifactId>hibernate-validator</artifactId>
<version>6.0.16.Final</version>
</dependency>
</dependencies> </dependencies>
</project> </project>