From 6c33a153ad1c9863a4e12e5f6b359b9fef90240d Mon Sep 17 00:00:00 2001 From: Malte Brunnlieb Date: Mon, 14 Sep 2020 14:30:01 +0200 Subject: [PATCH 1/8] #1217 Set next development version --- cobigen-maven/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cobigen-maven/pom.xml b/cobigen-maven/pom.xml index 77c5e2b113..e475365f9f 100644 --- a/cobigen-maven/pom.xml +++ b/cobigen-maven/pom.xml @@ -13,7 +13,7 @@ 3.0 - 7.0.0 + 7.1.0-SNAPSHOT From 1ff70037b112cffbcd61cc7b0e82c2314aecd215 Mon Sep 17 00:00:00 2001 From: MikeSchumacher Date: Thu, 10 Dec 2020 15:09:31 +0100 Subject: [PATCH 2/8] updated core dependency --- cobigen-maven/cobigen-maven-plugin/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cobigen-maven/cobigen-maven-plugin/pom.xml b/cobigen-maven/cobigen-maven-plugin/pom.xml index 03d0a26b32..bc74741637 100644 --- a/cobigen-maven/cobigen-maven-plugin/pom.xml +++ b/cobigen-maven/cobigen-maven-plugin/pom.xml @@ -37,13 +37,13 @@ ${project.groupId} core - 7.0.0 + 7.1.0 ${project.groupId} core-api - 7.0.0 + 7.1.0 From cad6e7503c854d8300bd4084f17c248524ef5ad7 Mon Sep 17 00:00:00 2001 From: MikeSchumacher Date: Thu, 10 Dec 2020 15:18:51 +0100 Subject: [PATCH 3/8] updated core dependency in maven-test --- cobigen-maven/cobigen-maven-test/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cobigen-maven/cobigen-maven-test/pom.xml b/cobigen-maven/cobigen-maven-test/pom.xml index 84ce86e714..40f3a2ca2f 100644 --- a/cobigen-maven/cobigen-maven-test/pom.xml +++ b/cobigen-maven/cobigen-maven-test/pom.xml @@ -26,12 +26,12 @@ com.devonfw.cobigen core-test - 7.0.0 + 7.1.0 com.devonfw.cobigen core-api - 7.0.0 + 7.1.0 From 7cd52cfef6156719d5ddf35968d49aa65df32388 Mon Sep 17 00:00:00 2001 From: MikeSchumacher Date: Fri, 11 Dec 2020 11:43:20 +0100 Subject: [PATCH 4/8] updated plugin dependencies in all tests --- .../pom.xml | 6 ++--- .../TestDifferentFileSystems/pom.xml | 18 +++++++-------- .../pom.xml | 22 +++++++++---------- .../pom.xml | 18 +++++++-------- .../TestExceptionOnNothingToGenerate/pom.xml | 4 ++-- .../TestNothingToGenerate/pom.xml | 6 ++--- .../pom.xml | 10 ++++----- .../pom.xml | 4 ++-- .../TestDifferentFileSystems/pom.xml | 14 ++++++------ .../pom.xml | 8 +++---- .../pom.xml | 6 ++--- .../TestExceptionOnNothingToGenerate/pom.xml | 4 ++-- .../TestNothingToGenerate/pom.xml | 4 ++-- .../pom.xml | 8 +++---- .../cobigen/maven/test/AbstractMavenTest.java | 17 ++++++++++++++ 15 files changed, 83 insertions(+), 66 deletions(-) diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml index 0ad1f843ed..b77125f577 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml @@ -37,17 +37,17 @@ com.devonfw.cobigen tempeng-freemarker - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen javaplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen tsplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestDifferentFileSystems/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestDifferentFileSystems/pom.xml index 5f30f327d2..1170e90645 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestDifferentFileSystems/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestDifferentFileSystems/pom.xml @@ -37,47 +37,47 @@ com.devonfw.cobigen templates-devon4j - 20.08.001-SNAPSHOT + 20.08.002 com.devonfw.cobigen tempeng-freemarker - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen openapiplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen javaplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen xmlplugin - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen htmlplugin - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen tsplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen jsonplugin - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen textmerger - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml index 37db706e1d..022c6fa019 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml @@ -37,57 +37,57 @@ com.devonfw.cobigen templates-devon4j - 3.1.8 + 20.08.002 com.devonfw.cobigen javaplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen xmlplugin - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen openapiplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen tsplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen propertyplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen htmlplugin - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen textmerger - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen tempeng-velocity - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen tempeng-freemarker - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen tsplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml index 438b9233c0..13c8829216 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml @@ -37,47 +37,47 @@ com.devonfw.cobigen javaplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen xmlplugin - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen openapiplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen tsplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen propertyplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen htmlplugin - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen textmerger - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen tempeng-velocity - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen tempeng-freemarker - 7.0.0-SNAPSHOT + 7.0.0 diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml index cd40396e41..af85fcd77c 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml @@ -38,12 +38,12 @@ com.devonfw.cobigen tempeng-freemarker - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen javaplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestNothingToGenerate/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestNothingToGenerate/pom.xml index 0ad1f843ed..b77125f577 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestNothingToGenerate/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestNothingToGenerate/pom.xml @@ -37,17 +37,17 @@ com.devonfw.cobigen tempeng-freemarker - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen javaplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen tsplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml index b281d48234..68f39a6a90 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml @@ -42,27 +42,27 @@ com.devonfw.cobigen tempeng-freemarker - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen javaplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen xmlplugin - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen openapiplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen tsplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml index 0f0f7330f8..e07fca34b4 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml @@ -37,12 +37,12 @@ com.devonfw.cobigen tempeng-freemarker - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen javaplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestDifferentFileSystems/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestDifferentFileSystems/pom.xml index 90c4974b37..7aa269ccc5 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestDifferentFileSystems/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestDifferentFileSystems/pom.xml @@ -42,37 +42,37 @@ com.devonfw.cobigen tempeng-freemarker - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen openapiplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen javaplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen xmlplugin - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen htmlplugin - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen tsplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen jsonplugin - 7.0.0-SNAPSHOT + 7.0.0 diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml index 25935b25ff..2e268a504b 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml @@ -42,22 +42,22 @@ com.devonfw.cobigen tempeng-freemarker - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen javaplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen xmlplugin - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen openapiplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml index 2925cc55a3..ac70a8567c 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml @@ -37,17 +37,17 @@ com.devonfw.cobigen tempeng-freemarker - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen javaplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen xmlplugin - 7.0.0-SNAPSHOT + 7.0.0 diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml index 9e428abe1c..3649c580d4 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml @@ -38,12 +38,12 @@ com.devonfw.cobigen tempeng-freemarker - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen javaplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestNothingToGenerate/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestNothingToGenerate/pom.xml index 0f0f7330f8..e07fca34b4 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestNothingToGenerate/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestNothingToGenerate/pom.xml @@ -37,12 +37,12 @@ com.devonfw.cobigen tempeng-freemarker - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen javaplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml index 0f65b5b549..3d0a452b3f 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml @@ -42,22 +42,22 @@ com.devonfw.cobigen tempeng-freemarker - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen javaplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT com.devonfw.cobigen xmlplugin - 7.0.0-SNAPSHOT + 7.0.0 com.devonfw.cobigen openapiplugin - 7.0.0-SNAPSHOT + 7.1.0-SNAPSHOT diff --git a/cobigen-maven/cobigen-maven-test/src/main/java/com/devonfw/cobigen/maven/test/AbstractMavenTest.java b/cobigen-maven/cobigen-maven-test/src/main/java/com/devonfw/cobigen/maven/test/AbstractMavenTest.java index 55bb0f89c7..9cf597a172 100644 --- a/cobigen-maven/cobigen-maven-test/src/main/java/com/devonfw/cobigen/maven/test/AbstractMavenTest.java +++ b/cobigen-maven/cobigen-maven-test/src/main/java/com/devonfw/cobigen/maven/test/AbstractMavenTest.java @@ -88,6 +88,23 @@ protected File runMavenInvoker(File testProject, String localRepoPath) throws Ex return runMavenInvoker(testProject, null, localRepoPath); } + /** + * Runs the maven invoker with goal package. Makes sure, that the local repository of the executing maven + * process is used. + * @param testProject + * the test project to build + * @param localRepoPath + * local repository path of the current execution + * @param debug + * enable debug logging + * @return the temporary copy of the test project, the build was executed in + * @throws Exception + * if anything fails + */ + protected File runMavenInvoker(File testProject, String localRepoPath, boolean debug) throws Exception { + return runMavenInvoker(testProject, null, localRepoPath, debug); + } + /** * Runs the maven invoker with goal package and the default devonfw settings file. Makes sure, that the * local repository of the executing maven process is used. From 3af6a67237ff20a54171b4eb528d35495c9d6623 Mon Sep 17 00:00:00 2001 From: MikeSchumacher Date: Mon, 14 Dec 2020 10:11:44 +0100 Subject: [PATCH 5/8] changed from snapshot to stable versions --- .../TestClassLoadingWithTemplateFolder/pom.xml | 4 ++-- .../TestDifferentFileSystems/pom.xml | 8 ++++---- .../TestEntityInputDataaccessGeneration/pom.xml | 12 ++++++------ .../pom.xml | 10 +++++----- .../TestExceptionOnNothingToGenerate/pom.xml | 2 +- .../TestNothingToGenerate/pom.xml | 4 ++-- .../TestPackageInputDataaccessGeneration/pom.xml | 6 +++--- .../TestClassLoadingWithTemplateFolder/pom.xml | 2 +- .../TestDifferentFileSystems/pom.xml | 6 +++--- .../TestEntityInputDataaccessGeneration/pom.xml | 4 ++-- .../pom.xml | 2 +- .../TestExceptionOnNothingToGenerate/pom.xml | 2 +- .../Oasp4JTemplateTest/TestNothingToGenerate/pom.xml | 2 +- .../TestPackageInputDataaccessGeneration/pom.xml | 4 ++-- 14 files changed, 34 insertions(+), 34 deletions(-) diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml index b77125f577..1976c7ac53 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml @@ -42,12 +42,12 @@ com.devonfw.cobigen javaplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen tsplugin - 7.1.0-SNAPSHOT + 7.1.0 diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestDifferentFileSystems/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestDifferentFileSystems/pom.xml index 1170e90645..64ba5a5e28 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestDifferentFileSystems/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestDifferentFileSystems/pom.xml @@ -47,12 +47,12 @@ com.devonfw.cobigen openapiplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen javaplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen @@ -67,7 +67,7 @@ com.devonfw.cobigen tsplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen @@ -77,7 +77,7 @@ com.devonfw.cobigen textmerger - 7.1.0-SNAPSHOT + 7.1.0 diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml index 022c6fa019..03e7d3febb 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml @@ -42,7 +42,7 @@ com.devonfw.cobigen javaplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen @@ -52,17 +52,17 @@ com.devonfw.cobigen openapiplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen tsplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen propertyplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen @@ -72,7 +72,7 @@ com.devonfw.cobigen textmerger - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen @@ -87,7 +87,7 @@ com.devonfw.cobigen tsplugin - 7.1.0-SNAPSHOT + 7.1.0 diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml index 13c8829216..445fe5bf71 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml @@ -37,7 +37,7 @@ com.devonfw.cobigen javaplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen @@ -47,17 +47,17 @@ com.devonfw.cobigen openapiplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen tsplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen propertyplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen @@ -67,7 +67,7 @@ com.devonfw.cobigen textmerger - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml index af85fcd77c..e0412ad107 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml @@ -43,7 +43,7 @@ com.devonfw.cobigen javaplugin - 7.1.0-SNAPSHOT + 7.1.0 diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestNothingToGenerate/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestNothingToGenerate/pom.xml index b77125f577..1976c7ac53 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestNothingToGenerate/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestNothingToGenerate/pom.xml @@ -42,12 +42,12 @@ com.devonfw.cobigen javaplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen tsplugin - 7.1.0-SNAPSHOT + 7.1.0 diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml index 68f39a6a90..d90538a431 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml @@ -47,7 +47,7 @@ com.devonfw.cobigen javaplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen @@ -57,12 +57,12 @@ com.devonfw.cobigen openapiplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen tsplugin - 7.1.0-SNAPSHOT + 7.1.0 diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml index e07fca34b4..3cd7076b79 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml @@ -42,7 +42,7 @@ com.devonfw.cobigen javaplugin - 7.1.0-SNAPSHOT + 7.1.0 diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestDifferentFileSystems/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestDifferentFileSystems/pom.xml index 7aa269ccc5..048f6c5552 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestDifferentFileSystems/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestDifferentFileSystems/pom.xml @@ -47,12 +47,12 @@ com.devonfw.cobigen openapiplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen javaplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen @@ -67,7 +67,7 @@ com.devonfw.cobigen tsplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml index 2e268a504b..19336860f6 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml @@ -47,7 +47,7 @@ com.devonfw.cobigen javaplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen @@ -57,7 +57,7 @@ com.devonfw.cobigen openapiplugin - 7.1.0-SNAPSHOT + 7.1.0 diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml index ac70a8567c..bfe846f6bf 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml @@ -42,7 +42,7 @@ com.devonfw.cobigen javaplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml index 3649c580d4..82017414b0 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml @@ -43,7 +43,7 @@ com.devonfw.cobigen javaplugin - 7.1.0-SNAPSHOT + 7.1.0 diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestNothingToGenerate/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestNothingToGenerate/pom.xml index e07fca34b4..3cd7076b79 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestNothingToGenerate/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestNothingToGenerate/pom.xml @@ -42,7 +42,7 @@ com.devonfw.cobigen javaplugin - 7.1.0-SNAPSHOT + 7.1.0 diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml index 3d0a452b3f..30d1f3c95e 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml @@ -47,7 +47,7 @@ com.devonfw.cobigen javaplugin - 7.1.0-SNAPSHOT + 7.1.0 com.devonfw.cobigen @@ -57,7 +57,7 @@ com.devonfw.cobigen openapiplugin - 7.1.0-SNAPSHOT + 7.1.0 From 29d4a42d71ea0e1c3fa2a1719df0a1b58517a305 Mon Sep 17 00:00:00 2001 From: MikeSchumacher Date: Mon, 14 Dec 2020 10:35:14 +0100 Subject: [PATCH 6/8] downgraded template dependency for testing --- .../TestEntityInputDataaccessGeneration/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml index 03e7d3febb..3a9663534d 100644 --- a/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml +++ b/cobigen-maven/cobigen-maven-systemtest/src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml @@ -37,7 +37,7 @@ com.devonfw.cobigen templates-devon4j - 20.08.002 + 3.1.8 com.devonfw.cobigen From eb4e0da9979865090318b05c0263e0b358469f7f Mon Sep 17 00:00:00 2001 From: MikeSchumacher Date: Mon, 14 Dec 2020 11:13:17 +0100 Subject: [PATCH 7/8] #1296 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 89a3550968..1c68c66507 100644 --- a/documentation/master-cobigen.asciidoc +++ b/documentation/master-cobigen.asciidoc @@ -12,7 +12,7 @@ DISCLAIMER: All Cobigen plugins are compatible with the latest release of Devonf **Current versions:** * CobiGen - Eclipse Plug-in v5.2.1 -* CobiGen - Maven Build Plug-in v7.0.0 +* CobiGen - Maven Build Plug-in v7.1.0 * CobiGen CLI v1.2.0 --- From 28de2daa3040c7a5d11628c9ae3a580d07b5b915 Mon Sep 17 00:00:00 2001 From: MikeSchumacher Date: Mon, 14 Dec 2020 11:13:20 +0100 Subject: [PATCH 8/8] #1296 Set release version --- cobigen-maven/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cobigen-maven/pom.xml b/cobigen-maven/pom.xml index e475365f9f..914f1ea876 100644 --- a/cobigen-maven/pom.xml +++ b/cobigen-maven/pom.xml @@ -13,7 +13,7 @@ 3.0 - 7.1.0-SNAPSHOT + 7.1.0