Feature/liquibase configuration

modules/test-jpa/pom.xml

@@ -24,6 +24,12 @@
     <dependency>
       <groupId>org.flywaydb</groupId>
       <artifactId>flyway-core</artifactId>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.liquibase</groupId>
+      <artifactId>liquibase-core</artifactId>
+      <optional>true</optional>
     </dependency>
   </dependencies>
 </project>

modules/test-jpa/src/main/java/com/devonfw/module/test/common/base/clean/TestCleanerPluginFlyway.java

@@ -3,12 +3,14 @@
 import javax.inject.Inject;
 
 import org.flywaydb.core.Flyway;
+import org.springframework.beans.factory.annotation.Qualifier;
 
 /**
  * Implementation of {@link TestCleanerPlugin} base on {@link Flyway}. It will {@link Flyway#clean() clean} and
  * {@link Flyway#migrate() migrate} on {@link #cleanup()}. Therefore after {@link #cleanup()} only DDL and master-data
  * will be left in the database.
  */
+@Qualifier("testCleanerPluginflyway")
 public class TestCleanerPluginFlyway implements TestCleanerPlugin {
 
   @Inject

modules/test-jpa/src/main/java/com/devonfw/module/test/common/base/clean/TestCleanerPluginLiquibase.java

@@ -0,0 +1,46 @@
+package com.devonfw.module.test.common.base.clean;
+
+import javax.inject.Inject;
+
+import org.springframework.beans.factory.annotation.Qualifier;
+import liquibase.Liquibase;
+import liquibase.exception.DatabaseException;
+
+/**
+ * Implementation of {@link TestCleanerPlugin} base on {@link Liquibase}. It will {@link Liquibase#dropAll() clean} on
+ * {@link #cleanup()}. Therefore after {@link #cleanup()} it will drop all database objects.
+ */
+@Qualifier("testCleanerPluginliquibase")
+public class TestCleanerPluginLiquibase implements TestCleanerPlugin {
+
+  private Liquibase liquibase;
+
+  /**
+   * The constructor.
+   */
+  public TestCleanerPluginLiquibase() {
+
+    super();
+  }
+
+  /**
+   * The constructor.
+   *
+   * @param liquibase the {@link Liquibase} instance.
+   */
+  public TestCleanerPluginLiquibase(Liquibase liquibase) {
+
+    super();
+    this.liquibase = liquibase;
+  }
+
+  @Override
+  public void cleanup() {
+    try {
+      this.liquibase.dropAll();
+    } catch(DatabaseException databaseException ) {
+      throw new RuntimeException(databaseException);
+    }
+  }
+
+}

modules/test/src/main/resources/logback.xml

@@ -16,6 +16,7 @@
   <!-- Minimize infrastructure debug logs -->
   <logger name="com.github.dozermapper" level="INFO"/>
   <logger name="org.flywaydb" level="INFO"/>
+  <logger name="liquibase.Liquibase" level="INFO"/>
   <logger name="org.springframework" level="INFO"/>
   <logger name="org.hibernate" level="INFO"/>
   <logger name="kafka" level="WARN"/>

pom.xml

@@ -1,67 +1,67 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.devonfw</groupId>
-    <artifactId>maven-parent</artifactId>
-    <version>6</version>
-  </parent>
-  <groupId>com.devonfw.java.dev</groupId>
-  <artifactId>devon4j</artifactId>
-  <version>dev-SNAPSHOT</version> <!-- This POM will never be released -->
-  <packaging>pom</packaging>
-  <name>${project.artifactId}</name>
-  <description>Java stack of devonfw.com (devon4j): develop Java apps standardized, faster and with less risk.</description>
-  <inceptionYear>2014</inceptionYear>
-
-  <modules>
-    <module>boms</module>
-    <module>modules</module>
-    <module>starters</module>
-    <module>templates</module>
-    <module>documentation</module>
-  </modules>
-
-  <properties>
-    <revision>dev-SNAPSHOT</revision>
-    <github.repository>devon4j</github.repository>
-    <devon4j.version>${revision}</devon4j.version>
-    <spring.boot.version>2.4.4</spring.boot.version>
-    <!-- Spring boot and spring cloud version has to match -->
-    <spring.cloud.dependencies.version>2020.0.0</spring.cloud.dependencies.version>
-    <jackson.version>2.12.2</jackson.version> <!-- Overriding Jackson for fixing vulnerabilities -->
-    <guava.version>30.1.1-jre</guava.version>
-    <junit.version>5.7.1</junit.version>
-    <cxf.version>3.4.3</cxf.version>
-    <mmm.util.version>8.7.0</mmm.util.version>
-    <slf4j.version>1.7.30</slf4j.version>
-    <sonar.host.url>https://sonarcloud.io</sonar.host.url>
-    <sonar.organization>devonfw</sonar.organization>
-  </properties>
-
-  <build>
-    <plugins>
-
-      <!-- avoid version in local war files, exclude development properties from WARs -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-war-plugin</artifactId>
-        <configuration>
-          <packagingExcludes>WEB-INF/classes/config/application.properties,*.jsp</packagingExcludes>
-          <warName>${project.artifactId}</warName>
-        </configuration>
-      </plugin>
-
-    </plugins>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.springframework.boot</groupId>
-          <artifactId>spring-boot-maven-plugin</artifactId>
-          <version>${spring.boot.version}</version>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.devonfw</groupId>
+    <artifactId>maven-parent</artifactId>
+    <version>6</version>
+  </parent>
+  <groupId>com.devonfw.java.dev</groupId>
+  <artifactId>devon4j</artifactId>
+  <version>dev-SNAPSHOT</version> <!-- This POM will never be released -->
+  <packaging>pom</packaging>
+  <name>${project.artifactId}</name>
+  <description>Java stack of devonfw.com (devon4j): develop Java apps standardized, faster and with less risk.</description>
+  <inceptionYear>2014</inceptionYear>
+
+  <modules>
+    <module>boms</module>
+    <module>modules</module>
+    <module>starters</module>
+    <module>templates</module>
+    <module>documentation</module>
+  </modules>
+
+  <properties>
+    <revision>dev-SNAPSHOT</revision>
+    <github.repository>devon4j</github.repository>
+    <devon4j.version>${revision}</devon4j.version>
+    <spring.boot.version>2.4.4</spring.boot.version>
+    <!-- Spring boot and spring cloud version has to match -->
+    <spring.cloud.dependencies.version>2020.0.0</spring.cloud.dependencies.version>
+    <jackson.version>2.12.2</jackson.version> <!-- Overriding Jackson for fixing vulnerabilities -->
+    <guava.version>30.1.1-jre</guava.version>
+    <junit.version>5.7.1</junit.version>
+    <cxf.version>3.4.3</cxf.version>
+    <mmm.util.version>8.7.0</mmm.util.version>
+    <slf4j.version>1.7.30</slf4j.version>
+    <sonar.host.url>https://sonarcloud.io</sonar.host.url>
+    <sonar.organization>devonfw</sonar.organization>
+  </properties>
+
+  <build>
+    <plugins>
+
+      <!-- avoid version in local war files, exclude development properties from WARs -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <configuration>
+          <packagingExcludes>WEB-INF/classes/config/application.properties,*.jsp</packagingExcludes>
+          <warName>${project.artifactId}</warName>
+        </configuration>
+      </plugin>
+
+    </plugins>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.springframework.boot</groupId>
+          <artifactId>spring-boot-maven-plugin</artifactId>
+          <version>${spring.boot.version}</version>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+</project>

templates/pom.xml

@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.devonfw.java.dev</groupId>
-    <artifactId>devon4j</artifactId>
-    <version>dev-SNAPSHOT</version>
-  </parent>
-  <artifactId>devon4j-templates</artifactId>
-  <packaging>pom</packaging>
-  <name>${project.artifactId}</name>
-  <description>Templates (maven archetypes) of devon4j.</description>
-
-  <modules>
-    <module>server</module>
-  </modules>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.devonfw.java.dev</groupId>
+    <artifactId>devon4j</artifactId>
+    <version>dev-SNAPSHOT</version>
+  </parent>
+  <artifactId>devon4j-templates</artifactId>
+  <packaging>pom</packaging>
+  <name>${project.artifactId}</name>
+  <description>Templates (maven archetypes) of devon4j.</description>
+
+  <modules>
+    <module>server</module>
+  </modules>
+
+</project>

templates/server/src/main/resources/META-INF/archetype-post-generate.groovy

@@ -1,30 +1,51 @@
-import java.nio.file.Files
-import java.nio.file.Path
-import java.nio.file.Paths
-import java.nio.file.LinkOption
-
-// the path where the project got generated
-Path projectPath = Paths.get(request.outputDirectory, request.artifactId)
-
-// the properties available to the archetype
-Properties properties = request.properties
-String batch = properties.get("batch")
-
-if (batch != "batch") {
-  // delete folder batch recursively
-  Path rootPath = projectPath.resolve("batch")
-  deleteDirectoryRecursion(rootPath)
-}
-
-void deleteDirectoryRecursion(Path path) {
-  if (Files.isDirectory(path, LinkOption.NOFOLLOW_LINKS)) {
-    try {
-      for (Path entry : Files.newDirectoryStream(path)) {
-        deleteDirectoryRecursion(entry);
-      }
-    } catch(IOException e) {
-      e.printStackTrace()
-    }
-  }
-  Files.delete(path);
-}
+import java.nio.file.Files
+import java.nio.file.Path
+import java.nio.file.Paths
+import java.nio.file.LinkOption
+
+// the path where the project got generated
+Path projectPath = Paths.get(request.outputDirectory, request.artifactId)
+
+// the properties available to the archetype
+Properties properties = request.properties
+
+String batch = properties.get("batch")
+
+if (batch != "batch") {
+  // delete folder batch recursively
+  Path rootPath = projectPath.resolve("batch")
+  deleteDirectoryRecursion(rootPath)
+}
+
+//dbMigration is either flyway or liquibase
+String dbMigration = properties.get("dbMigration")
+
+if (dbMigration == "flyway") {
+//delete changelog and testchangelog folder which is not required for flyway
+  Path rootPath = projectPath.resolve("core/src/main/resources/db/changelog")
+  deleteDirectoryRecursion(rootPath)
+
+  Files.deleteIfExists projectPath.resolve("core/src/test/resources/db/test/changelog-master.xml")
+  Files.deleteIfExists projectPath.resolve("core/src/test/resources/db/test/changelog-v1.0.xml")
+
+} else if(dbMigration == "liquibase") {
+//delete migration and test folder which is not required for liquibase
+  Path rootPath = projectPath.resolve("core/src/main/resources/db/migration")
+  deleteDirectoryRecursion(rootPath)
+
+  Files.deleteIfExists projectPath.resolve("core/src/test/resources/db/test/V0001__InitDb.sql")
+
+}
+
+void deleteDirectoryRecursion(Path path) {
+  if (Files.isDirectory(path, LinkOption.NOFOLLOW_LINKS)) {
+    try {
+      for (Path entry : Files.newDirectoryStream(path)) {
+        deleteDirectoryRecursion(entry);
+      }
+    } catch(IOException e) {
+      e.printStackTrace()
+    }
+  }
+  Files.delete(path);
+}