From 7a2022f154f60fb4ba781e4585d0b04b34448329 Mon Sep 17 00:00:00 2001 From: jdiazgon <31688036+jdiazgon@users.noreply.github.com> Date: Fri, 10 Jan 2020 10:10:52 +0100 Subject: [PATCH 01/15] Fixing license --- cobigen/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cobigen/pom.xml b/cobigen/pom.xml index d377271408..a54916b041 100644 --- a/cobigen/pom.xml +++ b/cobigen/pom.xml @@ -138,8 +138,7 @@ true ${project.name} - {maven-resources}, {maven-dependencies} - {maven-resources}, {maven-dependencies}, {META-INF/LICENSE.html=src/main/resources/META-INF/LICENSEP2BUNDLE.html} + {maven-resources}, {maven-dependencies}, {META-INF/LICENSE.html=src/main/resources/META-INF/LICENSEP2BUNDLE.html} true From 29bf2a4227020e9f6f10a0bda3902039d88587f1 Mon Sep 17 00:00:00 2001 From: Jaime Diaz Date: Fri, 10 Jan 2020 10:46:39 +0100 Subject: [PATCH 02/15] #1093 Set next development version --- .../cobigen-openapiplugin-model/pom.xml | 2 +- .../cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin-model/pom.xml b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin-model/pom.xml index a781c4a990..944d092eb8 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin-model/pom.xml +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin-model/pom.xml @@ -1,7 +1,7 @@ 4.0.0 openapiplugin-model - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT CobiGen Openapiplugin Model jar CobiGen - OpenAPI Plug-in Model diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml index 458b8e790b..c6dde935e9 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 openapiplugin CobiGen - Open API Plug-in - 2.4.0-SNAPSHOT + 2.5.0-SNAPSHOT jar CobiGen - OpenAPI Plug-in From 79a1c1f268366693897d61943e0872540114c558 Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Tue, 14 Apr 2020 08:36:21 +0200 Subject: [PATCH 03/15] #1083 fix snapshot retrieval of sonartype snapshot repository (cherry picked from commit 7e2f0b4a11f40656b172d565540624b26cb98caf) --- pom.xml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/pom.xml b/pom.xml index a96c6cf8f6..7d22b59348 100644 --- a/pom.xml +++ b/pom.xml @@ -525,4 +525,18 @@ https://oss.sonatype.org/content/repositories/snapshots/ + + + + sonartype.snapshots + OSSRH Snapshots + https://oss.sonatype.org/content/repositories/snapshots/ + + true + + + false + + + From 1792c714c1fd96058d09a7baeac970a0a192db4a Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Tue, 14 Apr 2020 09:14:33 +0200 Subject: [PATCH 04/15] #1083 fix tests for jdk8 with jdk11 support --- .../cobigen-openapiplugin/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml index eed9eb1e07..fada11707d 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml @@ -26,7 +26,7 @@ com.devonfw.cobigen core-api - 5.3.0 + 6.0.0 com.reprezen.kaizen @@ -43,13 +43,13 @@ com.devonfw.cobigen core-test - 6.0.0 + 6.1.0-SNAPSHOT test com.devonfw.cobigen core - 6.0.0 + 6.1.0-SNAPSHOT test From c406415281547da00e0be62cadf56330545bcfe9 Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Tue, 14 Apr 2020 09:24:31 +0200 Subject: [PATCH 05/15] #1083 fix build --- .../cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml index fada11707d..9e99382da8 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml @@ -26,7 +26,7 @@ com.devonfw.cobigen core-api - 6.0.0 + 6.1.0-SNAPSHOT com.reprezen.kaizen From 63ef1a2d670cec262c625543acb88b08b6eb722f Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Thu, 10 Sep 2020 00:21:40 +0200 Subject: [PATCH 06/15] #1228 adapt to new lazy activation API --- .../cobigen-openapiplugin/pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml index 9e99382da8..1f8b960d37 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml @@ -26,7 +26,7 @@ com.devonfw.cobigen core-api - 6.1.0-SNAPSHOT + [6.2.0-SNAPSHOT,) com.reprezen.kaizen @@ -43,19 +43,19 @@ com.devonfw.cobigen core-test - 6.1.0-SNAPSHOT + [6.2.0-SNAPSHOT,) test com.devonfw.cobigen core - 6.1.0-SNAPSHOT + [6.2.0-SNAPSHOT,) test com.devonfw.cobigen tempeng-freemarker - 2.0.0 + 2.0.2-SNAPSHOT test From a8c18de8bd50800ac768042b0196ea01a72499f6 Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Thu, 10 Sep 2020 00:22:07 +0200 Subject: [PATCH 07/15] #1228 adapt to new lazy activation API --- .../cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml index 1f8b960d37..b1ce04d8b6 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml @@ -55,7 +55,7 @@ com.devonfw.cobigen tempeng-freemarker - 2.0.2-SNAPSHOT + 2.2.0-SNAPSHOT test From f331f18a97df0273df6f024e5959f8e18289e7f7 Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Thu, 10 Sep 2020 00:35:02 +0200 Subject: [PATCH 08/15] #1228 adapt to new lazy activation API --- .../openapiplugin/OpenAPIPluginActivator.java | 3 +++ .../openapiplugin/OpenAPITriggerInterpreter.java | 3 +++ .../inputreader/OpenAPIInputReader.java | 16 +++++++++------- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/OpenAPIPluginActivator.java b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/OpenAPIPluginActivator.java index f00a2c6951..384efe2ecb 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/OpenAPIPluginActivator.java +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/OpenAPIPluginActivator.java @@ -2,14 +2,17 @@ import java.util.List; +import com.devonfw.cobigen.api.annotation.Activation; import com.devonfw.cobigen.api.extension.GeneratorPluginActivator; import com.devonfw.cobigen.api.extension.Merger; import com.devonfw.cobigen.api.extension.TriggerInterpreter; +import com.devonfw.cobigen.openapiplugin.inputreader.OpenAPIInputReader; import com.google.common.collect.Lists; /** * Plug-in activator to be registered at CobiGen. */ +@Activation(byFileExtension = { OpenAPIInputReader.VALID_EXTENSION_YAML, OpenAPIInputReader.VALID_EXTENSION_YML }) public class OpenAPIPluginActivator implements GeneratorPluginActivator { /** diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/OpenAPITriggerInterpreter.java b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/OpenAPITriggerInterpreter.java index b2a9ffd80c..97353ce777 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/OpenAPITriggerInterpreter.java +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/OpenAPITriggerInterpreter.java @@ -1,7 +1,9 @@ package com.devonfw.cobigen.openapiplugin; +import com.devonfw.cobigen.api.annotation.ReaderPriority; import com.devonfw.cobigen.api.extension.InputReader; import com.devonfw.cobigen.api.extension.MatcherInterpreter; +import com.devonfw.cobigen.api.extension.Priority; import com.devonfw.cobigen.api.extension.TriggerInterpreter; import com.devonfw.cobigen.openapiplugin.inputreader.OpenAPIInputReader; import com.devonfw.cobigen.openapiplugin.matcher.OpenAPIMatcher; @@ -9,6 +11,7 @@ /** * {@link TriggerInterpreter} implementation of a Swagger Interpreter */ +@ReaderPriority(Priority.LOW) public class OpenAPITriggerInterpreter implements TriggerInterpreter { /** diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/inputreader/OpenAPIInputReader.java b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/inputreader/OpenAPIInputReader.java index 35aa299155..c9f3922f21 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/inputreader/OpenAPIInputReader.java +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/main/java/com/devonfw/cobigen/openapiplugin/inputreader/OpenAPIInputReader.java @@ -33,7 +33,6 @@ import com.devonfw.cobigen.openapiplugin.model.ResponseDef; import com.devonfw.cobigen.openapiplugin.model.ServerDef; import com.devonfw.cobigen.openapiplugin.util.constants.Constants; -import com.jayway.jsonpath.Configuration; import com.reprezen.jsonoverlay.JsonOverlay; import com.reprezen.jsonoverlay.Overlay; import com.reprezen.jsonoverlay.Reference; @@ -55,6 +54,12 @@ */ public class OpenAPIInputReader implements InputReader { + /** Valid extensions for the input reader */ + public static final String VALID_EXTENSION_YAML = "yaml"; + + /** Valid extensions for the input reader */ + public static final String VALID_EXTENSION_YML = "yml"; + /** * Components retrieved from an EntityDef. Used for not executing multiple times the retrieval of * components @@ -215,7 +220,6 @@ private ComponentDef getComponent(String componentName) { * @return list of entities */ private List extractComponents(OpenApi3 openApi) { - Object document = Configuration.defaultConfiguration().jsonProvider().parse(Overlay.toJson(openApi).toString()); HeaderDef header = new HeaderDef(); header.setServers(extractServers(openApi)); header.setInfo(extractInfo(openApi)); @@ -227,7 +231,7 @@ private List extractComponents(OpenApi3 openApi) { entityDef.setName(key); entityDef.setDescription(openApi.getSchema(key).getDescription()); ComponentDef componentDef = new ComponentDef(); - entityDef.setProperties(extractProperties(openApi, document, key)); + entityDef.setProperties(extractProperties(openApi, key)); // If no x-component tag was found on the input file, throw invalid configuration if (openApi.getSchema(key).getExtensions().get(Constants.COMPONENT_EXT) == null) { @@ -348,13 +352,11 @@ private PropertyDef extractReferenceProperty(OpenApi3 openApi, Schema componentS * * @param openApi * the OpenApi3 model - * @param jsonDocument - * parsed JSON document * @param componentName * entity name * @return List of {@link PropertyDef}'s */ - private List extractProperties(OpenApi3 openApi, Object jsonDocument, String componentName) { + private List extractProperties(OpenApi3 openApi, String componentName) { Schema componentSchema = openApi.getSchema(componentName); Map properties = componentSchema.getProperties(); List objects = new LinkedList<>(); @@ -698,7 +700,7 @@ public Object read(java.nio.file.Path path, Charset inputCharset, Object... addi @Override public boolean isMostLikelyReadable(java.nio.file.Path path) { - List validExtensions = Arrays.asList("yaml", "yml"); + List validExtensions = Arrays.asList(VALID_EXTENSION_YAML, VALID_EXTENSION_YML); String fileExtension = FilenameUtils.getExtension(path.toString()).toLowerCase(); return validExtensions.contains(fileExtension); } From 23bec0d39c6c80d086e0f97f992902a8294d9bcf Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Thu, 10 Sep 2020 00:57:05 +0200 Subject: [PATCH 09/15] #1228 fix tests --- .../InputReaderMatcherTest.java | 28 +++++++------------ 1 file changed, 10 insertions(+), 18 deletions(-) diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/test/java/com/devonfw/cobigen/openapiplugin/integrationtest/InputReaderMatcherTest.java b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/test/java/com/devonfw/cobigen/openapiplugin/integrationtest/InputReaderMatcherTest.java index c2054ebe6e..de52964f20 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/test/java/com/devonfw/cobigen/openapiplugin/integrationtest/InputReaderMatcherTest.java +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/src/test/java/com/devonfw/cobigen/openapiplugin/integrationtest/InputReaderMatcherTest.java @@ -15,7 +15,6 @@ import com.devonfw.cobigen.api.to.GenerationReportTo; import com.devonfw.cobigen.api.to.TemplateTo; import com.devonfw.cobigen.impl.CobiGenFactory; -import com.devonfw.cobigen.openapiplugin.model.OpenAPIFile; import com.devonfw.cobigen.openapiplugin.util.TestConstants; import junit.framework.AssertionFailedError; @@ -42,8 +41,7 @@ public class InputReaderMatcherTest { public void testBasicElementMatcher_oneComponent() throws Exception { CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri()); - Object openApiFile = - cobigen.read("openapi", Paths.get(testdataRoot, "one-component.yaml"), TestConstants.UTF_8); + Object openApiFile = cobigen.read(Paths.get(testdataRoot, "one-component.yaml"), TestConstants.UTF_8); assertThat(openApiFile).isNotNull(); List inputObjects = cobigen.resolveContainers(openApiFile); @@ -59,8 +57,7 @@ public void testBasicElementMatcher_oneComponent() throws Exception { public void testBasicElementMatcher_twoComponents() throws Exception { CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri()); - Object openApiFile = - cobigen.read("openapi", Paths.get(testdataRoot, "two-components.yaml"), TestConstants.UTF_8); + Object openApiFile = cobigen.read(Paths.get(testdataRoot, "two-components.yaml"), TestConstants.UTF_8); assertThat(openApiFile).isNotNull(); List inputObjects = cobigen.resolveContainers(openApiFile); @@ -76,8 +73,7 @@ public void testBasicElementMatcher_twoComponents() throws Exception { public void testVariableAssignment_propertyName() throws Exception { CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri()); - Object openApiFile = - cobigen.read("openapi", Paths.get(testdataRoot, "one-component.yaml"), TestConstants.UTF_8); + Object openApiFile = cobigen.read(Paths.get(testdataRoot, "one-component.yaml"), TestConstants.UTF_8); List inputObjects = cobigen.resolveContainers(openApiFile); String templateName = "testVariableAssignment_propertyName.txt"; @@ -101,8 +97,7 @@ public void testVariableAssignment_propertyName() throws Exception { public void testVariableAssignment_rootPackage() throws Exception { CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri()); - Object openApiFile = cobigen.read("openapi", Paths.get(testdataRoot, "root-package.yaml"), TestConstants.UTF_8); - OpenAPIFile inputFile = (OpenAPIFile) openApiFile; + Object openApiFile = cobigen.read(Paths.get(testdataRoot, "root-package.yaml"), TestConstants.UTF_8); // Previous version: List inputObjects = cobigen.getInputObjects(openApiFile, // TestConstants.UTF_8); @@ -119,18 +114,18 @@ public void testVariableAssignment_rootPackage() throws Exception { .hasContent("testingRootName"); } - /* + /** * Tests variable assignment resolution of ROOTPACKAGE type, thus that the user can define the root * package in the "info" part of the OpenAPI file * - * @throws Exception test fails + * @throws Exception + * test fails */ @Test public void testVariableAssignment_rootComponent() throws Exception { CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri()); - Object openApiFile = cobigen.read("openapi", Paths.get(testdataRoot, "root-package.yaml"), TestConstants.UTF_8); - OpenAPIFile inputFile = (OpenAPIFile) openApiFile; + Object openApiFile = cobigen.read(Paths.get(testdataRoot, "root-package.yaml"), TestConstants.UTF_8); // Previous version: List inputObjects = cobigen.getInputObjects(openApiFile, // TestConstants.UTF_8); @@ -160,9 +155,7 @@ public void testVariableAssignment_rootComponent() throws Exception { public void testVariableAssignment_attribute() throws Exception { CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri()); - Object openApiFile = - cobigen.read("openapi", Paths.get(testdataRoot, "two-components.yaml"), TestConstants.UTF_8); - OpenAPIFile inputFile = (OpenAPIFile) openApiFile; + Object openApiFile = cobigen.read(Paths.get(testdataRoot, "two-components.yaml"), TestConstants.UTF_8); // Previous version: List inputObjects = cobigen.getInputObjects(openApiFile, // TestConstants.UTF_8); @@ -201,8 +194,7 @@ public void testVariableAssignment_noAttributeFound() throws Exception { CobiGen cobigen = CobiGenFactory.create(Paths.get(testdataRoot, "templates").toUri()); Object openApiFile = - cobigen.read("openapi", Paths.get(testdataRoot, "two-components-no-attribute.yaml"), TestConstants.UTF_8); - OpenAPIFile inputFile = (OpenAPIFile) openApiFile; + cobigen.read(Paths.get(testdataRoot, "two-components-no-attribute.yaml"), TestConstants.UTF_8); // Previous version: List inputObjects = cobigen.getInputObjects(openApiFile, // TestConstants.UTF_8); From 93d492d2ae7de2b15843159f599b60d10f06ab87 Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Thu, 10 Sep 2020 01:40:07 +0200 Subject: [PATCH 10/15] set new version to make compatibility recognition easier --- .../cobigen-openapiplugin-model/pom.xml | 2 +- .../cobigen-openapiplugin/pom.xml | 10 +++++----- cobigen/cobigen-openapiplugin-parent/pom.xml | 2 -- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin-model/pom.xml b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin-model/pom.xml index 944d092eb8..3686bed63c 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin-model/pom.xml +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin-model/pom.xml @@ -1,7 +1,7 @@ 4.0.0 openapiplugin-model - 2.5.0-SNAPSHOT + 7.0.0-SNAPSHOT CobiGen Openapiplugin Model jar CobiGen - OpenAPI Plug-in Model diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml index b1ce04d8b6..8f83c241ae 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 openapiplugin CobiGen - Open API Plug-in - 2.5.0-SNAPSHOT + 7.0.0-SNAPSHOT jar CobiGen - OpenAPI Plug-in @@ -26,7 +26,7 @@ com.devonfw.cobigen core-api - [6.2.0-SNAPSHOT,) + [7.0.0-SNAPSHOT,) com.reprezen.kaizen @@ -43,19 +43,19 @@ com.devonfw.cobigen core-test - [6.2.0-SNAPSHOT,) + [7.0.0-SNAPSHOT,) test com.devonfw.cobigen core - [6.2.0-SNAPSHOT,) + [7.0.0-SNAPSHOT,) test com.devonfw.cobigen tempeng-freemarker - 2.2.0-SNAPSHOT + 7.0.0-SNAPSHOT test diff --git a/cobigen/cobigen-openapiplugin-parent/pom.xml b/cobigen/cobigen-openapiplugin-parent/pom.xml index 3f21c61cf7..9b1ba5cf1b 100644 --- a/cobigen/cobigen-openapiplugin-parent/pom.xml +++ b/cobigen/cobigen-openapiplugin-parent/pom.xml @@ -1,9 +1,7 @@ 4.0.0 - com.devonfw.cobigen openapiplugin-parent - dev-SNAPSHOT pom CobiGen Openapiplugin Parent From 80108d7db7f0b13ab944f089fbd98e43fc13078d Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Fri, 11 Sep 2020 17:08:15 +0200 Subject: [PATCH 11/15] #1228 fixing dependencies --- .../cobigen-openapiplugin/pom.xml | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml index 8f83c241ae..c12446d7a2 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 openapiplugin CobiGen - Open API Plug-in @@ -17,12 +18,12 @@ - + com.devonfw.cobigen openapiplugin-model ${project.version} - + com.devonfw.cobigen core-api @@ -43,13 +44,13 @@ com.devonfw.cobigen core-test - [7.0.0-SNAPSHOT,) + 7.0.0-SNAPSHOT test com.devonfw.cobigen core - [7.0.0-SNAPSHOT,) + 7.0.0-SNAPSHOT test @@ -60,14 +61,14 @@ - - - src/main/resources - false - - **/META-INF/LICENSEP2BUNDLE.html - - - - + + + src/main/resources + false + + **/META-INF/LICENSEP2BUNDLE.html + + + + \ No newline at end of file From ff6a415d7c6d586575d0935e4203e44a5b0690bd Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Mon, 14 Sep 2020 15:39:02 +0200 Subject: [PATCH 12/15] set latest release version --- .../cobigen-openapiplugin/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml index c12446d7a2..f9b642878d 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml @@ -27,7 +27,7 @@ com.devonfw.cobigen core-api - [7.0.0-SNAPSHOT,) + [7.0.0,) com.reprezen.kaizen @@ -50,13 +50,13 @@ com.devonfw.cobigen core - 7.0.0-SNAPSHOT + 7.0.0 test com.devonfw.cobigen tempeng-freemarker - 7.0.0-SNAPSHOT + 7.0.0 test From e8085bc36952023dc1ef90faa11c0b064ccf6d3f Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Mon, 14 Sep 2020 16:32:51 +0200 Subject: [PATCH 13/15] #1235 upgrade SNAPSHOT dependencies --- .../cobigen-openapiplugin/pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml index f9b642878d..f5dc64297a 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml @@ -1,5 +1,4 @@ - + 4.0.0 openapiplugin CobiGen - Open API Plug-in @@ -44,7 +43,7 @@ com.devonfw.cobigen core-test - 7.0.0-SNAPSHOT + 7.0.0 test From 05e1369886977ae9a9a9b00739669f993dcc344b Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Mon, 14 Sep 2020 16:34:24 +0200 Subject: [PATCH 14/15] #1235 update wiki docs --- documentation/master-cobigen.asciidoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/documentation/master-cobigen.asciidoc b/documentation/master-cobigen.asciidoc index 8f4ef21ec7..2a9cbd616b 100644 --- a/documentation/master-cobigen.asciidoc +++ b/documentation/master-cobigen.asciidoc @@ -25,7 +25,7 @@ DISCLAIMER: All Cobigen plugins are compatible with the latest release of Devonf * CobiGen - Text Merger v2.1.0 * CobiGen - JSON Plug-in v2.1.0 * CobiGen - HTML Plug-in v2.1.0 -* CobiGen - Open API Plug-in v2.4.0 +* CobiGen - Open API Plug-in v7.0.0 * CobiGen - FreeMaker Template Engine v2.1.0 * CobiGen - Velocity Template Engine v2.0.1 From 844ee8d611336b6b83688eef42a1001c9a32f0a3 Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Mon, 14 Sep 2020 16:34:29 +0200 Subject: [PATCH 15/15] #1235 Set release version --- .../cobigen-openapiplugin-model/pom.xml | 2 +- .../cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin-model/pom.xml b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin-model/pom.xml index 3686bed63c..cf08999cd2 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin-model/pom.xml +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin-model/pom.xml @@ -1,7 +1,7 @@ 4.0.0 openapiplugin-model - 7.0.0-SNAPSHOT + 7.0.0 CobiGen Openapiplugin Model jar CobiGen - OpenAPI Plug-in Model diff --git a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml index f5dc64297a..688ed34951 100644 --- a/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml +++ b/cobigen/cobigen-openapiplugin-parent/cobigen-openapiplugin/pom.xml @@ -2,7 +2,7 @@ 4.0.0 openapiplugin CobiGen - Open API Plug-in - 7.0.0-SNAPSHOT + 7.0.0 jar CobiGen - OpenAPI Plug-in