Skip to content

Commit 54e3436

Browse files
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
1 parent ad233ff commit 54e3436

File tree

55 files changed

+9871
-146
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+9871
-146
lines changed

cobigen-cli/cli-systemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/AbstractCliTest.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -98,13 +98,13 @@ public static void determineDevTemplatesPath() throws URISyntaxException, IOExce
9898
}
9999
}
100100

101-
if (path.getFileName().toString().equals("templates-devon4j-utils")) {
102-
if (Files.exists(path.resolve("pom.xml"))) {
103-
try {
104-
Files.delete(path.resolve("pom.xml"));
105-
} catch (IOException e) {
106-
throw new IOException("Error deleting file " + path.resolve("pom.xml"), e);
107-
}
101+
// Replace the pom.xml in the template sets. Needed so that the project in the temp directory is build
102+
// properly
103+
if (Files.exists(path.resolve("pom.xml"))) {
104+
try {
105+
Files.delete(path.resolve("pom.xml"));
106+
} catch (IOException e) {
107+
throw new IOException("Error deleting file " + path.resolve("pom.xml"), e);
108108
}
109109
try {
110110
Files.copy(utilsPom, path.resolve("pom.xml"));

cobigen-templates/crud-angular-client-app/pom.xml

+7
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,11 @@
1010
<version>${revision}</version>
1111
</parent>
1212

13+
<dependencies>
14+
<dependency>
15+
<groupId>org.apache.commons</groupId>
16+
<artifactId>commons-lang3</artifactId>
17+
</dependency>
18+
</dependencies>
19+
1320
</project>

0 commit comments

Comments
 (0)