1501 Separation of Java Utils across template sets (#1514)

* Adjust documentation (#1491) * fixed some types and links and corrected some parts of the documentation * adjust angular client guide * fixed typo * fixed requested changes * implemented new template set configuration reader * added new tests to check if the ContextConfigurationSetReader is able to find all context configurations properly * added new tests to check if the ContextConfigurationSetReader is able to find all context configurations properly * adapted cli and template tests for correct use of template sets * implemented requested changes * implemented requested changes * Loading of util classes from devon4j-template * implemented loading of util classes from template-sets. Fixed template and cli tests * added Javadoc * fix compilation error in tempalte test * fixed that the templates folder always was created * fix TemplateProcessingTest * seperation of util classes * implemented requested changes * implemented requested changes * changed template test * changed abstractclitest * adapted getJarFile to use Path instead of File * ignore Eclipse AdapteTemplatesTest * changed downloadJar * changed getJarFile from file to path in eclipse project * updated jackson-databind version
devonfw · Apr 8, 2022 · 54e3436 · 54e3436
1 parent ad233ff
commit 54e3436
Show file tree

Hide file tree

Showing 55 changed files with 9,871 additions and 146 deletions.
diff --git a/...-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/AbstractCliTest.java b/...-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/AbstractCliTest.java
@@ -98,13 +98,13 @@ public static void determineDevTemplatesPath() throws URISyntaxException, IOExce
             }
           }
 
-          if (path.getFileName().toString().equals("templates-devon4j-utils")) {
-            if (Files.exists(path.resolve("pom.xml"))) {
-              try {
-                Files.delete(path.resolve("pom.xml"));
-              } catch (IOException e) {
-                throw new IOException("Error deleting file " + path.resolve("pom.xml"), e);
-              }
+          // Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
+          // properly
+          if (Files.exists(path.resolve("pom.xml"))) {
+            try {
+              Files.delete(path.resolve("pom.xml"));
+            } catch (IOException e) {
+              throw new IOException("Error deleting file " + path.resolve("pom.xml"), e);
             }
             try {
               Files.copy(utilsPom, path.resolve("pom.xml"));

diff --git a/cobigen-templates/crud-angular-client-app/pom.xml b/cobigen-templates/crud-angular-client-app/pom.xml
@@ -10,4 +10,11 @@
     <version>${revision}</version>
   </parent>
 
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+    </dependency>
+  </dependencies>
+
 </project>