From c4f9ff41bfc48d661d70fb3034ca148d9f857157 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 07:51:27 +0200
Subject: [PATCH 01/49] Updated maven-assembly-plugin to 3.3.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1070773f1..be6853b2b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,7 +153,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-assembly-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.3.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

From 347c2f3f336d0c33251406c9820c83625928ae05 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 08:06:24 +0200
Subject: [PATCH 02/49] Updated maven-compiler-plugin to 3.8.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index be6853b2b..397f4deb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -163,7 +163,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.0</version>
+                    <version>3.8.1</version>
                     <configuration>
                         <source>1.8</source>
                         <target>1.8</target>

From 2af5a130bf7672a11b6fb3ee768fcdffa96689da Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 10:02:33 +0200
Subject: [PATCH 03/49] Updated maven-javadoc-plugin to 3.2.0

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 397f4deb4..9667841fc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,22 +180,22 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-ear-plugin</artifactId>
-                    <version>3.0.1</version>
+                    <version>3.0.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>3.0.0-M2</version>
+                    <version>3.0.0-M3</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.1.1</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>3.1.0</version>
+                    <version>3.2.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

From 7b3bb7807762ca9cadb8f75b5594ed8891724cfc Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 10:53:04 +0200
Subject: [PATCH 04/49] Updated maven-pmd-plugin to 3.13.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9667841fc..049c611d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -200,7 +200,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-pmd-plugin</artifactId>
-                    <version>3.11.0</version>
+                    <version>3.13.0</version>
                     <configuration>
                         <linkXref>true</linkXref>
                         <sourceEncoding>utf-8</sourceEncoding>

From b0198d284b9242a4b13f7e8ae0925a7e4faf786b Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 12:43:41 +0200
Subject: [PATCH 05/49] Updated maven-project-info-reports-plugin to 3.1.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 049c611d6..bac9adfae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -236,7 +236,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-project-info-reports-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

From 3b4d77acbb6a96fa08f4a3a6c18f2f69a58cd9bd Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 12:44:05 +0200
Subject: [PATCH 06/49] Updated maven-release-plugin to 3.0.0-M1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bac9adfae..c8e96e54d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -241,7 +241,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.3</version>
+                    <version>3.0.0-M1</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

From a629e933c942a0c2add84adfea521102593549e1 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 13:33:34 +0200
Subject: [PATCH 07/49] Updated maven-surefire-plugin to 3.0.0-M4

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c8e96e54d..f5651b744 100644
--- a/pom.xml
+++ b/pom.xml
@@ -246,7 +246,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>3.0.0-M3</version>
+                    <version>3.0.0-M4</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>

From 268424323cf628f24440759a1f3c5f4a5ccc9757 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 14:02:27 +0200
Subject: [PATCH 08/49] Updated maven-war-plugin to 3.3.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f5651b744..158eda849 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,7 +256,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-war-plugin</artifactId>
-                    <version>3.2.2</version>
+                    <version>3.3.0</version>
                 </plugin>
                 
                 <!--

From 01ce9f37f348722b28103f28fc647113077f372a Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 14:10:32 +0200
Subject: [PATCH 09/49] Updated maven-exec-plugin to 3.0.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 158eda849..7ea0b40d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -265,7 +265,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>exec-maven-plugin</artifactId>
-                    <version>1.6.0</version>
+                    <version>3.0.0</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.eirslett</groupId>

From 82d2038395d40fbfaf2d1ebbe0ddf0384ab96b49 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 14:18:43 +0200
Subject: [PATCH 10/49] Updated frontend-maven-plugin to 1.10.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 7ea0b40d7..3997e72fa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -270,7 +270,7 @@
                 <plugin>
                     <groupId>com.github.eirslett</groupId>
                     <artifactId>frontend-maven-plugin</artifactId>
-                    <version>1.7.6</version>
+                    <version>1.10.0</version>
                 </plugin>
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>

From 123b6dc10a1ed3659b193a59bc47218b404b7221 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 14:51:54 +0200
Subject: [PATCH 11/49] Updated spotbugs-maven-plugin to 4.0.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3997e72fa..489fb340e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -275,7 +275,7 @@
                 <plugin>
                     <groupId>com.github.spotbugs</groupId>
                     <artifactId>spotbugs-maven-plugin</artifactId>
-                    <version>3.1.11</version>
+                    <version>4.0.0</version>
                     <configuration>
                         <findbugsXmlOutput>true</findbugsXmlOutput>
                         <xmlOutput>true</xmlOutput>

From a5cc77e36b60e10e55c6434ea62e3d5df454d399 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 14:59:00 +0200
Subject: [PATCH 12/49] Updated thorntail-maven-plugin to 2.7.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 489fb340e..4fb1ad533 100644
--- a/pom.xml
+++ b/pom.xml
@@ -297,7 +297,7 @@
                 <plugin>
                     <groupId>io.thorntail</groupId>
                     <artifactId>thorntail-maven-plugin</artifactId>
-                    <version>2.4.0.Final</version>
+                    <version>2.7.0.Final</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>

From 72c1679196a611da383ffdd61031d0c624b8b876 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 15:08:42 +0200
Subject: [PATCH 13/49] Update build-helper-maven-plugin to 3.1.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4fb1ad533..85f67b1b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -302,7 +302,7 @@
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>build-helper-maven-plugin</artifactId>
-                    <version>3.0.0</version>
+                    <version>3.1.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>

From f1db526ac6b8ad21e8165092a1587edd244d011a Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 15:09:14 +0200
Subject: [PATCH 14/49] Removed findbugs-maven-plugin (replaced with
 spotbugs-maven-plugin)

---
 pom.xml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 85f67b1b8..980bddbe8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,23 +304,6 @@
                     <artifactId>build-helper-maven-plugin</artifactId>
                     <version>3.1.0</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>findbugs-maven-plugin</artifactId>
-                    <version>3.0.5</version>
-                    <configuration>
-                        <findbugsXmlOutput>true</findbugsXmlOutput>
-                        <xmlOutput>true</xmlOutput>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>findbugs</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>

From 38f9105405f204cd503d526503a8934133c1a477 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 15:18:59 +0200
Subject: [PATCH 15/49] Updated jacoco-maven-plugin to 0.8.5

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 980bddbe8..095a77158 100644
--- a/pom.xml
+++ b/pom.xml
@@ -312,7 +312,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.3</version>
+                    <version>0.8.5</version>
                 </plugin>
                 <plugin>
                     <groupId>org.wildfly.plugins</groupId>

From 89b074c4fd0293f75e9f940dabdccb4bb3f224f7 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 15:19:49 +0200
Subject: [PATCH 16/49] Updated wildfly-maven-plugin to 2.0.2.FINAL

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 095a77158..49ad61413 100644
--- a/pom.xml
+++ b/pom.xml
@@ -317,7 +317,7 @@
                 <plugin>
                     <groupId>org.wildfly.plugins</groupId>
                     <artifactId>wildfly-maven-plugin</artifactId>
-                    <version>2.0.1.Final</version>
+                    <version>2.0.2.Final</version>
                 </plugin>
             </plugins>
         </pluginManagement>

From be1c41b2d7fcf070d05932dc2164e087be281682 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 15:20:44 +0200
Subject: [PATCH 17/49] Removed version in build/plugins. All plugin versions
 are managed in build/pluginManagement

---
 pom.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 49ad61413..1ebe1e7c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -326,7 +326,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>3.1.0</version>
                 <configuration>
                     <excludeDefaultDirectories>true</excludeDefaultDirectories>
                     <filesets>

From 97533b7c04bc9b50d5405abcf11c68cb26809949 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 21:17:14 +0200
Subject: [PATCH 18/49] Fixed typo in module name

---
 ccm-archetype-module/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ccm-archetype-module/pom.xml b/ccm-archetype-module/pom.xml
index 5d2a09390..158f56063 100644
--- a/ccm-archetype-module/pom.xml
+++ b/ccm-archetype-module/pom.xml
@@ -12,7 +12,7 @@
     <artifactId>ccm-archetype-module</artifactId>
     <version>7.0.0-SNAPSHOT</version>
   
-    <name>LibreCCM Module archetype</name>
+    <name>LibreCCM Module Archetype</name>
     <url>http://www.libreccm.org/devel/modules</url>
   
 </project>

From 26e1bfe74cc746de0420b63549454883d60e2046 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Mon, 22 Jun 2020 21:29:34 +0200
Subject: [PATCH 19/49] removed versions from modules. all versions should be
 managed by the dependencyManagement and pluginManagement sections in the
 parent POM

---
 ccm-bundle-devel-thorntail/pom.xml   |  9 ------
 ccm-bundle-devel-wildfly-web/pom.xml | 18 -----------
 ccm-bundle-devel-wildfly/pom.xml     |  1 -
 ccm-core/pom.xml                     |  8 -----
 ccm-docrepo/pom.xml                  |  2 --
 ccm-shortcuts/pom.xml                |  1 -
 pom.xml                              | 48 ++++++++++++++++++++++++++++
 7 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/ccm-bundle-devel-thorntail/pom.xml b/ccm-bundle-devel-thorntail/pom.xml
index dc1a04f60..6178bfbf9 100644
--- a/ccm-bundle-devel-thorntail/pom.xml
+++ b/ccm-bundle-devel-thorntail/pom.xml
@@ -3,12 +3,6 @@
 
     <modelVersion>4.0.0</modelVersion>
 
-    <!--<parent>
-        <groupId>org.libreccm</groupId>
-        <artifactId>libreccm-parent</artifactId>
-        <version>7.0.0-SNAPSHOT</version>
-    </parent>-->
-    
     <parent>
         <groupId>org.libreccm</groupId>
         <artifactId>ccm-bundle-devel</artifactId>
@@ -142,17 +136,14 @@
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>font-awesome</artifactId>
-            <version>4.7.0</version>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>requirejs</artifactId>
-            <version>2.3.6</version>
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>requirejs-domready</artifactId>
-            <version>2.0.1-2</version>
         </dependency>
 
     </dependencies>
diff --git a/ccm-bundle-devel-wildfly-web/pom.xml b/ccm-bundle-devel-wildfly-web/pom.xml
index 821c5b196..fc67502c2 100644
--- a/ccm-bundle-devel-wildfly-web/pom.xml
+++ b/ccm-bundle-devel-wildfly-web/pom.xml
@@ -26,28 +26,19 @@
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>font-awesome</artifactId>
-            <!--<version>4.7.0</version>-->
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>requirejs</artifactId>
-            <!--<version>2.3.5</version>-->
         </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>requirejs-domready</artifactId>
-            <!--<version>2.0.1-2</version>-->
         </dependency>
         <dependency>
             <groupId>org.webjars.npm</groupId>
             <artifactId>tinymce</artifactId>
-            <!--<version>4.8.2</version>-->
         </dependency>
-        <!-- <dependency>
-            <groupId>org.librecms</groupId>
-            <artifactId>ccm-cms-js</artifactId>
-            <version>7.0.0-SNAPSHOT</version>
-        </dependency> -->
         <dependency>
             <groupId>org.librecms</groupId>
             <artifactId>ccm-cms-pagemodelseditor</artifactId>
@@ -103,15 +94,6 @@
                             <nodeVersion>v8.11.4</nodeVersion>
                         </configuration>
                     </execution>
-                    <!-- <execution>
-                        <id>npm link @libreccm/ccm-pagemodelseditor</id>
-                        <goals>
-                            <goal>npm</goal>
-                        </goals>
-                        <configuration>
-                            <arguments>link @libreccm/ccm-pagemodelseditor</arguments>
-                        </configuration>
-                    </execution> -->
                     <execution>
                         <id>npm link @librecms/ccm-cms-pagemodelseditor</id>
                         <goals>
diff --git a/ccm-bundle-devel-wildfly/pom.xml b/ccm-bundle-devel-wildfly/pom.xml
index 879f9eedc..6f3826c43 100644
--- a/ccm-bundle-devel-wildfly/pom.xml
+++ b/ccm-bundle-devel-wildfly/pom.xml
@@ -121,7 +121,6 @@
                 <dependency>
                     <groupId>org.postgresql</groupId>
                     <artifactId>postgresql</artifactId>
-                    <version>9.4.1208</version>
                 </dependency>
             </dependencies>
             
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 8c09637e8..c40da9151 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -215,7 +215,6 @@
         <dependency>
             <groupId>org.reflections</groupId>
             <artifactId>reflections</artifactId>
-            <!--<version>0.9.11</version>-->
         </dependency>
         
         <!--<dependency>
@@ -579,13 +578,11 @@
                 <dependency>
                     <groupId>org.apache.openejb</groupId>
                     <artifactId>arquillian-tomee-embedded</artifactId>
-                    <version>1.7.3</version>
                     <scope>test</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.openejb</groupId>
                     <artifactId>tomee-embedded</artifactId>
-                    <version>1.7.3</version>
                     <scope>test</scope>
                     <exclusions>
                         <exclusion>
@@ -617,19 +614,16 @@
                 <dependency>
                     <groupId>org.jboss.logmanager</groupId>
                     <artifactId>jboss-logmanager</artifactId>
-                    <version>2.0.3.Final</version>
                     <scope>test</scope>
                 </dependency>
                 <!--Required for WebServices and RESTful WebServices-->
                 <dependency>
                     <groupId>org.apache.openejb</groupId>
                     <artifactId>tomee-webservices</artifactId>
-                    <version>4.0.0</version>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.openejb</groupId>
                     <artifactId>tomee-jaxrs</artifactId>
-                    <version>1.7.3</version>
                 </dependency>
                 <dependency>
                     <groupId>com.h2database</groupId>
@@ -709,12 +703,10 @@
                 <dependency>
                     <groupId>org.apache.openejb</groupId>
                     <artifactId>arquillian-tomee-remote</artifactId>
-                    <version>1.7.3</version>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.openejb</groupId>
                     <artifactId>apache-tomee</artifactId>
-                    <version>1.7.3</version>
                     <classifier>plus</classifier>
                     <type>zip</type>
                 </dependency>
diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml
index de138394d..36c3a5208 100644
--- a/ccm-docrepo/pom.xml
+++ b/ccm-docrepo/pom.xml
@@ -270,12 +270,10 @@
             <!--<plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javancss-maven-plugin</artifactId>
-                <version>2.1</version>
             </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-project-info-reports-plugin</artifactId>
-                <!--<version>2.9</version>-->
                 <reportSets>
                     <reportSet>
                         <reports>
diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml
index 317ac9b3d..fdff0bc6e 100644
--- a/ccm-shortcuts/pom.xml
+++ b/ccm-shortcuts/pom.xml
@@ -314,7 +314,6 @@
             <!--<plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>javancss-maven-plugin</artifactId>
-                <version>2.1</version>
             </plugin>-->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/pom.xml b/pom.xml
index 1ebe1e7c9..bfddab27f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -728,6 +728,13 @@
                 <artifactId>woodstox-core-asl</artifactId>
                 <version>4.4.1</version>
             </dependency>
+            
+            <!-- PostgreSQL JDBC Driver -->
+            <dependency>
+                <groupId>org.postgresql</groupId>
+                <artifactId>postgresql</artifactId>
+                <version>42.2.14</version>
+            </dependency>
 
             <!--
                 **********************
@@ -780,6 +787,47 @@
                 <scope>test</scope>
             </dependency>
 
+            <dependency>
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>arquillian-tomee-embedded</artifactId>
+                <version>1.7.3</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>tomee-embedded</artifactId>
+                <version>1.7.3</version>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.jboss.logmanager</groupId>
+                <artifactId>jboss-logmanager</artifactId>
+                <version>2.0.3.Final</version>
+                <scope>test</scope>
+            </dependency>
+            
+            <dependency>
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>tomee-webservices</artifactId>
+                <version>4.0.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>tomee-jaxrs</artifactId>
+                <version>1.7.3</version>
+            </dependency>
+            
+            <dependency>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>arquillian-tomee-remote</artifactId>
+                    <version>1.7.3</version>
+                </dependency>
+                <dependency>
+                    <groupId>org.apache.openejb</groupId>
+                    <artifactId>apache-tomee</artifactId>
+                    <version>1.7.3</version>
+                </dependency>
+
             <!--
                 JaCoCo is used to measure the test coverage
             -->

From 3637a20aa9f31d9269445056f9ceb8d4d26aa13b Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 23 Jun 2020 07:27:43 +0200
Subject: [PATCH 20/49] Updated io.thorntail.bom to 2.7.0.Final

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bfddab27f..fe104eacf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -418,7 +418,7 @@
             <dependency>
                 <groupId>io.thorntail</groupId>
                 <artifactId>bom</artifactId>
-                <version>2.4.0.Final</version>
+                <version>2.7.0.Final</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

From 790f11606cd91a930b09bb77b087e358d268a875 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 23 Jun 2020 11:19:00 +0200
Subject: [PATCH 21/49] Updated Hibernate to 5.3.17.Final

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index fe104eacf..3d7f6ba62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -432,7 +432,7 @@
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-core</artifactId>
-                <version>5.3.15.Final</version>
+                <version>5.3.17.Final</version>
             </dependency>
 
             <!--
@@ -442,7 +442,7 @@
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-envers</artifactId>
-                <version>5.3.15.Final</version>
+                <version>5.3.17.Final</version>
             </dependency>
 
             <!--

From e3e17111ff509eab3264d6d88190714a1c68ef38 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 23 Jun 2020 12:39:09 +0200
Subject: [PATCH 22/49] Updated hibernate-validator to 6.1.5.Final, using now
 correct group id org.hibernate.validator

---
 ccm-cms-profile/pom.xml            | 4 ++--
 ccm-cms-types-agenda/pom.xml       | 4 ++--
 ccm-cms-types-bookmark/pom.xml     | 4 ++--
 ccm-cms-types-decisiontree/pom.xml | 4 ++--
 ccm-cms-types-externallink/pom.xml | 4 ++--
 ccm-cms-types-faqitem/pom.xml      | 4 ++--
 ccm-cms-types-glossaryitem/pom.xml | 4 ++--
 ccm-cms-types-minutes/pom.xml      | 4 ++--
 ccm-cms/pom.xml                    | 4 ++--
 ccm-core/pom.xml                   | 4 ++--
 ccm-docrepo/pom.xml                | 2 +-
 ccm-shortcuts/pom.xml              | 2 +-
 pom.xml                            | 9 +++++----
 13 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/ccm-cms-profile/pom.xml b/ccm-cms-profile/pom.xml
index 5593e0d0c..7b2c8c42a 100644
--- a/ccm-cms-profile/pom.xml
+++ b/ccm-cms-profile/pom.xml
@@ -64,12 +64,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/ccm-cms-types-agenda/pom.xml b/ccm-cms-types-agenda/pom.xml
index de964cfac..ab855ebac 100644
--- a/ccm-cms-types-agenda/pom.xml
+++ b/ccm-cms-types-agenda/pom.xml
@@ -64,12 +64,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/ccm-cms-types-bookmark/pom.xml b/ccm-cms-types-bookmark/pom.xml
index ec1ae219a..809962e41 100644
--- a/ccm-cms-types-bookmark/pom.xml
+++ b/ccm-cms-types-bookmark/pom.xml
@@ -64,12 +64,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/ccm-cms-types-decisiontree/pom.xml b/ccm-cms-types-decisiontree/pom.xml
index 879d5de9e..7c922d3bb 100644
--- a/ccm-cms-types-decisiontree/pom.xml
+++ b/ccm-cms-types-decisiontree/pom.xml
@@ -64,12 +64,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/ccm-cms-types-externallink/pom.xml b/ccm-cms-types-externallink/pom.xml
index b90f5da16..a99e25650 100644
--- a/ccm-cms-types-externallink/pom.xml
+++ b/ccm-cms-types-externallink/pom.xml
@@ -64,12 +64,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/ccm-cms-types-faqitem/pom.xml b/ccm-cms-types-faqitem/pom.xml
index 9ee819fe0..e3be9fd5c 100644
--- a/ccm-cms-types-faqitem/pom.xml
+++ b/ccm-cms-types-faqitem/pom.xml
@@ -64,12 +64,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/ccm-cms-types-glossaryitem/pom.xml b/ccm-cms-types-glossaryitem/pom.xml
index 70800ed1c..ee4fa36e1 100644
--- a/ccm-cms-types-glossaryitem/pom.xml
+++ b/ccm-cms-types-glossaryitem/pom.xml
@@ -64,12 +64,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/ccm-cms-types-minutes/pom.xml b/ccm-cms-types-minutes/pom.xml
index 0584016e9..bbc9dc03f 100644
--- a/ccm-cms-types-minutes/pom.xml
+++ b/ccm-cms-types-minutes/pom.xml
@@ -64,12 +64,12 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml
index 9ebefea4d..c2bd2ad03 100644
--- a/ccm-cms/pom.xml
+++ b/ccm-cms/pom.xml
@@ -55,12 +55,12 @@
         </dependency>
         
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index c40da9151..cc19e2cdf 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -49,12 +49,12 @@
         </dependency>
         
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator-cdi</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml
index 36c3a5208..53f80edf0 100644
--- a/ccm-docrepo/pom.xml
+++ b/ccm-docrepo/pom.xml
@@ -49,7 +49,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml
index fdff0bc6e..bca19e78c 100644
--- a/ccm-shortcuts/pom.xml
+++ b/ccm-shortcuts/pom.xml
@@ -57,7 +57,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
             <scope>provided</scope>
         </dependency>
diff --git a/pom.xml b/pom.xml
index 3d7f6ba62..3309f6ad0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -449,15 +449,16 @@
             Hibernate Validator used as implemenation of the Bean
             Validation API -->
             <dependency>
-                <groupId>org.hibernate</groupId>
+                <groupId>org.hibernate.validator</groupId>
                 <artifactId>hibernate-validator</artifactId>
-                <version>6.0.18.Final</version>
+                <version>6.1.5.Final</version>
             </dependency>
             <dependency>
-                <groupId>org.hibernate</groupId>
+                <groupId>org.hibernate.validator</groupId>
                 <artifactId>hibernate-validator-cdi</artifactId>
-                <version>6.0.18.Final</version>
+                <version>6.1.5.Final</version>
             </dependency>
+            
             <dependency>
                 <groupId>javax.el</groupId>
                 <artifactId>javax.el-api</artifactId>

From 16cc3fb2ea7b23ac00cfcc757f658301b6fcfe94 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 23 Jun 2020 13:35:19 +0200
Subject: [PATCH 23/49] Updated hibernate-search to 5.11.5.Final

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3309f6ad0..3cea09988 100644
--- a/pom.xml
+++ b/pom.xml
@@ -477,7 +477,7 @@
             <dependency>
                 <groupId>org.hibernate</groupId>
                 <artifactId>hibernate-search-orm</artifactId>
-                <version>5.10.7.Final</version>
+                <version>5.11.5.Final</version>
             </dependency>
 
             <!--

From 3e5327a0801c3e1781a4c999596d36a3a2ec9d9f Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 23 Jun 2020 15:23:57 +0200
Subject: [PATCH 24/49] Updated Flyway to 6.4.4. Some migration was necssary
 for Java based migrations

---
 ..._0_0_23__move_components_to_container.java | 37 ++++++++---------
 .../ccm_core/V7_0_0_27__add_party_uuid.java   | 40 ++++++++++---------
 .../ccm_core/V7_0_0_28__add_role_uuid.java    | 10 +++--
 .../V7_0_0_29__add_permission_uuid.java       |  9 +++--
 .../V7_0_0_30__add_groupmembership_uuid.java  |  9 +++--
 .../V7_0_0_31__add_rolemembership_uuid.java   |  9 +++--
 .../V7_0_0_32__add_domain_ownership_uuid.java |  9 +++--
 .../V7_0_0_33__add_categorization_uuid.java   |  9 +++--
 .../V7_0_0_34__add_resourcetype_uuid.java     |  9 +++--
 .../V7_0_0_35__add_task_assignment_uuid.java  | 10 +++--
 .../V7_0_0_36__add_task_dependency_uuid.java  |  9 +++--
 ...0_23__move_components_to_container_h2.java | 11 ++---
 .../h2/V7_0_0_27__add_party_uuid_h2.java      | 11 ++---
 .../h2/V7_0_0_28__add_role_uuid_h2.java       | 11 ++---
 .../h2/V7_0_0_29__add_permission_uuid_h2.java | 11 ++---
 ...7_0_0_30__add_groupmembership_uuid_h2.java | 11 ++---
 ...V7_0_0_31__add_rolemembership_uuid_h2.java | 11 ++---
 ..._0_0_32__add_domain_ownership_uuid_h2.java | 11 ++---
 ...V7_0_0_33__add_categorization_uuid_h2.java | 11 ++---
 .../V7_0_0_34__add_resourcetype_uuid_h2.java  | 11 ++---
 ...7_0_0_35__add_task_assignment_uuid_h2.java | 11 ++---
 ...7_0_0_36__add_task_dependency_uuid_h2.java | 11 ++---
 ...3__move_components_to_container_pgsql.java | 11 ++---
 .../V7_0_0_27__add_party_uuid_pgsql.java      | 10 ++---
 .../pgsql/V7_0_0_28__add_role_uuid_pgsql.java | 11 ++---
 .../V7_0_0_29__add_permission_uuid_pgsql.java | 12 ++----
 ..._0_30__add_groupmembership_uuid_pgsql.java | 11 ++---
 ...0_0_31__add_rolemembership_uuid_pgsql.java | 11 ++---
 ...0_32__add_domain_ownership_uuid_pgsql.java | 11 ++---
 ...0_0_33__add_categorization_uuid_pgsql.java | 12 ++----
 ...7_0_0_34__add_resourcetype_uuid_pgsql.java | 12 ++----
 ..._0_35__add_task_assignment_uuid_pgsql.java | 11 ++---
 ..._0_36__add_task_dependency_uuid_pgsql.java | 11 ++---
 pom.xml                                       |  2 +-
 34 files changed, 184 insertions(+), 222 deletions(-)

diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_23__move_components_to_container.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_23__move_components_to_container.java
index 29cdfbdb5..6ad89b454 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_23__move_components_to_container.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_23__move_components_to_container.java
@@ -18,7 +18,8 @@
  */
 package db.migrations.org.libreccm.ccm_core;
 
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -29,10 +30,12 @@ import java.util.UUID;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class V7_0_0_23__move_components_to_container implements JdbcMigration {
+public class V7_0_0_23__move_components_to_container extends BaseJavaMigration {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
+    public void migrate(final Context context) throws Exception {
+
+        final Connection connection = context.getConnection();
 
         // Get all draft PageModels from ccm_core.page_models
         final PreparedStatement retrievePageModels = connection
@@ -41,14 +44,12 @@ public class V7_0_0_23__move_components_to_container implements JdbcMigration {
                                   + "where VERSION = 'DRAFT'");
 
 
-        /* 
-        For each PageModel:
-            * Create a single container (by inserting the data into 
-             ccm_core.page_model_container_models)
-            * set container_id of each component_model of the page_model
-              to the ID of the new container
-            * if the PageModel has a public version do the same but reuse the 
-              containerUuid
+        /*
+         * For each PageModel: Create a single container (by inserting the data
+         * into ccm_core.page_model_container_models) set container_id of each
+         * component_model of the page_model to the ID of the new container if
+         * the PageModel has a public version do the same but reuse the
+         * containerUuid
          */
         final PreparedStatement createContainerId = connection
             .prepareStatement("select nextval('hibernate_sequence')");
@@ -87,8 +88,8 @@ public class V7_0_0_23__move_components_to_container implements JdbcMigration {
                                   + "    where PAGE_MODEL_ID = ?"
                                   + ")");
         try (final ResultSet pageModelsResultSet
-                                 = retrievePageModels.executeQuery()) {
-            
+            = retrievePageModels.executeQuery()) {
+
             while (pageModelsResultSet.next()) {
 
                 final long pageModelId = pageModelsResultSet
@@ -101,7 +102,7 @@ public class V7_0_0_23__move_components_to_container implements JdbcMigration {
 
                 final long containerId;
                 try (final ResultSet containerIdResultSet
-                                         = createContainerId.executeQuery()) {
+                    = createContainerId.executeQuery()) {
 
                     containerIdResultSet.next();
                     containerId = containerIdResultSet.getLong("nextval");
@@ -121,8 +122,8 @@ public class V7_0_0_23__move_components_to_container implements JdbcMigration {
                 checkForLivePageModel.setString(1, modelUuid);
                 final long liveCount;
                 try (final ResultSet liveCountResultSet
-                                         = checkForLivePageModel.executeQuery()) {
-                    
+                    = checkForLivePageModel.executeQuery()) {
+
                     liveCountResultSet.next();
                     liveCount = liveCountResultSet.getLong("COUNT");
                 }
@@ -131,14 +132,14 @@ public class V7_0_0_23__move_components_to_container implements JdbcMigration {
                     retrieveLivePage.setString(1, modelUuid);
                     final long livePageModelId;
                     try (final ResultSet liveResultSet
-                                             = retrieveLivePage.executeQuery()) {
+                        = retrieveLivePage.executeQuery()) {
                         liveResultSet.next();
                         livePageModelId = liveResultSet.getLong("PAGE_MODEL_ID");
                     }
 
                     final long liveContainerId;
                     try (final ResultSet liveContainerIdResultSet
-                                             = createContainerId.executeQuery()) {
+                        = createContainerId.executeQuery()) {
                         liveContainerIdResultSet.next();
                         liveContainerId = liveContainerIdResultSet
                             .getLong("nextval");
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_27__add_party_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_27__add_party_uuid.java
index b01623b3d..78a6494af 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_27__add_party_uuid.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_27__add_party_uuid.java
@@ -1,6 +1,7 @@
 package db.migrations.org.libreccm.ccm_core;
 
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -10,29 +11,30 @@ import java.util.UUID;
 /*
  * Copyright (C) 2018 LibreCCM Foundation.
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * This library is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * This library is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301  USA
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this library; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class V7_0_0_27__add_party_uuid implements JdbcMigration {
+public class V7_0_0_27__add_party_uuid extends BaseJavaMigration {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
+    public void migrate(final Context context) throws Exception {
+
+        final Connection connection = context.getConnection();
 
         final PreparedStatement retrieveParties = connection
             .prepareStatement("select PARTY_ID from CCM_CORE.PARTIES");
@@ -58,14 +60,14 @@ public class V7_0_0_27__add_party_uuid implements JdbcMigration {
         final ResultSet partyIds = retrieveParties.executeQuery();
 
         addUuidCol.execute();
-        
-        while(partyIds.next()) {
-            
+
+        while (partyIds.next()) {
+
             setUuid.setString(1, UUID.randomUUID().toString());
             setUuid.setLong(2, partyIds.getLong("PARTY_ID"));
             setUuid.executeUpdate();
         }
-        
+
         addUuidNotNull.execute();
         addUniqueConstraint.execute();
 
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_28__add_role_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_28__add_role_uuid.java
index 27228632b..a3b149dc4 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_28__add_role_uuid.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_28__add_role_uuid.java
@@ -18,7 +18,9 @@
  */
 package db.migrations.org.libreccm.ccm_core;
 
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
+
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -29,11 +31,13 @@ import java.util.UUID;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class V7_0_0_28__add_role_uuid implements JdbcMigration {
+public class V7_0_0_28__add_role_uuid extends BaseJavaMigration {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
+    public void migrate(final Context context) throws Exception {
 
+        final Connection connection = context.getConnection();
+        
         final PreparedStatement retrieveRoles = connection
             .prepareStatement("select ROLE_ID from CCM_CORE.CCM_ROLES");
 
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_29__add_permission_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_29__add_permission_uuid.java
index dde93020e..f91161c1e 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_29__add_permission_uuid.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_29__add_permission_uuid.java
@@ -18,7 +18,8 @@
  */
 package db.migrations.org.libreccm.ccm_core;
 
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -29,11 +30,13 @@ import java.util.UUID;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class V7_0_0_29__add_permission_uuid implements JdbcMigration {
+public class V7_0_0_29__add_permission_uuid extends BaseJavaMigration {
 
     @Override
-    public void migrate(Connection connection) throws Exception {
+    public void migrate(final Context context) throws Exception {
 
+        final Connection connection = context.getConnection();
+        
         final PreparedStatement retrievePermissions = connection
             .prepareStatement("select PERMISSION_ID from CCM_CORE.PERMISSIONS");
         
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_30__add_groupmembership_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_30__add_groupmembership_uuid.java
index 368b15d01..d48d3be40 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_30__add_groupmembership_uuid.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_30__add_groupmembership_uuid.java
@@ -18,7 +18,8 @@
  */
 package db.migrations.org.libreccm.ccm_core;
 
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -29,11 +30,13 @@ import java.util.UUID;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class V7_0_0_30__add_groupmembership_uuid implements JdbcMigration {
+public class V7_0_0_30__add_groupmembership_uuid extends BaseJavaMigration {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
+    public void migrate(final Context context) throws Exception {
 
+        final Connection connection = context.getConnection();
+        
         final PreparedStatement retrieveMemberships = connection
             .prepareStatement("select MEMBERSHIP_ID "
                                   + "from CCM_CORE.GROUP_MEMBERSHIPS");
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_31__add_rolemembership_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_31__add_rolemembership_uuid.java
index c845eb04a..216c3f553 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_31__add_rolemembership_uuid.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_31__add_rolemembership_uuid.java
@@ -18,7 +18,8 @@
  */
 package db.migrations.org.libreccm.ccm_core;
 
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -29,11 +30,13 @@ import java.util.UUID;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class V7_0_0_31__add_rolemembership_uuid implements JdbcMigration {
+public class V7_0_0_31__add_rolemembership_uuid extends BaseJavaMigration {
     
     @Override
-    public void migrate(final Connection connection) throws Exception {
+    public void migrate(final Context context) throws Exception {
 
+        final Connection connection = context.getConnection();
+        
         final PreparedStatement retrieveMemberships = connection
             .prepareStatement("select MEMBERSHIP_ID from CCM_CORE.ROLE_MEMBERSHIPS");
 
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_32__add_domain_ownership_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_32__add_domain_ownership_uuid.java
index 413fc8ba3..a80ec0749 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_32__add_domain_ownership_uuid.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_32__add_domain_ownership_uuid.java
@@ -18,7 +18,8 @@
  */
 package db.migrations.org.libreccm.ccm_core;
 
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -29,12 +30,14 @@ import java.util.UUID;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class V7_0_0_32__add_domain_ownership_uuid implements JdbcMigration {
+public class V7_0_0_32__add_domain_ownership_uuid extends BaseJavaMigration {
     
     
     @Override
-    public void migrate(final Connection connection) throws Exception {
+    public void migrate(final Context context) throws Exception {
 
+        final Connection connection = context.getConnection();
+        
         final PreparedStatement retrieveOwnerships = connection
             .prepareStatement("select OWNERSHIP_ID from CCM_CORE.DOMAIN_OWNERSHIPS");
 
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_33__add_categorization_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_33__add_categorization_uuid.java
index 388d29a91..8a6dae70f 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_33__add_categorization_uuid.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_33__add_categorization_uuid.java
@@ -18,7 +18,8 @@
  */
 package db.migrations.org.libreccm.ccm_core;
 
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -29,11 +30,13 @@ import java.util.UUID;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class V7_0_0_33__add_categorization_uuid implements JdbcMigration {
+public class V7_0_0_33__add_categorization_uuid extends BaseJavaMigration {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
+    public void migrate(final Context context) throws Exception {
 
+        final Connection connection = context.getConnection();
+        
         final PreparedStatement retrieveCategoriations = connection
             .prepareStatement("select CATEGORIZATION_ID "
                                   + "from CCM_CORE.CATEGORIZATIONS");
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_34__add_resourcetype_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_34__add_resourcetype_uuid.java
index 583bb1d81..c2d6e02bd 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_34__add_resourcetype_uuid.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_34__add_resourcetype_uuid.java
@@ -18,7 +18,8 @@
  */
 package db.migrations.org.libreccm.ccm_core;
 
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -29,11 +30,13 @@ import java.util.UUID;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class V7_0_0_34__add_resourcetype_uuid implements JdbcMigration {
+public class V7_0_0_34__add_resourcetype_uuid extends BaseJavaMigration {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
+    public void migrate(final Context context) throws Exception {
 
+        final Connection connection = context.getConnection();
+        
         final PreparedStatement retrieveTypes = connection
             .prepareStatement("select RESOURCE_TYPE_ID "
                                   + "from CCM_CORE.RESOURCE_TYPES");
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_35__add_task_assignment_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_35__add_task_assignment_uuid.java
index af24aab2d..c6265677d 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_35__add_task_assignment_uuid.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_35__add_task_assignment_uuid.java
@@ -18,7 +18,8 @@
  */
 package db.migrations.org.libreccm.ccm_core;
 
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -29,12 +30,13 @@ import java.util.UUID;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class V7_0_0_35__add_task_assignment_uuid
-    implements JdbcMigration {
+public class V7_0_0_35__add_task_assignment_uuid extends BaseJavaMigration {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
+    public void migrate(final Context context) throws Exception {
 
+        final Connection connection = context.getConnection();
+        
         final PreparedStatement retrieveAssignments = connection
             .prepareStatement("select TASK_ASSIGNMENT_ID "
                                   + "from CCM_CORE.WORKFLOW_TASK_ASSIGNMENTS");
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_36__add_task_dependency_uuid.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_36__add_task_dependency_uuid.java
index 4cf3c57c7..1df9f8825 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_36__add_task_dependency_uuid.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/V7_0_0_36__add_task_dependency_uuid.java
@@ -18,7 +18,8 @@
  */
 package db.migrations.org.libreccm.ccm_core;
 
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
+import org.flywaydb.core.api.migration.BaseJavaMigration;
+import org.flywaydb.core.api.migration.Context;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -29,11 +30,13 @@ import java.util.UUID;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-public class V7_0_0_36__add_task_dependency_uuid implements JdbcMigration {
+public class V7_0_0_36__add_task_dependency_uuid extends BaseJavaMigration {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
+    public void migrate(final Context context) throws Exception {
 
+        final Connection connection = context.getConnection();
+        
         final PreparedStatement retrieveDependencies = connection
             .prepareStatement("select TASK_DEPENDENCY_ID "
                                   + "from CCM_CORE.WORKFLOW_TASK_DEPENDENCIES");
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_23__move_components_to_container_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_23__move_components_to_container_h2.java
index a7b90ba4f..b791f8e2f 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_23__move_components_to_container_h2.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_23__move_components_to_container_h2.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.h2;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_23__move_components_to_container;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_23__move_components_to_container_h2
-    extends V7_0_0_23__move_components_to_container
-    implements JdbcMigration {
+    extends V7_0_0_23__move_components_to_container {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_27__add_party_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_27__add_party_uuid_h2.java
index beb2cce0c..533ac6813 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_27__add_party_uuid_h2.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_27__add_party_uuid_h2.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.h2;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_27__add_party_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_27__add_party_uuid_h2
-    extends V7_0_0_27__add_party_uuid
-    implements JdbcMigration {
+    extends V7_0_0_27__add_party_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_28__add_role_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_28__add_role_uuid_h2.java
index ac84a15c4..dfa512800 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_28__add_role_uuid_h2.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_28__add_role_uuid_h2.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.h2;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_28__add_role_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_28__add_role_uuid_h2
-    extends V7_0_0_28__add_role_uuid
-    implements JdbcMigration {
+    extends V7_0_0_28__add_role_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_29__add_permission_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_29__add_permission_uuid_h2.java
index 4401ed950..4ae20dffe 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_29__add_permission_uuid_h2.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_29__add_permission_uuid_h2.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.h2;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_29__add_permission_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_29__add_permission_uuid_h2
-    extends V7_0_0_29__add_permission_uuid
-    implements JdbcMigration {
+    extends V7_0_0_29__add_permission_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_30__add_groupmembership_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_30__add_groupmembership_uuid_h2.java
index 154de88ee..1b4a1b7f5 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_30__add_groupmembership_uuid_h2.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_30__add_groupmembership_uuid_h2.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.h2;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_30__add_groupmembership_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_30__add_groupmembership_uuid_h2
-    extends V7_0_0_30__add_groupmembership_uuid
-    implements JdbcMigration {
+    extends V7_0_0_30__add_groupmembership_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_31__add_rolemembership_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_31__add_rolemembership_uuid_h2.java
index dfdaa218f..7db2d13de 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_31__add_rolemembership_uuid_h2.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_31__add_rolemembership_uuid_h2.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.h2;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_31__add_rolemembership_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_31__add_rolemembership_uuid_h2
-    extends V7_0_0_31__add_rolemembership_uuid
-    implements JdbcMigration {
+    extends V7_0_0_31__add_rolemembership_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_32__add_domain_ownership_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_32__add_domain_ownership_uuid_h2.java
index 5d998a05b..86c61b68a 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_32__add_domain_ownership_uuid_h2.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_32__add_domain_ownership_uuid_h2.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.h2;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_32__add_domain_ownership_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_32__add_domain_ownership_uuid_h2
-    extends V7_0_0_32__add_domain_ownership_uuid
-    implements JdbcMigration {
+    extends V7_0_0_32__add_domain_ownership_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_33__add_categorization_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_33__add_categorization_uuid_h2.java
index 07d2afa6b..d0826965b 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_33__add_categorization_uuid_h2.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_33__add_categorization_uuid_h2.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.h2;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_33__add_categorization_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_33__add_categorization_uuid_h2
-    extends V7_0_0_33__add_categorization_uuid
-    implements JdbcMigration {
+    extends V7_0_0_33__add_categorization_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_34__add_resourcetype_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_34__add_resourcetype_uuid_h2.java
index a3235be20..d5ae6e452 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_34__add_resourcetype_uuid_h2.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_34__add_resourcetype_uuid_h2.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.h2;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_34__add_resourcetype_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_34__add_resourcetype_uuid_h2
-    extends V7_0_0_34__add_resourcetype_uuid
-    implements JdbcMigration {
+    extends V7_0_0_34__add_resourcetype_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_35__add_task_assignment_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_35__add_task_assignment_uuid_h2.java
index 722f54544..df8bb8fc6 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_35__add_task_assignment_uuid_h2.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_35__add_task_assignment_uuid_h2.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.h2;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_35__add_task_assignment_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_35__add_task_assignment_uuid_h2
-    extends V7_0_0_35__add_task_assignment_uuid
-    implements JdbcMigration {
+    extends V7_0_0_35__add_task_assignment_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_36__add_task_dependency_uuid_h2.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_36__add_task_dependency_uuid_h2.java
index 84a728da2..8445c9e04 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_36__add_task_dependency_uuid_h2.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/h2/V7_0_0_36__add_task_dependency_uuid_h2.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.h2;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_36__add_task_dependency_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_36__add_task_dependency_uuid_h2
-    extends V7_0_0_36__add_task_dependency_uuid
-    implements JdbcMigration {
+    extends V7_0_0_36__add_task_dependency_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_23__move_components_to_container_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_23__move_components_to_container_pgsql.java
index 4daa36bd5..485bbce0d 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_23__move_components_to_container_pgsql.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_23__move_components_to_container_pgsql.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.pgsql;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_23__move_components_to_container;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_23__move_components_to_container_pgsql
-    extends V7_0_0_23__move_components_to_container
-    implements JdbcMigration {
+    extends V7_0_0_23__move_components_to_container {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_27__add_party_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_27__add_party_uuid_pgsql.java
index 652e99957..fdaca9458 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_27__add_party_uuid_pgsql.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_27__add_party_uuid_pgsql.java
@@ -19,21 +19,19 @@
 package db.migrations.org.libreccm.ccm_core.pgsql;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_27__add_party_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
 
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_27__add_party_uuid_pgsql
-    extends V7_0_0_27__add_party_uuid
-    implements JdbcMigration {
+    extends V7_0_0_27__add_party_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_28__add_role_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_28__add_role_uuid_pgsql.java
index 1cd1cfe71..1ca5700ad 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_28__add_role_uuid_pgsql.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_28__add_role_uuid_pgsql.java
@@ -18,23 +18,20 @@
  */
 package db.migrations.org.libreccm.ccm_core.pgsql;
 
-import db.migrations.org.libreccm.ccm_core.h2.*;
 import db.migrations.org.libreccm.ccm_core.V7_0_0_28__add_role_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
+import org.flywaydb.core.api.migration.Context;
 
-import java.sql.Connection;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_28__add_role_uuid_pgsql
-    extends V7_0_0_28__add_role_uuid
-    implements JdbcMigration {
+    extends V7_0_0_28__add_role_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_29__add_permission_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_29__add_permission_uuid_pgsql.java
index 816f3791b..788662fd1 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_29__add_permission_uuid_pgsql.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_29__add_permission_uuid_pgsql.java
@@ -18,23 +18,19 @@
  */
 package db.migrations.org.libreccm.ccm_core.pgsql;
 
-import db.migrations.org.libreccm.ccm_core.h2.*;
 import db.migrations.org.libreccm.ccm_core.V7_0_0_29__add_permission_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_29__add_permission_uuid_pgsql
-    extends V7_0_0_29__add_permission_uuid
-    implements JdbcMigration {
+    extends V7_0_0_29__add_permission_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_30__add_groupmembership_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_30__add_groupmembership_uuid_pgsql.java
index bf68c6a35..5c99294dc 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_30__add_groupmembership_uuid_pgsql.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_30__add_groupmembership_uuid_pgsql.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.pgsql;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_30__add_groupmembership_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_30__add_groupmembership_uuid_pgsql
-    extends V7_0_0_30__add_groupmembership_uuid
-    implements JdbcMigration {
+    extends V7_0_0_30__add_groupmembership_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_31__add_rolemembership_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_31__add_rolemembership_uuid_pgsql.java
index 8e858d201..f3b96332c 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_31__add_rolemembership_uuid_pgsql.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_31__add_rolemembership_uuid_pgsql.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.pgsql;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_31__add_rolemembership_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_31__add_rolemembership_uuid_pgsql
-    extends V7_0_0_31__add_rolemembership_uuid
-    implements JdbcMigration {
+    extends V7_0_0_31__add_rolemembership_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_32__add_domain_ownership_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_32__add_domain_ownership_uuid_pgsql.java
index fd9f3310a..e1fa412b8 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_32__add_domain_ownership_uuid_pgsql.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_32__add_domain_ownership_uuid_pgsql.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.pgsql;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_32__add_domain_ownership_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_32__add_domain_ownership_uuid_pgsql
-    extends V7_0_0_32__add_domain_ownership_uuid
-    implements JdbcMigration {
+    extends V7_0_0_32__add_domain_ownership_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_33__add_categorization_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_33__add_categorization_uuid_pgsql.java
index 267acb4e5..b5026859c 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_33__add_categorization_uuid_pgsql.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_33__add_categorization_uuid_pgsql.java
@@ -18,23 +18,19 @@
  */
 package db.migrations.org.libreccm.ccm_core.pgsql;
 
-import db.migrations.org.libreccm.ccm_core.h2.*;
 import db.migrations.org.libreccm.ccm_core.V7_0_0_33__add_categorization_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_33__add_categorization_uuid_pgsql
-    extends V7_0_0_33__add_categorization_uuid
-    implements JdbcMigration {
+    extends V7_0_0_33__add_categorization_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_34__add_resourcetype_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_34__add_resourcetype_uuid_pgsql.java
index f9984400c..f618f20d8 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_34__add_resourcetype_uuid_pgsql.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_34__add_resourcetype_uuid_pgsql.java
@@ -18,23 +18,19 @@
  */
 package db.migrations.org.libreccm.ccm_core.pgsql;
 
-import db.migrations.org.libreccm.ccm_core.h2.*;
 import db.migrations.org.libreccm.ccm_core.V7_0_0_34__add_resourcetype_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_34__add_resourcetype_uuid_pgsql
-    extends V7_0_0_34__add_resourcetype_uuid
-    implements JdbcMigration {
+    extends V7_0_0_34__add_resourcetype_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_35__add_task_assignment_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_35__add_task_assignment_uuid_pgsql.java
index 5709d49e2..6e6ec5b21 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_35__add_task_assignment_uuid_pgsql.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_35__add_task_assignment_uuid_pgsql.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.pgsql;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_35__add_task_assignment_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_35__add_task_assignment_uuid_pgsql
-    extends V7_0_0_35__add_task_assignment_uuid
-    implements JdbcMigration {
+    extends V7_0_0_35__add_task_assignment_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_36__add_task_dependency_uuid_pgsql.java b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_36__add_task_dependency_uuid_pgsql.java
index 989516115..f9fb72e9a 100644
--- a/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_36__add_task_dependency_uuid_pgsql.java
+++ b/ccm-core/src/main/java/db/migrations/org/libreccm/ccm_core/pgsql/V7_0_0_36__add_task_dependency_uuid_pgsql.java
@@ -19,21 +19,18 @@
 package db.migrations.org.libreccm.ccm_core.pgsql;
 
 import db.migrations.org.libreccm.ccm_core.V7_0_0_36__add_task_dependency_uuid;
-import org.flywaydb.core.api.migration.jdbc.JdbcMigration;
-
-import java.sql.Connection;
+import org.flywaydb.core.api.migration.Context;
 
 /**
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 public class V7_0_0_36__add_task_dependency_uuid_pgsql
-    extends V7_0_0_36__add_task_dependency_uuid
-    implements JdbcMigration {
+    extends V7_0_0_36__add_task_dependency_uuid {
 
     @Override
-    public void migrate(final Connection connection) throws Exception {
-        super.migrate(connection);
+    public void migrate(final Context context) throws Exception {
+        super.migrate(context);
     }
 
 }
diff --git a/pom.xml b/pom.xml
index 3cea09988..6c8532328 100644
--- a/pom.xml
+++ b/pom.xml
@@ -486,7 +486,7 @@
             <dependency>
                 <groupId>org.flywaydb</groupId>
                 <artifactId>flyway-core</artifactId>
-                <version>5.2.4</version>
+                <version>6.4.4</version>
             </dependency>
             
             <!-- 

From a4ffc36fea28232f68c8d437fd9bd659424516e8 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 23 Jun 2020 16:32:31 +0200
Subject: [PATCH 25/49] Updated Shiro to 1.5.3

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6c8532328..93eab6284 100644
--- a/pom.xml
+++ b/pom.xml
@@ -508,12 +508,12 @@
             <dependency>
                 <groupId>org.apache.shiro</groupId>
                 <artifactId>shiro-core</artifactId>
-                <version>1.4.0</version>
+                <version>1.5.3</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.shiro</groupId>
                 <artifactId>shiro-web</artifactId>
-                <version>1.4.0</version>
+                <version>1.5.3</version>
             </dependency>
             
             <!-- Json Web Token support -->

From 80f61999b813317b3320867d6cd8b068b1112158 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 23 Jun 2020 16:38:47 +0200
Subject: [PATCH 26/49] Updated io.jsonwebtoken libs to 0.11.2

---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 93eab6284..a5e8c6511 100644
--- a/pom.xml
+++ b/pom.xml
@@ -520,17 +520,17 @@
             <dependency>
                 <groupId>io.jsonwebtoken</groupId>
                 <artifactId>jjwt-api</artifactId>
-                <version>0.10.6</version>
+                <version>0.11.2</version>
             </dependency>
             <dependency>
                 <groupId>io.jsonwebtoken</groupId>
                 <artifactId>jjwt-impl</artifactId>
-                <version>0.10.6</version>
+                <version>0.11.2</version>
             </dependency>
             <dependency>
                 <groupId>io.jsonwebtoken</groupId>
                 <artifactId>jjwt-jackson</artifactId>
-                <version>0.10.6</version>
+                <version>0.11.2</version>
             </dependency>
 
             <!--

From 0012a919cb06477440c1f690ad9e966360885ba8 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 23 Jun 2020 17:45:24 +0200
Subject: [PATCH 27/49] Updated log4j2 to 2.13.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a5e8c6511..e3f09596d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -550,7 +550,7 @@
             <dependency>
                 <groupId>org.apache.logging.log4j</groupId>
                 <artifactId>log4j-bom</artifactId>
-                <version>2.11.2</version>
+                <version>2.13.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

From 9692b9283894b9db2f602c2946ec852bbdaa4bd4 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 23 Jun 2020 18:20:25 +0200
Subject: [PATCH 28/49] Updated lucene-core to 8.5.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e3f09596d..c8f46c691 100644
--- a/pom.xml
+++ b/pom.xml
@@ -562,7 +562,7 @@
             <dependency>
                 <groupId>org.apache.lucene</groupId>
                 <artifactId>lucene-core</artifactId>
-                <version>8.0.0</version>
+                <version>8.5.2</version>
             </dependency>
 
             <dependency>

From 82c5226add617b5ba334db77ce972cf1a3c2ec1b Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Tue, 23 Jun 2020 18:49:25 +0200
Subject: [PATCH 29/49] Updated org.apache.pdfbox.pdfbox to 2.0.20

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c8f46c691..6dd275f2f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -568,7 +568,7 @@
             <dependency>
                 <groupId>org.apache.pdfbox</groupId>
                 <artifactId>pdfbox</artifactId>
-                <version>2.0.15</version>
+                <version>2.0.20</version>
             </dependency>
 
 

From 1eedadf845b291da64a4fbc207e26f6040e3eddb Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 24 Jun 2020 07:10:20 +0200
Subject: [PATCH 30/49] Updated commons-beansutils.commons-beanutils to 1.9.4

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6dd275f2f..1fc3278fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -576,7 +576,7 @@
             <dependency>
                 <groupId>commons-beanutils</groupId>
                 <artifactId>commons-beanutils</artifactId>
-                <version>1.9.3</version>
+                <version>1.9.4</version>
             </dependency>
             <dependency>
                 <groupId>commons-cli</groupId>

From ad7fc252ebe15a5af3cdb3e43d2f326a7760816f Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 24 Jun 2020 07:17:48 +0200
Subject: [PATCH 31/49] Updated commons-codec.commons-codec to 1.14

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1fc3278fd..9b16e5f69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -586,7 +586,7 @@
             <dependency>
                 <groupId>commons-codec</groupId>
                 <artifactId>commons-codec</artifactId>
-                <version>1.12</version>
+                <version>1.14</version>
             </dependency>
             <dependency>
                 <groupId>commons-collections</groupId>

From fd20fd663d853b32e5e45d9a829eb66ada58676c Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 24 Jun 2020 07:23:18 +0200
Subject: [PATCH 32/49] Updated commons-io.commons-io to 2.7

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9b16e5f69..10538497c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -606,7 +606,7 @@
             <dependency>
                 <groupId>commons-io</groupId>
                 <artifactId>commons-io</artifactId>
-                <version>2.6</version>
+                <version>2.7</version>
             </dependency>
             <dependency>
                 <groupId>commons-lang</groupId>

From 1f56fa26581e5276400be8406976dfacebd8cc35 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 24 Jun 2020 07:29:48 +0200
Subject: [PATCH 33/49] Updated org.reflections.reflections to 0.9.12

---
 .../src/main/java/org/libreccm/core/api/JsonArrayCollector.java | 1 -
 pom.xml                                                         | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ccm-core/src/main/java/org/libreccm/core/api/JsonArrayCollector.java b/ccm-core/src/main/java/org/libreccm/core/api/JsonArrayCollector.java
index 94a9730a6..a3aba14a5 100644
--- a/ccm-core/src/main/java/org/libreccm/core/api/JsonArrayCollector.java
+++ b/ccm-core/src/main/java/org/libreccm/core/api/JsonArrayCollector.java
@@ -18,7 +18,6 @@
  */
 package org.libreccm.core.api;
 
-import com.google.common.collect.Sets;
 
 import java.util.Collections;
 import java.util.Set;
diff --git a/pom.xml b/pom.xml
index 10538497c..596f81bb0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -634,7 +634,7 @@
             <dependency>
                 <groupId>org.reflections</groupId>
                 <artifactId>reflections</artifactId>
-                <version>0.9.11</version>
+                <version>0.9.12</version>
             </dependency>
 
             <dependency>

From 1746e81e11f207dc1504e2144c13a0d56800935c Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 24 Jun 2020 07:52:50 +0200
Subject: [PATCH 34/49] Updated org.freemarker.freemarker to 2.3.30

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 596f81bb0..33932b0e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -640,7 +640,7 @@
             <dependency>
                 <groupId>org.freemarker</groupId>
                 <artifactId>freemarker</artifactId>
-                <version>2.3.28</version>
+                <version>2.3.30</version>
             </dependency>
 
             <dependency>

From 2ab56bc847ee06704bda2416bca2ba1e33ddb147 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 24 Jun 2020 16:21:40 +0200
Subject: [PATCH 35/49] Updated net.sf.saxon.Saxon-HE to 10.1

---
 .../arsdigita/cms/ui/type/ContentTypeAdminPaneController.java  | 3 +--
 pom.xml                                                        | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeAdminPaneController.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeAdminPaneController.java
index 195160ddc..5b60a7236 100644
--- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeAdminPaneController.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/type/ContentTypeAdminPaneController.java
@@ -18,7 +18,6 @@
  */
 package com.arsdigita.cms.ui.type;
 
-import com.ibm.icu.impl.IllegalIcuArgumentException;
 import org.libreccm.workflow.Workflow;
 import org.librecms.contentsection.ContentSection;
 import org.librecms.contentsection.ContentSectionManager;
@@ -90,7 +89,7 @@ class ContentTypeAdminPaneController {
             ofSection.getObjectId()
         )
             .orElseThrow(
-                () -> new IllegalIcuArgumentException(
+                () -> new IllegalArgumentException(
                     String.format(
                         "No ContentSection with ID %d found.",
                         ofSection.getObjectId()
diff --git a/pom.xml b/pom.xml
index 33932b0e1..aa832167c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -646,7 +646,7 @@
             <dependency>
                 <groupId>net.sf.saxon</groupId>
                 <artifactId>Saxon-HE</artifactId>
-                <version>9.9.1-2</version>
+                <version>10.1</version>
             </dependency>
 
             <dependency>

From a9df80306dd84480f6a2632241137fe6da2503eb Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@goolemail.com>
Date: Wed, 24 Jun 2020 20:41:04 +0200
Subject: [PATCH 36/49] Updated org.jsoup.jsoup to 1.13.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index aa832167c..762992246 100644
--- a/pom.xml
+++ b/pom.xml
@@ -664,7 +664,7 @@
             <dependency>
                 <groupId>org.jsoup</groupId>
                 <artifactId>jsoup</artifactId>
-                <version>1.11.3</version>
+                <version>1.13.1</version>
             </dependency>
 
             <dependency>

From c74cde20eae80c5dd874614884aefeff6abcba4f Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@goolemail.com>
Date: Wed, 24 Jun 2020 20:48:24 +0200
Subject: [PATCH 37/49] Updated org.apache.maven.maven-artifact to 3.6.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 762992246..f172271f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -670,7 +670,7 @@
             <dependency>
                 <groupId>org.apache.maven</groupId>
                 <artifactId>maven-artifact</artifactId>
-                <version>3.6.1</version>
+                <version>3.6.3</version>
             </dependency>
 
             <dependency>

From 7c24b5b5910a96cd3ef6b2a173577c7e2ab6eaa1 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens.pelzetter@goolemail.com>
Date: Wed, 24 Jun 2020 21:04:57 +0200
Subject: [PATCH 38/49] Updated junit 4.13

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f172271f8..554152af2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -746,7 +746,7 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.12</version>
+                <version>4.13</version>
             </dependency>
 
             <!--

From 5bb61a04ad46aa63938eef00967c685a9697b617 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 25 Jun 2020 09:04:00 +0200
Subject: [PATCH 39/49] Updated com.fasterxml.jackson.jackson.jackon-bom to
 2.11.0, removed org.codehaus.woodstox.woodstox-core-asl (causes conflicts)

---
 ccm-core/pom.xml | 4 ----
 pom.xml          | 9 +--------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index cc19e2cdf..d18abe4ff 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -254,10 +254,6 @@
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-xml</artifactId>
         </dependency>
-        <dependency> <!-- better xml library -->
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>woodstox-core-asl</artifactId>
-        </dependency>
         <dependency> <!-- for csv ex-/import -->
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-csv</artifactId>
diff --git a/pom.xml b/pom.xml
index 554152af2..05005a056 100644
--- a/pom.xml
+++ b/pom.xml
@@ -718,17 +718,10 @@
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
-                <version>2.9.8</version>
+                <version>2.11.0</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-
-            <!-- better xml library -->
-            <dependency>
-                <groupId>org.codehaus.woodstox</groupId>
-                <artifactId>woodstox-core-asl</artifactId>
-                <version>4.4.1</version>
-            </dependency>
             
             <!-- PostgreSQL JDBC Driver -->
             <dependency>

From e1ce828f39e3d5968486b301ff80403e6bee4093 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 25 Jun 2020 11:10:21 +0200
Subject: [PATCH 40/49] Updated Arquillian to 1.6.0, and
 org.jboss.arquillian.extension.arquillian-jacoco to 1.1.0

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 05005a056..b49fadd9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -749,7 +749,7 @@
             <dependency>
                 <groupId>org.jboss.arquillian</groupId>
                 <artifactId>arquillian-bom</artifactId>
-                <version>1.4.1.Final</version>
+                <version>1.6.0.Final</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -766,7 +766,7 @@
             <dependency>
                 <groupId>org.jboss.arquillian.extension</groupId>
                 <artifactId>arquillian-jacoco</artifactId>
-                <version>1.0.0.Alpha10</version>
+                <version>1.1.0</version>
             </dependency>
             <dependency>
                 <groupId>org.wildfly.arquillian</groupId>

From 5458f456ac53b4e6cffecb0ac455b827f50f3ece Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 25 Jun 2020 11:11:22 +0200
Subject: [PATCH 41/49] Updated Arquillian drivers for TomEE to 1.7.5

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b49fadd9f..0cf1024e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -784,13 +784,13 @@
             <dependency>
                 <groupId>org.apache.openejb</groupId>
                 <artifactId>arquillian-tomee-embedded</artifactId>
-                <version>1.7.3</version>
+                <version>1.7.5</version>
             </dependency>
             
             <dependency>
                 <groupId>org.apache.openejb</groupId>
                 <artifactId>tomee-embedded</artifactId>
-                <version>1.7.3</version>
+                <version>1.7.5</version>
             </dependency>
             
             <dependency>

From b67c5df92cc1ea9c6a2e279cf2e123d43e6d87cc Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 25 Jun 2020 11:21:00 +0200
Subject: [PATCH 42/49] Updated org.jboss.logmanager.jboss-logmanager to 2.1.16

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0cf1024e1..3576eb4f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -796,7 +796,7 @@
             <dependency>
                 <groupId>org.jboss.logmanager</groupId>
                 <artifactId>jboss-logmanager</artifactId>
-                <version>2.0.3.Final</version>
+                <version>2.1.16.Final</version>
                 <scope>test</scope>
             </dependency>
             

From 4a30ae58ff25202fe3df55725f38b11bb20e79ab Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 25 Jun 2020 11:47:30 +0200
Subject: [PATCH 43/49] Updated org.apache.openejb.tomee-jaxrs to 1.7.5

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3576eb4f8..459e70d0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -808,7 +808,7 @@
             <dependency>
                 <groupId>org.apache.openejb</groupId>
                 <artifactId>tomee-jaxrs</artifactId>
-                <version>1.7.3</version>
+                <version>1.7.5</version>
             </dependency>
             
             <dependency>

From 8f608e33bc6f7f7cc248241129d2addd47f3d1ac Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 25 Jun 2020 11:53:35 +0200
Subject: [PATCH 44/49] Updated TomEE modules for Arquillian to 1.7.5

---
 pom.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 459e70d0f..580923a89 100644
--- a/pom.xml
+++ b/pom.xml
@@ -812,15 +812,15 @@
             </dependency>
             
             <dependency>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>arquillian-tomee-remote</artifactId>
-                    <version>1.7.3</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.openejb</groupId>
-                    <artifactId>apache-tomee</artifactId>
-                    <version>1.7.3</version>
-                </dependency>
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>arquillian-tomee-remote</artifactId>
+                <version>1.7.5</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.openejb</groupId>
+                <artifactId>apache-tomee</artifactId>
+                <version>1.7.5</version>
+            </dependency>
 
             <!--
                 JaCoCo is used to measure the test coverage

From 70b74e5b7340dd75e1ef47ac5bd004e8329adb3d Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 25 Jun 2020 11:59:32 +0200
Subject: [PATCH 45/49] Updated Jacoco to 0.8.5

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 580923a89..9c12acc32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -828,7 +828,7 @@
             <dependency>
                 <groupId>org.jacoco</groupId>
                 <artifactId>org.jacoco.core</artifactId>
-                <version>0.8.3</version>
+                <version>0.8.5</version>
                 <scope>test</scope>
             </dependency>
 

From b6300d5ccb14d34a9e5a815427b8e26a2e764e9b Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 25 Jun 2020 12:26:24 +0200
Subject: [PATCH 46/49] Updated Hamcrest to 2.2

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9c12acc32..7e29dfd3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -839,12 +839,12 @@
             <dependency>
                 <groupId>org.hamcrest</groupId>
                 <artifactId>hamcrest-core</artifactId>
-                <version>2.1</version>
+                <version>2.2</version>
             </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>
                 <artifactId>hamcrest-library</artifactId>
-                <version>2.1</version>
+                <version>2.2</version>
                 <scope>test</scope>
             </dependency>
 

From 911df0dd210ed81f66bc649b013fa4aea5bc14eb Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 25 Jun 2020 13:52:04 +0200
Subject: [PATCH 47/49] Updated nl.jqno.equalsverifier.equalsverifier to 3.4

---
 .../contentsection/AssetEqualsAndHashCodeTest.java     |  4 ++--
 .../AttachmentsEqualsAndHashCodeTest.java              |  4 ++--
 .../librecms/contentsection/EqualsAndHashCodeTest.java |  4 ++--
 .../librecms/contenttypes/EqualsAndHashCodeTest.java   |  4 ++--
 .../libreccm/categorization/EqualsAndHashCodeTest.java |  7 ++++---
 .../java/org/libreccm/core/EqualsAndHashCodeTest.java  |  4 ++--
 .../java/org/libreccm/core/ResourceEntityTest.java     |  4 ++--
 .../libreccm/formbuilder/EqualsAndHashCodeTest.java    |  4 ++--
 .../formbuilder/actions/EqualsAndHashCodeTest.java     |  4 ++--
 .../java/org/libreccm/l10n/EqualsAndHashCodeTest.java  |  4 ++--
 .../org/libreccm/messaging/EqualsAndHashCodeTest.java  |  4 ++--
 .../libreccm/notification/EqualsAndHashCodeTest.java   |  4 ++--
 .../org/libreccm/portal/EqualsAndHashCodeTest.java     |  4 ++--
 .../org/libreccm/runtime/EqualsAndHashCodeTest.java    |  4 ++--
 .../libreccm/search/lucene/EqualsAndHashCodeTest.java  |  4 ++--
 .../org/libreccm/security/EqualsAndHashCodeTest.java   |  4 ++--
 .../org/libreccm/theming/db/EqualsAndHashCodeTest.java |  4 ++--
 .../java/org/libreccm/web/EqualsAndHashCodeTest.java   |  4 ++--
 .../org/libreccm/workflow/EqualsAndHashCodeTest.java   |  4 ++--
 .../java/org/libreccm/testutils/EqualsVerifier.java    | 10 ++++++----
 pom.xml                                                |  3 +--
 21 files changed, 47 insertions(+), 45 deletions(-)

diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java
index a7f53feaf..c84168f6d 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/AssetEqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.librecms.contentsection;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.categorization.Category;
@@ -55,7 +55,7 @@ public class AssetEqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
 
         final CcmObject object1 = new CcmObject();
         object1.setDisplayName("Object 1");
diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java
index dc18a1367..f0122fb1e 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/AttachmentsEqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.librecms.contentsection;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.core.CcmObject;
@@ -55,7 +55,7 @@ public class AttachmentsEqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
 
         final ContentSection section1 = new ContentSection();
         section1.setDisplayName("section1");
diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java
index 913a09dcf..cec043aa3 100644
--- a/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contentsection/EqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.librecms.contentsection;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.categorization.Category;
@@ -59,7 +59,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
 
         final ContentItem item1 = new ContentItem();
         item1.setObjectId(-1100);
diff --git a/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java b/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java
index 0353ce46b..80b7b94fa 100644
--- a/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java
+++ b/ccm-cms/src/test/java/org/librecms/contenttypes/EqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.librecms.contenttypes;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -50,7 +50,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
     }
 
 }
diff --git a/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java
index d409fa665..92480a450 100644
--- a/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/categorization/EqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.libreccm.categorization;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.core.CcmObject;
@@ -54,8 +54,9 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
-
+    protected void addPrefabValues(
+        final SingleTypeEqualsVerifierApi<?> verifier
+    ) {
         final Category category1 = new Category();
         category1.setName("Category One");
 
diff --git a/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java
index f21d632dc..9b3d52dcc 100644
--- a/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/core/EqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.libreccm.core;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.tests.categories.UnitTest;
@@ -54,7 +54,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
 
         final CcmObject ccmObject1 = new CcmObject();
         ccmObject1.setObjectId(-100);
diff --git a/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java b/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java
index 0bea94111..9f8809ef5 100644
--- a/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java
+++ b/ccm-core/src/test/java/org/libreccm/core/ResourceEntityTest.java
@@ -18,7 +18,7 @@
  */
 package org.libreccm.core;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.categorization.Category;
@@ -57,7 +57,7 @@ public class ResourceEntityTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
 
         final Resource resource1 = new Resource();
         final LocalizedString title1 = new LocalizedString();
diff --git a/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java
index 67f58a389..350578c1f 100644
--- a/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/formbuilder/EqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.libreccm.formbuilder;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.categorization.Category;
@@ -62,7 +62,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
 
         final Component component1 = new Component();
         component1.setAdminName("Component One");
diff --git a/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java
index a4a0c74ef..19d43cf35 100644
--- a/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/formbuilder/actions/EqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.libreccm.formbuilder.actions;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.formbuilder.Component;
@@ -60,7 +60,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
 
         final Component component1 = new Component();
         component1.setAdminName("Component One");
diff --git a/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java
index cddcc3c58..6c709cda9 100644
--- a/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/l10n/EqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.libreccm.l10n;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -49,7 +49,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
         final Message message1 = new Message();
         message1.setSubject("Message One");
 
diff --git a/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java
index 5b4372892..2e4272eea 100644
--- a/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/messaging/EqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.libreccm.messaging;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.categorization.Category;
@@ -54,7 +54,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
 
         final Message message1 = new Message();
         message1.setSubject("Message One");
diff --git a/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java
index a45ceb2cc..c799c4929 100644
--- a/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/notification/EqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.libreccm.notification;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.categorization.Category;
@@ -55,7 +55,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
 
         final Message message1 = new Message();
         message1.setSubject("Message One");
diff --git a/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java
index 9a502a2fd..f538c008f 100644
--- a/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/portal/EqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.libreccm.portal;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.categorization.Category;
@@ -53,7 +53,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
 
         final Portal portal1 = new Portal();
         portal1.setDisplayName("Portal One");
diff --git a/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java
index a218401bb..dfb1ce0ce 100644
--- a/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/runtime/EqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.libreccm.runtime;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.tests.categories.UnitTest;
@@ -47,7 +47,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
 
         final Initalizer initalizer1 = new Initalizer();
         initalizer1.setClassName("org.example.foo.Initalizer");
diff --git a/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java
index c2d304b33..bd2dc37d1 100644
--- a/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/search/lucene/EqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.libreccm.search.lucene;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.security.Group;
@@ -50,7 +50,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
         final Document document1 = new Document();
         document1.setTitle("document1");
 
diff --git a/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java
index 4ae48e8e8..e9fdb8543 100644
--- a/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/security/EqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.libreccm.security;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.core.CcmObject;
@@ -56,7 +56,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
         
         final Group group1 = new Group();
         group1.setName("group1");
diff --git a/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java
index 7b6046bf9..74b04eac1 100644
--- a/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/theming/db/EqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.libreccm.theming.db;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.tests.categories.UnitTest;
@@ -51,7 +51,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
 
         Objects.requireNonNull(verifier);
         
diff --git a/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java
index 1d44c93ef..abe3727bb 100644
--- a/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/web/EqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.libreccm.web;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.libreccm.categorization.Category;
@@ -55,7 +55,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
         final Resource resource1 = new Resource();
         resource1.setDisplayName("Resource One");
 
diff --git a/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java b/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java
index 4c47c2a57..36124b50b 100644
--- a/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java
+++ b/ccm-core/src/test/java/org/libreccm/workflow/EqualsAndHashCodeTest.java
@@ -18,7 +18,7 @@
  */
 package org.libreccm.workflow;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -57,7 +57,7 @@ public class EqualsAndHashCodeTest extends EqualsVerifier {
     }
 
     @Override
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
 
         super.addPrefabValues(verifier);
 
diff --git a/ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java b/ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java
index 031d1ef45..d20b99f08 100644
--- a/ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java
+++ b/ccm-testutils/src/main/java/org/libreccm/testutils/EqualsVerifier.java
@@ -18,8 +18,8 @@
  */
 package org.libreccm.testutils;
 
-import nl.jqno.equalsverifier.EqualsVerifierApi;
 import nl.jqno.equalsverifier.Warning;
+import nl.jqno.equalsverifier.api.SingleTypeEqualsVerifierApi;
 import org.junit.Test;
 import org.junit.runners.Parameterized;
 
@@ -89,7 +89,9 @@ public class EqualsVerifier {
      *
      * @param verifier The verifier to which the suppression are added.
      */
-    protected void addSuppressWarnings(final EqualsVerifierApi<?> verifier) {
+    protected void addSuppressWarnings(
+        final SingleTypeEqualsVerifierApi<?> verifier
+    ) {
 
         verifier
             .suppress(Warning.STRICT_INHERITANCE)
@@ -102,14 +104,14 @@ public class EqualsVerifier {
      *
      * @param verifier The verifier to which the prefab values are added.
      */
-    protected void addPrefabValues(final EqualsVerifierApi<?> verifier) {
+    protected void addPrefabValues(final SingleTypeEqualsVerifierApi<?> verifier) {
         //Nothing here
     }
 
     @Test
     public void verifyEqualsAndHashCode() {
 
-        final EqualsVerifierApi<?> verifier
+        final SingleTypeEqualsVerifierApi<?> verifier
                                        = nl.jqno.equalsverifier.EqualsVerifier
                 .forClass(entityClass)
                 .withRedefinedSuperclass();
diff --git a/pom.xml b/pom.xml
index 7e29dfd3d..49874fcb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -856,8 +856,7 @@
             <dependency>
                 <groupId>nl.jqno.equalsverifier</groupId>
                 <artifactId>equalsverifier</artifactId>
-                <!--<version>1.7.8</version>-->
-                <version>3.1.9</version>
+                <version>3.4</version>
             </dependency>
 
             <!-- h2 database in used to check some database related things -->

From cdc13f4cee2388bf6b5de138b644967635d603e2 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 25 Jun 2020 13:52:55 +0200
Subject: [PATCH 48/49] Updated com.h2.database.h2 to 1.4.200

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 49874fcb2..3b938b54f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -863,7 +863,7 @@
             <dependency>
                 <groupId>com.h2database</groupId>
                 <artifactId>h2</artifactId>
-                <version>1.4.199</version>
+                <version>1.4.200</version>
             </dependency>
 
             <!-- WebJars -->

From acd3c1314c0e9f93772e2b9343c93fdfa02e6399 Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Thu, 25 Jun 2020 16:38:08 +0200
Subject: [PATCH 49/49] Removed obsolete FindBugs plugin (superseeded by
 SpotBugs)

---
 .../main/resources/archetype-resources/pom.xml  |  5 -----
 .../main/resources/archetype-resources/pom.xml  |  5 -----
 ccm-cms-profile/pom.xml                         |  4 ----
 ccm-cms-types-agenda/pom.xml                    |  6 +-----
 ccm-cms-types-bookmark/pom.xml                  |  4 ----
 ccm-cms-types-decisiontree/pom.xml              |  4 ----
 ccm-cms-types-externallink/pom.xml              |  4 ----
 ccm-cms-types-faqitem/pom.xml                   |  4 ----
 ccm-cms-types-glossaryitem/pom.xml              |  6 +-----
 ccm-cms-types-minutes/pom.xml                   |  4 ----
 ccm-cms/pom.xml                                 |  7 -------
 ccm-core/pom.xml                                | 11 ++---------
 ...indbugs-exclude.xml => spotbugs-exclude.xml} |  0
 ccm-docrepo/pom.xml                             |  4 ----
 ccm-shortcuts/pom.xml                           |  7 -------
 ccm-xafilesystemadapter/pom.xml                 |  7 -------
 pom.xml                                         | 17 -----------------
 17 files changed, 4 insertions(+), 95 deletions(-)
 rename ccm-core/{findbugs-exclude.xml => spotbugs-exclude.xml} (100%)

diff --git a/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml b/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml
index 3aa8c284b..22b4300ff 100644
--- a/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml
+++ b/ccm-archetype-module/src/main/resources/archetype-resources/pom.xml
@@ -228,11 +228,6 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.5.201505241946</version>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>3.0.1</version>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml b/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml
index 349ee9d5d..78f0d8565 100644
--- a/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml
+++ b/ccm-cms-archetype-contenttype/src/main/resources/archetype-resources/pom.xml
@@ -236,11 +236,6 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <version>0.7.5.201505241946</version>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>3.0.1</version>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ccm-cms-profile/pom.xml b/ccm-cms-profile/pom.xml
index 5593e0d0c..68bd8de80 100644
--- a/ccm-cms-profile/pom.xml
+++ b/ccm-cms-profile/pom.xml
@@ -255,10 +255,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ccm-cms-types-agenda/pom.xml b/ccm-cms-types-agenda/pom.xml
index de964cfac..219f09afa 100644
--- a/ccm-cms-types-agenda/pom.xml
+++ b/ccm-cms-types-agenda/pom.xml
@@ -252,11 +252,7 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
-
+           
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
diff --git a/ccm-cms-types-bookmark/pom.xml b/ccm-cms-types-bookmark/pom.xml
index ec1ae219a..8b2864abf 100644
--- a/ccm-cms-types-bookmark/pom.xml
+++ b/ccm-cms-types-bookmark/pom.xml
@@ -251,10 +251,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ccm-cms-types-decisiontree/pom.xml b/ccm-cms-types-decisiontree/pom.xml
index 879d5de9e..9f6d92b69 100644
--- a/ccm-cms-types-decisiontree/pom.xml
+++ b/ccm-cms-types-decisiontree/pom.xml
@@ -252,10 +252,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ccm-cms-types-externallink/pom.xml b/ccm-cms-types-externallink/pom.xml
index b90f5da16..a8abc8176 100644
--- a/ccm-cms-types-externallink/pom.xml
+++ b/ccm-cms-types-externallink/pom.xml
@@ -251,10 +251,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ccm-cms-types-faqitem/pom.xml b/ccm-cms-types-faqitem/pom.xml
index 9ee819fe0..e00e7566d 100644
--- a/ccm-cms-types-faqitem/pom.xml
+++ b/ccm-cms-types-faqitem/pom.xml
@@ -251,10 +251,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ccm-cms-types-glossaryitem/pom.xml b/ccm-cms-types-glossaryitem/pom.xml
index 70800ed1c..b03b61df9 100644
--- a/ccm-cms-types-glossaryitem/pom.xml
+++ b/ccm-cms-types-glossaryitem/pom.xml
@@ -251,11 +251,7 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
-
+            
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
diff --git a/ccm-cms-types-minutes/pom.xml b/ccm-cms-types-minutes/pom.xml
index 0584016e9..38113079b 100644
--- a/ccm-cms-types-minutes/pom.xml
+++ b/ccm-cms-types-minutes/pom.xml
@@ -252,10 +252,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
 
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/ccm-cms/pom.xml b/ccm-cms/pom.xml
index 9ebefea4d..dd99ce800 100644
--- a/ccm-cms/pom.xml
+++ b/ccm-cms/pom.xml
@@ -294,16 +294,9 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
             
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <!--<configuration>
-                    <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
-                </configuration>-->
             </plugin>
 
             <plugin>
diff --git a/ccm-core/pom.xml b/ccm-core/pom.xml
index 8c09637e8..4832d8742 100644
--- a/ccm-core/pom.xml
+++ b/ccm-core/pom.xml
@@ -414,19 +414,12 @@
                     <trimStackTrace>false</trimStackTrace>
                 </configuration>
             </plugin>
-            
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <configuration>
-                    <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
-                </configuration>
-            </plugin>
+
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
                 <configuration>
-                    <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
+                    <excludeFilterFile>spotbugs-exclude.xml</excludeFilterFile>
                 </configuration>
             </plugin>
             
diff --git a/ccm-core/findbugs-exclude.xml b/ccm-core/spotbugs-exclude.xml
similarity index 100%
rename from ccm-core/findbugs-exclude.xml
rename to ccm-core/spotbugs-exclude.xml
diff --git a/ccm-docrepo/pom.xml b/ccm-docrepo/pom.xml
index de138394d..9be30402a 100644
--- a/ccm-docrepo/pom.xml
+++ b/ccm-docrepo/pom.xml
@@ -235,10 +235,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
diff --git a/ccm-shortcuts/pom.xml b/ccm-shortcuts/pom.xml
index 317ac9b3d..2b41dd67f 100644
--- a/ccm-shortcuts/pom.xml
+++ b/ccm-shortcuts/pom.xml
@@ -271,16 +271,9 @@
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
 
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-            </plugin>
             <plugin>
                 <groupId>com.github.spotbugs</groupId>
                 <artifactId>spotbugs-maven-plugin</artifactId>
-                <!--<configuration>
-                    <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
-                </configuration>-->
             </plugin>
 
             <plugin>
diff --git a/ccm-xafilesystemadapter/pom.xml b/ccm-xafilesystemadapter/pom.xml
index bf64f6b4c..63499272a 100644
--- a/ccm-xafilesystemadapter/pom.xml
+++ b/ccm-xafilesystemadapter/pom.xml
@@ -157,13 +157,6 @@
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
             </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <!--<configuration>
-                    <excludeFilterFile>findbugs-exclude.xml</excludeFilterFile>
-                </configuration>-->
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 1070773f1..5962be573 100644
--- a/pom.xml
+++ b/pom.xml
@@ -304,23 +304,6 @@
                     <artifactId>build-helper-maven-plugin</artifactId>
                     <version>3.0.0</version>
                 </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>findbugs-maven-plugin</artifactId>
-                    <version>3.0.5</version>
-                    <configuration>
-                        <findbugsXmlOutput>true</findbugsXmlOutput>
-                        <xmlOutput>true</xmlOutput>
-                    </configuration>
-                    <executions>
-                        <execution>
-                            <phase>package</phase>
-                            <goals>
-                                <goal>findbugs</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>
                     <artifactId>versions-maven-plugin</artifactId>