From 28125277eed4a53ed84bf563f5a13d53a7732e35 Mon Sep 17 00:00:00 2001 From: Mark Woodland Date: Thu, 27 Sep 2018 16:18:32 +0100 Subject: [PATCH 1/3] Allow specifying/overriding the parent in the pom file for Java and Spring generators. --- docs/generators/java.md | 9 +++++ docs/generators/spring.md | 9 +++++ .../codegen/CodegenConstants.java | 8 ++++ .../languages/AbstractJavaCodegen.java | 39 +++++++++++++++++++ .../Java/libraries/feign/pom.mustache | 9 ++++- .../libraries/google-api-client/pom.mustache | 7 ++++ .../Java/libraries/jersey2/pom.mustache | 7 ++++ .../Java/libraries/okhttp-gson/pom.mustache | 7 ++++ .../Java/libraries/rest-assured/pom.mustache | 7 ++++ .../Java/libraries/resteasy/pom.mustache | 7 ++++ .../Java/libraries/resttemplate/pom.mustache | 7 ++++ .../Java/libraries/retrofit/pom.mustache | 7 ++++ .../Java/libraries/retrofit2/pom.mustache | 7 ++++ .../Java/libraries/vertx/pom.mustache | 7 ++++ .../Java/libraries/webclient/pom.mustache | 7 ++++ .../src/main/resources/Java/pom.mustache | 7 ++++ .../libraries/spring-boot/pom.mustache | 9 +++++ .../libraries/spring-cloud/pom.mustache | 9 +++++ .../libraries/spring-mvc/pom.mustache | 7 ++++ 19 files changed, 175 insertions(+), 1 deletion(-) diff --git a/docs/generators/java.md b/docs/generators/java.md index 6892d264c757..01942712ab38 100644 --- a/docs/generators/java.md +++ b/docs/generators/java.md @@ -104,6 +104,15 @@ CONFIG OPTIONS for java booleanGetterPrefix Set booleanGetterPrefix (default value 'get') + parentGroupId + parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect + + parentArtifactId + parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect + + parentVersion + parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect + useRxJava Whether to use the RxJava adapter with the retrofit2 library. (Default: false) diff --git a/docs/generators/spring.md b/docs/generators/spring.md index 17886ab9430b..ab0e1ad15a6e 100644 --- a/docs/generators/spring.md +++ b/docs/generators/spring.md @@ -104,6 +104,15 @@ CONFIG OPTIONS for spring booleanGetterPrefix Set booleanGetterPrefix (default value 'get') + parentGroupId + parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect + + parentArtifactId + parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect + + parentVersion + parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect + title server title name or client service name diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java index 30695d3a3f6a..ff2bc63383bd 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java @@ -265,4 +265,12 @@ public static enum ENUM_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case, public static final String DATABASE_ADAPTER = "databaseAdapter"; public static final String DATABASE_ADAPTER_DESC = "The adapter for database (e.g. mysql, sqlite). Default: sqlite"; + public static final String PARENT_GROUP_ID = "parentGroupId"; + public static final String PARENT_GROUP_ID_DESC = "parent groupId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect"; + + public static final String PARENT_ARTIFACT_ID = "parentArtifactId"; + public static final String PARENT_ARTIFACT_ID_DESC = "parent artifactId in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect"; + + public static final String PARENT_VERSION = "parentVersion"; + public static final String PARENT_VERSION_DESC = "parent version in generated pom N.B. parentGroupId, parentArtifactId and parentVersion must all be specified for any of them to take effect"; } diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java index ed83be48a39d..70e1dc714a64 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java @@ -105,6 +105,10 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code protected boolean disableHtmlEscaping = false; protected String booleanGetterPrefix = BOOLEAN_GETTER_PREFIX_DEFAULT; protected boolean useNullForUnknownEnumValue = false; + protected String parentGroupId = ""; + protected String parentArtifactId = ""; + protected String parentVersion = ""; + protected boolean parentOverridden = false; public AbstractJavaCodegen() { super(); @@ -198,6 +202,10 @@ public AbstractJavaCodegen() { cliOptions.add(CliOption.newBoolean(DISABLE_HTML_ESCAPING, "Disable HTML escaping of JSON strings when using gson (needed to avoid problems with byte[] fields)")); cliOptions.add(CliOption.newString(BOOLEAN_GETTER_PREFIX, "Set booleanGetterPrefix (default value '" + BOOLEAN_GETTER_PREFIX_DEFAULT + "')")); + + cliOptions.add(CliOption.newString(CodegenConstants.PARENT_GROUP_ID, CodegenConstants.PARENT_GROUP_ID_DESC)); + cliOptions.add(CliOption.newString(CodegenConstants.PARENT_ARTIFACT_ID, CodegenConstants.PARENT_ARTIFACT_ID_DESC)); + cliOptions.add(CliOption.newString(CodegenConstants.PARENT_VERSION, CodegenConstants.PARENT_VERSION_DESC)); } @Override @@ -375,6 +383,22 @@ public void processOpts() { this.setWithXml(Boolean.valueOf(additionalProperties.get(WITH_XML).toString())); } additionalProperties.put(WITH_XML, withXml); + + if (additionalProperties.containsKey(CodegenConstants.PARENT_GROUP_ID)) { + this.setParentGroupId((String) additionalProperties.get(CodegenConstants.PARENT_GROUP_ID)); + } + + if (additionalProperties.containsKey(CodegenConstants.PARENT_ARTIFACT_ID)) { + this.setParentArtifactId((String) additionalProperties.get(CodegenConstants.PARENT_ARTIFACT_ID)); + } + + if (additionalProperties.containsKey(CodegenConstants.PARENT_VERSION)) { + this.setParentVersion((String) additionalProperties.get(CodegenConstants.PARENT_VERSION)); + } + + if (!StringUtils.isEmpty(parentGroupId) && !StringUtils.isEmpty(parentArtifactId) && !StringUtils.isEmpty(parentVersion)) { + additionalProperties.put("parentOverridden", true); + } // make api and model doc path available in mustache template additionalProperties.put("apiDocPath", apiDocPath); @@ -1347,4 +1371,19 @@ public String sanitizeTag(String tag) { return tag; } + public void setParentGroupId(final String parentGroupId) { + this.parentGroupId = parentGroupId; + } + + public void setParentArtifactId(final String parentArtifactId) { + this.parentArtifactId = parentArtifactId; + } + + public void setParentVersion(final String parentVersion) { + this.parentVersion = parentVersion; + } + + public void setParentOverridden(final boolean parentOverridden) { + this.parentOverridden = parentOverridden; + } } diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache index bf74b39c6174..090fd3a69716 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache @@ -13,7 +13,14 @@ {{scmDeveloperConnection}} {{scmUrl}} - + {{#parentOverridden}} + + {{{parentGroupId}}} + {{{parentArtifactId}}} + {{{parentVersion}}} + + {{/parentOverridden}} + {{licenseName}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache index 69aac87b2793..ccd790a6d91f 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache @@ -13,6 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} + {{#parentOverridden}} + + {{{parentGroupId}}} + {{{parentArtifactId}}} + {{{parentVersion}}} + + {{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache index 93f2d9e2c9bf..a9ad75b22360 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache @@ -13,6 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} + {{#parentOverridden}} + + {{{parentGroupId}}} + {{{parentArtifactId}}} + {{{parentVersion}}} + + {{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache index e960f01abcd6..7a5d816c7598 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache @@ -13,6 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} + {{#parentOverridden}} + + {{{parentGroupId}}} + {{{parentArtifactId}}} + {{{parentVersion}}} + + {{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache index aa0c15d8b383..9434289a567e 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache @@ -13,6 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} + {{#parentOverridden}} + + {{{parentGroupId}}} + {{{parentArtifactId}}} + {{{parentVersion}}} + + {{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache index 540c54c68130..f18d0eec597c 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache @@ -11,6 +11,13 @@ scm:git:git@github.com:openapitools/openapi-generator.git https://openapi-generator.tech + {{#parentOverridden}} + + {{{parentGroupId}}} + {{{parentArtifactId}}} + {{{parentVersion}}} + + {{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache index 10d84edafc2f..ca421d2e53c9 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache @@ -13,6 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} + {{#parentOverridden}} + + {{{parentGroupId}}} + {{{parentArtifactId}}} + {{{parentVersion}}} + + {{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache index 155a8128e308..7177af4498e6 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache @@ -13,6 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} + {{#parentOverridden}} + + {{{parentGroupId}}} + {{{parentArtifactId}}} + {{{parentVersion}}} + + {{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache index 3028604c3603..9c8f7869264a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache @@ -13,6 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} + {{#parentOverridden}} + + {{{parentGroupId}}} + {{{parentArtifactId}}} + {{{parentVersion}}} + + {{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache index b8d7e513d6bd..40c8212a0ac3 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache @@ -13,6 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} + {{#parentOverridden}} + + {{{parentGroupId}}} + {{{parentArtifactId}}} + {{{parentVersion}}} + + {{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache index 4771a9bb6587..9dd0dcb41cdd 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache @@ -13,6 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} + {{#parentOverridden}} + + {{{parentGroupId}}} + {{{parentArtifactId}}} + {{{parentVersion}}} + + {{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/pom.mustache b/modules/openapi-generator/src/main/resources/Java/pom.mustache index 275a5c869a4c..4874bbc56ba2 100644 --- a/modules/openapi-generator/src/main/resources/Java/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pom.mustache @@ -13,6 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} + {{#parentOverridden}} + + {{{parentGroupId}}} + {{{parentArtifactId}}} + {{{parentVersion}}} + + {{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache index f97f0ea92584..0e1fc744df6c 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache @@ -13,11 +13,20 @@ 2.8.0 {{/useSpringfox}} + {{#parentOverridden}} + + {{{parentGroupId}}} + {{{parentArtifactId}}} + {{{parentVersion}}} + + {{/parentOverridden}} + {{^parentOverridden}} org.springframework.boot spring-boot-starter-parent {{#java8}}2.0.1.RELEASE{{/java8}}{{^java8}}1.5.12.RELEASE{{/java8}} + {{/parentOverridden}} src/main/java {{^interfaceOnly}} 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 9efcee55a516..1e867835078f 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 @@ -11,11 +11,20 @@ ${java.version} 1.5.18 + {{#parentOverridden}} + + {{{parentGroupId}}} + {{{parentArtifactId}}} + {{{parentVersion}}} + + {{/parentOverridden}} + {{^parentOverridden}} org.springframework.boot spring-boot-starter-parent 1.5.4.RELEASE + {{/parentOverridden}} src/main/java diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache index 5ebe4d2b5c35..aa103df66dae 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache @@ -5,6 +5,13 @@ jar {{artifactId}} {{artifactVersion}} + {{#parentOverridden}} + + {{{parentGroupId}}} + {{{parentArtifactId}}} + {{{parentVersion}}} + + {{/parentOverridden}} src/main/java From b1283de8f4944ae958c1355ed6c9528f5d994f79 Mon Sep 17 00:00:00 2001 From: Mark Woodland Date: Thu, 27 Sep 2018 16:49:53 +0100 Subject: [PATCH 2/3] Don't add extra whitespace to the pom file when the parent isn't overridden. --- .../src/main/resources/Java/libraries/feign/pom.mustache | 4 ++-- .../Java/libraries/google-api-client/pom.mustache | 4 ++-- .../main/resources/Java/libraries/jersey2/pom.mustache | 4 ++-- .../resources/Java/libraries/okhttp-gson/pom.mustache | 4 ++-- .../resources/Java/libraries/rest-assured/pom.mustache | 4 ++-- .../main/resources/Java/libraries/resteasy/pom.mustache | 4 ++-- .../resources/Java/libraries/resttemplate/pom.mustache | 4 ++-- .../main/resources/Java/libraries/retrofit/pom.mustache | 4 ++-- .../main/resources/Java/libraries/retrofit2/pom.mustache | 4 ++-- .../src/main/resources/Java/libraries/vertx/pom.mustache | 4 ++-- .../main/resources/Java/libraries/webclient/pom.mustache | 4 ++-- .../src/main/resources/Java/pom.mustache | 4 ++-- .../JavaSpring/libraries/spring-boot/pom.mustache | 8 ++++---- .../JavaSpring/libraries/spring-cloud/pom.mustache | 8 ++++---- .../JavaSpring/libraries/spring-mvc/pom.mustache | 4 ++-- 15 files changed, 34 insertions(+), 34 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache index 090fd3a69716..beceecc272ba 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache @@ -13,13 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} - {{#parentOverridden}} +{{#parentOverridden}} {{{parentGroupId}}} {{{parentArtifactId}}} {{{parentVersion}}} - {{/parentOverridden}} +{{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache index ccd790a6d91f..7ff969e9c6c6 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache @@ -13,13 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} - {{#parentOverridden}} +{{#parentOverridden}} {{{parentGroupId}}} {{{parentArtifactId}}} {{{parentVersion}}} - {{/parentOverridden}} +{{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache index a9ad75b22360..57db33547c40 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache @@ -13,13 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} - {{#parentOverridden}} +{{#parentOverridden}} {{{parentGroupId}}} {{{parentArtifactId}}} {{{parentVersion}}} - {{/parentOverridden}} +{{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache index 7a5d816c7598..0cff2363ea33 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache @@ -13,13 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} - {{#parentOverridden}} +{{#parentOverridden}} {{{parentGroupId}}} {{{parentArtifactId}}} {{{parentVersion}}} - {{/parentOverridden}} +{{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache index 9434289a567e..64285da8111a 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache @@ -13,13 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} - {{#parentOverridden}} +{{#parentOverridden}} {{{parentGroupId}}} {{{parentArtifactId}}} {{{parentVersion}}} - {{/parentOverridden}} +{{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache index f18d0eec597c..2950d3e748e1 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache @@ -11,13 +11,13 @@ scm:git:git@github.com:openapitools/openapi-generator.git https://openapi-generator.tech - {{#parentOverridden}} +{{#parentOverridden}} {{{parentGroupId}}} {{{parentArtifactId}}} {{{parentVersion}}} - {{/parentOverridden}} +{{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache index ca421d2e53c9..95b3f7cb5d03 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache @@ -13,13 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} - {{#parentOverridden}} +{{#parentOverridden}} {{{parentGroupId}}} {{{parentArtifactId}}} {{{parentVersion}}} - {{/parentOverridden}} +{{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache index 7177af4498e6..c2a5eeced6f9 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache @@ -13,13 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} - {{#parentOverridden}} +{{#parentOverridden}} {{{parentGroupId}}} {{{parentArtifactId}}} {{{parentVersion}}} - {{/parentOverridden}} +{{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache index 9c8f7869264a..29347aee8e6e 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache @@ -13,13 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} - {{#parentOverridden}} +{{#parentOverridden}} {{{parentGroupId}}} {{{parentArtifactId}}} {{{parentVersion}}} - {{/parentOverridden}} +{{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache index 40c8212a0ac3..46687cd0c7cb 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache @@ -13,13 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} - {{#parentOverridden}} +{{#parentOverridden}} {{{parentGroupId}}} {{{parentArtifactId}}} {{{parentVersion}}} - {{/parentOverridden}} +{{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache index 9dd0dcb41cdd..7fde23176979 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache @@ -13,13 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} - {{#parentOverridden}} +{{#parentOverridden}} {{{parentGroupId}}} {{{parentArtifactId}}} {{{parentVersion}}} - {{/parentOverridden}} +{{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/Java/pom.mustache b/modules/openapi-generator/src/main/resources/Java/pom.mustache index 4874bbc56ba2..a2703f141d04 100644 --- a/modules/openapi-generator/src/main/resources/Java/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/pom.mustache @@ -13,13 +13,13 @@ {{scmDeveloperConnection}} {{scmUrl}} - {{#parentOverridden}} +{{#parentOverridden}} {{{parentGroupId}}} {{{parentArtifactId}}} {{{parentVersion}}} - {{/parentOverridden}} +{{/parentOverridden}} diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache index 0e1fc744df6c..555896e60e3d 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache @@ -13,20 +13,20 @@ 2.8.0 {{/useSpringfox}} - {{#parentOverridden}} +{{#parentOverridden}} {{{parentGroupId}}} {{{parentArtifactId}}} {{{parentVersion}}} - {{/parentOverridden}} - {{^parentOverridden}} +{{/parentOverridden}} +{{^parentOverridden}} org.springframework.boot spring-boot-starter-parent {{#java8}}2.0.1.RELEASE{{/java8}}{{^java8}}1.5.12.RELEASE{{/java8}} - {{/parentOverridden}} +{{/parentOverridden}} src/main/java {{^interfaceOnly}} 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 1e867835078f..284de4394356 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 @@ -11,20 +11,20 @@ ${java.version} 1.5.18 - {{#parentOverridden}} +{{#parentOverridden}} {{{parentGroupId}}} {{{parentArtifactId}}} {{{parentVersion}}} - {{/parentOverridden}} - {{^parentOverridden}} +{{/parentOverridden}} +{{^parentOverridden}} org.springframework.boot spring-boot-starter-parent 1.5.4.RELEASE - {{/parentOverridden}} +{{/parentOverridden}} src/main/java diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache index aa103df66dae..533ccb9a5694 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache @@ -5,13 +5,13 @@ jar {{artifactId}} {{artifactVersion}} - {{#parentOverridden}} +{{#parentOverridden}} {{{parentGroupId}}} {{{parentArtifactId}}} {{{parentVersion}}} - {{/parentOverridden}} +{{/parentOverridden}} src/main/java From 8a3764a677292d95682ce2946b072fef4e0582e7 Mon Sep 17 00:00:00 2001 From: Mark Woodland Date: Thu, 27 Sep 2018 17:17:53 +0100 Subject: [PATCH 3/3] Remove accidentally added white space. --- .../src/main/resources/Java/libraries/feign/pom.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache index beceecc272ba..32f01e5bb126 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache @@ -20,7 +20,7 @@ {{{parentVersion}}} {{/parentOverridden}} - + {{licenseName}}