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/TestCleanerPluginLiquibase.java

@@ -0,0 +1,45 @@
+package com.devonfw.module.test.common.base.clean;
+
+import javax.inject.Inject;
+import liquibase.Liquibase;
+
+/**
+ * @author ayudixit
+ *
+ */
+public class TestCleanerPluginLiquibase implements TestCleanerPlugin {
+
+  @Inject
+  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 (Exception e) {
+      e.printStackTrace();
+    }
+
+  }
+
+}

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,73 @@
-<?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" standalone="no"?>
+<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/maven/archetype-metadata.xml

@@ -13,6 +13,10 @@
       <defaultValue>h2</defaultValue>
       <!-- <validationRegex>h2|postgresql|mysql|mariadb|oracle|hana|db2</validationRegex> -->
     </requiredProperty>
+    <requiredProperty key="dbMigration">  
+      <defaultValue>flyway</defaultValue> 
+      <!-- <validationRegex>flyway|liquibase</validationRegex> -->  
+    </requiredProperty>
     <requiredProperty key="batch">
       <defaultValue>.</defaultValue>
       <validationRegex>batch|[.]</validationRegex>

templates/server/src/main/resources/archetype-resources/__batch__/src/test/java/__packageInPathFormat__/general/batch/base/test/SpringBatchIntegrationTest.java

@@ -1,53 +1,73 @@
-package ${package}.general.batch.base.test;
-
-import javax.inject.Inject;
-
-import org.flywaydb.core.Flyway;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.batch.core.Job;
-import org.springframework.batch.core.launch.JobLauncher;
-import org.springframework.batch.test.JobLauncherTestUtils;
-
-import ${package}.general.common.base.test.TestUtil;
-import com.devonfw.module.test.common.base.ComponentTest;
-
-/**
- * Base class for all spring batch integration tests. It helps to do End-to-End job tests.
- */
-public abstract class SpringBatchIntegrationTest extends ComponentTest {
-
-  @Inject
-  private JobLauncher jobLauncher;
-
-  @Inject
-  private Flyway flyway;
-
-  @Override
-  protected void doSetUp() {
-
-    super.doSetUp();
-    this.flyway.clean();
-    this.flyway.migrate();
-  }
-
-  @Override
-  protected void doTearDown() {
-
-    super.doTearDown();
-    TestUtil.logout();
-  }
-
-  /**
-   * @param job job to configure
-   * @return jobLauncherTestUtils
-   */
-  public JobLauncherTestUtils getJobLauncherTestUtils(Job job) {
-
-    JobLauncherTestUtils jobLauncherTestUtils = new JobLauncherTestUtils();
-    jobLauncherTestUtils.setJob(job);
-    jobLauncherTestUtils.setJobLauncher(this.jobLauncher);
-
-    return jobLauncherTestUtils;
-  }
-}
+package ${package}.general.batch.base.test;
+
+import javax.inject.Inject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.batch.core.Job;
+import org.springframework.batch.core.launch.JobLauncher;
+import org.springframework.batch.test.JobLauncherTestUtils;
+import ${package}.general.common.base.test.TestUtil;
+import com.devonfw.module.test.common.base.ComponentTest;
+#if ($dbMigration == 'liquibase')  
+  import liquibase.Liquibase;
+#else 
+ import org.flywaydb.core.Flyway;
+#end
+
+/**
+ * Base class for all spring batch integration tests. It helps to do End-to-End job tests.
+ */
+public abstract class SpringBatchIntegrationTest extends ComponentTest {
+
+  @Inject
+  private JobLauncher jobLauncher;
+
+  #if ($dbMigration == 'liquibase')  
+    @Inject
+    private Liquibase liquibase;
+  #else 
+    @Inject
+    private Flyway flyway;
+  #end
+
+  #if ($dbMigration == 'liquibase')  
+    @Override
+    protected void doSetUp() {
+      super.doSetUp();
+      try {
+        this.liquibase.dropAll();
+      } catch (Exception e) {
+        e.printStackTrace();
+      }
+    }
+  #else 
+    @Override
+    protected void doSetUp() {
+
+      super.doSetUp();
+      this.flyway.clean();
+      this.flyway.migrate();
+    }
+  #end
+
+
+  @Override
+  protected void doTearDown() {
+
+    super.doTearDown();
+    TestUtil.logout();
+  }
+
+  /**
+   * @param job job to configure
+   * @return jobLauncherTestUtils
+   */
+  public JobLauncherTestUtils getJobLauncherTestUtils(Job job) {
+
+    JobLauncherTestUtils jobLauncherTestUtils = new JobLauncherTestUtils();
+    jobLauncherTestUtils.setJob(job);
+    jobLauncherTestUtils.setJobLauncher(this.jobLauncher);
+
+    return jobLauncherTestUtils;
+  }
+}