Skip to content

Commit

Permalink
Merge branch 'dev_mavenplugin'
Browse files Browse the repository at this point in the history
  • Loading branch information
@MikeSchumacherCapgemini
MikeSchumacherCapgemini committed Dec 14, 2020
2 parents e69e28e + 28de2da commit 199b297
Show file tree
Hide file tree
Showing 19 changed files with 88 additions and 71 deletions.
4 changes: 2 additions & 2 deletions cobigen-maven/cobigen-maven-plugin/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>core</artifactId>
<version>7.0.0</version>
<version>7.1.0</version>
</dependency>
<!-- Fix API version to not get any old injected by any plug-in -->
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>core-api</artifactId>
<version>7.0.0</version>
<version>7.1.0</version>
</dependency>

<!-- dependencies to annotations -->
Expand Down
6 changes: 3 additions & 3 deletions ...ources/testdata/systemtest/Devon4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tempeng-freemarker</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>javaplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tsplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
18 changes: 9 additions & 9 deletions ...c/test/resources/testdata/systemtest/Devon4JTemplateTest/TestDifferentFileSystems/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,47 +37,47 @@
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>templates-devon4j</artifactId>
<version>20.08.001-SNAPSHOT</version>
<version>20.08.002</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tempeng-freemarker</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>openapiplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>javaplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>xmlplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>htmlplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tsplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>jsonplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>textmerger</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
20 changes: 10 additions & 10 deletions ...urces/testdata/systemtest/Devon4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,52 +42,52 @@
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>javaplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>xmlplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>openapiplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tsplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>propertyplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>htmlplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>textmerger</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tempeng-velocity</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tempeng-freemarker</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tsplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
18 changes: 9 additions & 9 deletions ...temtest/Devon4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,47 +37,47 @@
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>javaplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>xmlplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>openapiplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tsplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>propertyplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>htmlplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>textmerger</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tempeng-velocity</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tempeng-freemarker</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions ...esources/testdata/systemtest/Devon4JTemplateTest/TestExceptionOnNothingToGenerate/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tempeng-freemarker</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>javaplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
6 changes: 3 additions & 3 deletions .../src/test/resources/testdata/systemtest/Devon4JTemplateTest/TestNothingToGenerate/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tempeng-freemarker</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>javaplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tsplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
10 changes: 5 additions & 5 deletions ...rces/testdata/systemtest/Devon4JTemplateTest/TestPackageInputDataaccessGeneration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,27 +42,27 @@
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tempeng-freemarker</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>javaplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>xmlplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>openapiplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tsplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
4 changes: 2 additions & 2 deletions ...sources/testdata/systemtest/Oasp4JTemplateTest/TestClassLoadingWithTemplateFolder/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tempeng-freemarker</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>javaplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
14 changes: 7 additions & 7 deletions ...rc/test/resources/testdata/systemtest/Oasp4JTemplateTest/TestDifferentFileSystems/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,37 +42,37 @@
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tempeng-freemarker</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>openapiplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>javaplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>xmlplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>htmlplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tsplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>jsonplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
8 changes: 4 additions & 4 deletions ...ources/testdata/systemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGeneration/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,22 +42,22 @@
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tempeng-freemarker</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>javaplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>xmlplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>openapiplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
6 changes: 3 additions & 3 deletions ...stemtest/Oasp4JTemplateTest/TestEntityInputDataaccessGenerationWithTemplateFolder/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,17 +37,17 @@
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>tempeng-freemarker</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>javaplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.1.0</version>
</dependency>
<dependency>
<groupId>com.devonfw.cobigen</groupId>
<artifactId>xmlplugin</artifactId>
<version>7.0.0-SNAPSHOT</version>
<version>7.0.0</version>
</dependency>
</dependencies>
</plugin>
Expand Down
Loading

0 comments on commit 199b297

Please sign in to comment.