diff --git a/Kitodo-API/pom.xml b/Kitodo-API/pom.xml
index cdaf690e20d..6c3a32222e4 100644
--- a/Kitodo-API/pom.xml
+++ b/Kitodo-API/pom.xml
@@ -23,6 +23,7 @@
     </parent>
 
     <name>Kitodo - API</name>
+    <groupId>org.kitodo</groupId>
     <artifactId>kitodo-api</artifactId>
 
     <properties>
diff --git a/Kitodo-Command/pom.xml b/Kitodo-Command/pom.xml
index f9f4df1069c..dab5e556a4f 100644
--- a/Kitodo-Command/pom.xml
+++ b/Kitodo-Command/pom.xml
@@ -23,6 +23,7 @@
     </parent>
 
     <name>Kitodo - Command</name>
+    <groupId>org.kitodo</groupId>
     <artifactId>kitodo-command</artifactId>
 
     <properties>
diff --git a/Kitodo-DataEditor/pom.xml b/Kitodo-DataEditor/pom.xml
index 49de857cec8..02437bc61f1 100644
--- a/Kitodo-DataEditor/pom.xml
+++ b/Kitodo-DataEditor/pom.xml
@@ -21,6 +21,7 @@
     </parent>
 
     <name>Kitodo - Data Editor</name>
+    <groupId>org.kitodo</groupId>
     <artifactId>kitodo-data-editor</artifactId>
 
     <properties>
diff --git a/Kitodo-DataFormat/pom.xml b/Kitodo-DataFormat/pom.xml
index ae7a5b71d60..19676437b1e 100644
--- a/Kitodo-DataFormat/pom.xml
+++ b/Kitodo-DataFormat/pom.xml
@@ -21,6 +21,7 @@
     </parent>
 
     <name>Kitodo - Data Format</name>
+    <groupId>org.kitodo</groupId>
     <artifactId>kitodo-data-format</artifactId>
 
     <properties>
diff --git a/Kitodo-DataManagement/pom.xml b/Kitodo-DataManagement/pom.xml
index d711c86f2fa..767cce09e8e 100644
--- a/Kitodo-DataManagement/pom.xml
+++ b/Kitodo-DataManagement/pom.xml
@@ -23,6 +23,7 @@
     </parent>
 
     <name>Kitodo - Data Management</name>
+    <groupId>org.kitodo</groupId>
     <artifactId>kitodo-data-management</artifactId>
 
     <properties>
diff --git a/Kitodo-Docket/pom.xml b/Kitodo-Docket/pom.xml
index fa200498d88..621bf46641b 100644
--- a/Kitodo-Docket/pom.xml
+++ b/Kitodo-Docket/pom.xml
@@ -23,6 +23,7 @@
     </parent>
 
     <name>Kitodo - Docket</name>
+    <groupId>org.kitodo</groupId>
     <artifactId>kitodo-docket</artifactId>
 
     <properties>
diff --git a/Kitodo-FileManagement/pom.xml b/Kitodo-FileManagement/pom.xml
index 7fcaaa42dd5..00c3fe74a9a 100644
--- a/Kitodo-FileManagement/pom.xml
+++ b/Kitodo-FileManagement/pom.xml
@@ -23,6 +23,7 @@
     </parent>
 
     <name>Kitodo - File Management</name>
+    <groupId>org.kitodo</groupId>
     <artifactId>kitodo-file-management</artifactId>
 
     <properties>
diff --git a/Kitodo-ImageManagement/pom.xml b/Kitodo-ImageManagement/pom.xml
index 9b10cbec5ee..b2ed2ba379d 100644
--- a/Kitodo-ImageManagement/pom.xml
+++ b/Kitodo-ImageManagement/pom.xml
@@ -23,6 +23,7 @@
     </parent>
 
     <name>Kitodo - Image Management</name>
+    <groupId>org.kitodo</groupId>
     <artifactId>kitodo-image-management</artifactId>
 
     <properties>
diff --git a/Kitodo-LongTermPreservationValidation/pom.xml b/Kitodo-LongTermPreservationValidation/pom.xml
index 377e50d9774..85492b9dbda 100644
--- a/Kitodo-LongTermPreservationValidation/pom.xml
+++ b/Kitodo-LongTermPreservationValidation/pom.xml
@@ -23,6 +23,7 @@
     </parent>
 
     <name>Kitodo - Long Term Preservation Validation</name>
+    <groupId>org.kitodo</groupId>
     <artifactId>kitodo-longtermpreservation-validation</artifactId>
 
     <properties>
diff --git a/Kitodo-PersistentIdentifier/pom.xml b/Kitodo-PersistentIdentifier/pom.xml
index cd94126527c..6736c4fe73a 100644
--- a/Kitodo-PersistentIdentifier/pom.xml
+++ b/Kitodo-PersistentIdentifier/pom.xml
@@ -23,6 +23,7 @@
     </parent>
 
     <name>Kitodo - Persistent Identifier</name>
+    <groupId>org.kitodo</groupId>
     <artifactId>kitodo-persistentidentifier</artifactId>
 
     <properties>
diff --git a/Kitodo-Query-URL-Import/pom.xml b/Kitodo-Query-URL-Import/pom.xml
index 24372b7cec3..7c77fa133bb 100644
--- a/Kitodo-Query-URL-Import/pom.xml
+++ b/Kitodo-Query-URL-Import/pom.xml
@@ -21,6 +21,7 @@
     </parent>
 
     <name>Kitodo - Query URL Import</name>
+    <groupId>org.kitodo</groupId>
     <artifactId>kitodo-query-url-import</artifactId>
 
     <properties>
diff --git a/Kitodo-XML-SchemaConverter/pom.xml b/Kitodo-XML-SchemaConverter/pom.xml
index c945bfa3909..9de4ebc5921 100644
--- a/Kitodo-XML-SchemaConverter/pom.xml
+++ b/Kitodo-XML-SchemaConverter/pom.xml
@@ -21,6 +21,7 @@
     </parent>
 
     <name>Kitodo - XML SchemaConverter</name>
+    <groupId>org.kitodo</groupId>
     <artifactId>kitodo-xml-schemaconverter</artifactId>
 
     <properties>
diff --git a/Kitodo/pom.xml b/Kitodo/pom.xml
index dd683ed9120..68dd897b33c 100644
--- a/Kitodo/pom.xml
+++ b/Kitodo/pom.xml
@@ -74,9 +74,10 @@
         <version>3.7.0</version>
     </parent>
 
-    <name>Kitodo - Core</name>
+    <groupId>org.kitodo</groupId>
     <artifactId>kitodo</artifactId>
     <packaging>war</packaging>
+    <name>Kitodo - Core</name>
 
     <properties>
         <main.basedir>${project.parent.basedir}</main.basedir>
@@ -434,8 +435,8 @@
               that means first entry will be added as last resource and may override other resources -->
             <resource>
                 <!-- ATTENTION! This config is only loaded in all-tests and selenium profile with specified path-->
-                <directory>${build.resources.path}</directory>
                 <filtering>true</filtering>
+                <directory>${build.resources.path}</directory>
                 <includes>
                     <include>**/*.xml</include>
                     <include>**/*.properties</include>
@@ -473,9 +474,6 @@
     <profiles>
         <profile>
             <id>all-tests</id>
-            <properties>
-                <build.resources.path>src/test/resources</build.resources.path>
-            </properties>
             <build>
                 <plugins>
                     <plugin>
@@ -493,6 +491,9 @@
                     </plugin>
                 </plugins>
             </build>
+            <properties>
+                <build.resources.path>src/test/resources</build.resources.path>
+            </properties>
         </profile>
 
         <profile>
@@ -538,6 +539,25 @@
                         <artifactId>cargo-maven3-plugin</artifactId>
                         <version>${cargo.plugin.version}</version>
 
+                        <executions>
+                            <!-- start Tomcat -->
+                            <execution>
+                                <id>start-container</id>
+                                <phase>integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <!-- stop Tomcat -->
+                            <execution>
+                                <id>stop-container</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+
                         <configuration>
                             <!-- Provide Tomcat -->
                             <container>
@@ -561,25 +581,6 @@
                                 </deployable>
                             </deployables>
                         </configuration>
-
-                        <executions>
-                            <!-- start Tomcat -->
-                            <execution>
-                                <id>start-container</id>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>start</goal>
-                                </goals>
-                            </execution>
-                            <!-- stop Tomcat -->
-                            <execution>
-                                <id>stop-container</id>
-                                <phase>post-integration-test</phase>
-                                <goals>
-                                    <goal>stop</goal>
-                                </goals>
-                            </execution>
-                        </executions>
                     </plugin>
 
                     <plugin>
@@ -646,6 +647,25 @@
                         <artifactId>cargo-maven3-plugin</artifactId>
                         <version>${cargo.plugin.version}</version>
 
+                        <executions>
+                            <!-- start Tomcat -->
+                            <execution>
+                                <id>start-container</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>start</goal>
+                                </goals>
+                            </execution>
+                            <!-- stop Tomcat -->
+                            <execution>
+                                <id>stop-container</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>stop</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+
                         <configuration>
                             <!-- Provide Tomcat -->
                             <container>
@@ -669,32 +689,23 @@
                                 </deployable>
                             </deployables>
                         </configuration>
+                    </plugin>
 
+                    <plugin>
+                        <!-- Run tests -->
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
+                        <version>${maven-failsafe-plugin.version}</version>
                         <executions>
-                            <!-- start Tomcat -->
-                            <execution>
-                                <id>start-container</id>
-                                <phase>pre-integration-test</phase>
-                                <goals>
-                                    <goal>start</goal>
-                                </goals>
-                            </execution>
-                            <!-- stop Tomcat -->
                             <execution>
-                                <id>stop-container</id>
-                                <phase>post-integration-test</phase>
+                                <phase>integration-test</phase>
                                 <goals>
-                                    <goal>stop</goal>
+                                    <goal>integration-test</goal>
+                                    <goal>verify</goal>
                                 </goals>
                             </execution>
                         </executions>
-                    </plugin>
 
-                    <plugin>
-                        <!-- Run tests -->
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-failsafe-plugin</artifactId>
-                        <version>${maven-failsafe-plugin.version}</version>
                         <configuration>
                             <excludes>
                                 <exclude>**/*IT.java</exclude>
@@ -704,16 +715,6 @@
                                 <include>**/*ST.java</include>
                             </includes>
                         </configuration>
-
-                        <executions>
-                            <execution>
-                                <phase>integration-test</phase>
-                                <goals>
-                                    <goal>integration-test</goal>
-                                    <goal>verify</goal>
-                                </goals>
-                            </execution>
-                        </executions>
                     </plugin>
                 </plugins>
             </build>
diff --git a/pom.xml b/pom.xml
index 42fc7d7ba0c..8f54c319bea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,12 +22,29 @@
     <version>3.7.0</version>
     <packaging>pom</packaging>
 
+    <name>Kitodo Production</name>
+    <url>https://github.com/kitodo/kitodo-production</url>
     <organization>
         <name>Kitodo. Key to digital objects e. V.</name>
         <url>https://www.kitodo.org</url>
     </organization>
-    <name>Kitodo Production</name>
-    <url>https://github.com/kitodo/kitodo-production</url>
+
+    <modules>
+        <module>Kitodo-API</module>
+        <module>Kitodo-DataManagement</module>
+        <module>Kitodo-Query-URL-Import</module>
+        <module>Kitodo-Command</module>
+        <module>Kitodo-FileManagement</module>
+        <module>Kitodo-DataEditor</module>
+        <module>Kitodo-DataFormat</module>
+        <module>Kitodo-ImageManagement</module>
+        <module>Kitodo-LongTermPreservationValidation</module>
+        <module>Kitodo-PersistentIdentifier</module>
+        <module>Kitodo-Docket</module>
+        <module>Kitodo-XML-SchemaConverter</module>
+        <module>Kitodo-Validation</module>
+        <module>Kitodo</module>
+    </modules>
 
     <properties>
         <kitodo.version>3.7.0</kitodo.version>
@@ -89,23 +106,6 @@
         <maven-javadoc-plugin.version>3.3.0</maven-javadoc-plugin.version>
     </properties>
 
-    <modules>
-        <module>Kitodo-API</module>
-        <module>Kitodo-DataManagement</module>
-        <module>Kitodo-Query-URL-Import</module>
-        <module>Kitodo-Command</module>
-        <module>Kitodo-FileManagement</module>
-        <module>Kitodo-DataEditor</module>
-        <module>Kitodo-DataFormat</module>
-        <module>Kitodo-ImageManagement</module>
-        <module>Kitodo-LongTermPreservationValidation</module>
-        <module>Kitodo-PersistentIdentifier</module>
-        <module>Kitodo-Docket</module>
-        <module>Kitodo-XML-SchemaConverter</module>
-        <module>Kitodo-Validation</module>
-        <module>Kitodo</module>
-    </modules>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -128,13 +128,13 @@
                 <groupId>com.xebialabs.restito</groupId>
                 <artifactId>restito</artifactId>
                 <version>0.9.3</version>
+                <scope>test</scope>
                 <exclusions>
                     <exclusion>
                         <groupId>junit</groupId>
                         <artifactId>junit</artifactId>
                     </exclusion>
                 </exclusions>
-                <scope>test</scope>
             </dependency>
             <dependency>
                 <groupId>commons-codec</groupId>
@@ -489,8 +489,8 @@ from system library in Java 11+ -->
                 <scope>test</scope>
                 <exclusions>
                     <exclusion>
-                        <artifactId>commons-io</artifactId>
                         <groupId>commons-io</groupId>
+                        <artifactId>commons-io</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
@@ -501,8 +501,8 @@ from system library in Java 11+ -->
                 <scope>test</scope>
                 <exclusions>
                     <exclusion>
-                        <artifactId>plexus-utils</artifactId>
                         <groupId>org.codehaus.plexus</groupId>
+                        <artifactId>plexus-utils</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
@@ -782,8 +782,8 @@ from system library in Java 11+ -->
                 <scope>test</scope>
                 <exclusions>
                     <exclusion>
-                        <artifactId>commons-logging</artifactId>
                         <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>commons-codec</groupId>
@@ -806,8 +806,8 @@ from system library in Java 11+ -->
                 <scope>test</scope>
                 <exclusions>
                     <exclusion>
-                        <artifactId>commons-logging</artifactId>
                         <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>commons-codec</groupId>
@@ -830,8 +830,8 @@ from system library in Java 11+ -->
                 <scope>test</scope>
                 <exclusions>
                     <exclusion>
-                        <artifactId>commons-logging</artifactId>
                         <groupId>commons-logging</groupId>
+                        <artifactId>commons-logging</artifactId>
                     </exclusion>
                     <exclusion>
                         <groupId>commons-codec</groupId>
@@ -899,28 +899,28 @@ from system library in Java 11+ -->
                         <artifactId>commons-logging</artifactId>
                     </exclusion>
                     <exclusion>
-                        <artifactId>spring-core</artifactId>
                         <groupId>org.springframework</groupId>
+                        <artifactId>spring-core</artifactId>
                     </exclusion>
                     <exclusion>
-                        <artifactId>spring-expression</artifactId>
                         <groupId>org.springframework</groupId>
+                        <artifactId>spring-expression</artifactId>
                     </exclusion>
                     <exclusion>
-                        <artifactId>spring-beans</artifactId>
                         <groupId>org.springframework</groupId>
+                        <artifactId>spring-beans</artifactId>
                     </exclusion>
                     <exclusion>
-                        <artifactId>spring-context</artifactId>
                         <groupId>org.springframework</groupId>
+                        <artifactId>spring-context</artifactId>
                     </exclusion>
                     <exclusion>
-                        <artifactId>spring-web</artifactId>
                         <groupId>org.springframework</groupId>
+                        <artifactId>spring-web</artifactId>
                     </exclusion>
                     <exclusion>
-                        <artifactId>spring-aop</artifactId>
                         <groupId>org.springframework</groupId>
+                        <artifactId>spring-aop</artifactId>
                     </exclusion>
                 </exclusions>
             </dependency>
@@ -972,29 +972,29 @@ from system library in Java 11+ -->
     <build>
         <pluginManagement>
             <plugins>
-<plugin>
-    <groupId>org.apache.maven.plugins</groupId>
-    <artifactId>maven-enforcer-plugin</artifactId>
-    <version>3.3.0</version>
-    <executions>
-        <execution>
-            <id>enforce-maven</id>
-            <goals>
-                <goal>enforce</goal>
-            </goals>
-            <configuration>
-                <rules>
-                    <requireMavenVersion>
-                        <version>3.6.0</version>
-                    </requireMavenVersion>
-                    <requireJavaVersion>
-                        <version>11</version>
-                    </requireJavaVersion>
-                </rules>
-            </configuration>
-        </execution>
-    </executions>
-</plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>3.3.0</version>
+                    <executions>
+                        <execution>
+                            <id>enforce-maven</id>
+                            <goals>
+                                <goal>enforce</goal>
+                            </goals>
+                            <configuration>
+                                <rules>
+                                    <requireMavenVersion>
+                                        <version>3.6.0</version>
+                                    </requireMavenVersion>
+                                    <requireJavaVersion>
+                                        <version>11</version>
+                                    </requireJavaVersion>
+                                </rules>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
                 <plugin>
                     <groupId>org.owasp</groupId>
                     <artifactId>dependency-check-maven</artifactId>
@@ -1015,8 +1015,6 @@ from system library in Java 11+ -->
                         <execution>
                             <id>analyze</id>
                             <phase>verify</phase>
-                            <goals>
-                            </goals>
                             <configuration>
                                 <failOnViolation>true</failOnViolation>
                             </configuration>
@@ -1084,15 +1082,6 @@ from system library in Java 11+ -->
                     <groupId>org.flywaydb</groupId>
                     <artifactId>flyway-maven-plugin</artifactId>
                     <version>${flyway-maven-plugin.version}</version>
-                    <configuration>
-                        <configFiles>
-                            <!-- local configuration file -->
-                            <!--<configFile>${main.basedir}/config-local/flyway.properties</configFile>-->
-                            <configFile>
-                                ${main.basedir}/Kitodo-DataManagement/src/main/resources/db/config/flyway.properties
-                            </configFile>
-                        </configFiles>
-                    </configuration>
                     <dependencies>
                         <dependency>
                             <groupId>com.mysql</groupId>
@@ -1110,6 +1099,15 @@ from system library in Java 11+ -->
                             <version>${mariadb-java-client.version}</version>
                         </dependency>
                     </dependencies>
+                    <configuration>
+                        <configFiles>
+                            <!-- local configuration file -->
+                            <!--<configFile>${main.basedir}/config-local/flyway.properties</configFile>-->
+                            <configFile>
+                                ${main.basedir}/Kitodo-DataManagement/src/main/resources/db/config/flyway.properties
+                            </configFile>
+                        </configFiles>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.jacoco</groupId>
@@ -1129,6 +1127,15 @@ from system library in Java 11+ -->
                     </dependency>
                   </dependencies>
 -->
+                  <executions>
+                    <execution>
+                      <id>analyze-compile</id>
+                      <phase>compile</phase>
+                      <goals>
+                        <goal>check</goal>
+                      </goals>
+                    </execution>
+                  </executions>
                   <configuration>
                     <effort>Max</effort>
                     <threshold>Low</threshold>
@@ -1146,22 +1153,13 @@ from system library in Java 11+ -->
                       </plugin>
                     </plugins>
                   </configuration>
-                  <executions>
-                    <execution>
-                      <id>analyze-compile</id>
-                      <phase>compile</phase>
-                      <goals>
-                        <goal>check</goal>
-                      </goals>
-                    </execution>
-                  </executions>
                 </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
             <plugin>
-                <inherited>false</inherited>
                 <artifactId>maven-clean-plugin</artifactId>
+                <inherited>false</inherited>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -1224,10 +1222,6 @@ from system library in Java 11+ -->
               <groupId>org.codehaus.mojo</groupId>
               <artifactId>flatten-maven-plugin</artifactId>
               <version>1.1.0</version>
-              <configuration>
-                <updatePomFile>true</updatePomFile>
-                <flattenMode>resolveCiFriendliesOnly</flattenMode>
-              </configuration>
               <executions>
                 <execution>
                   <id>flatten</id>
@@ -1244,6 +1238,10 @@ from system library in Java 11+ -->
                   </goals>
                 </execution>
               </executions>
+              <configuration>
+                <updatePomFile>true</updatePomFile>
+                <flattenMode>resolveCiFriendliesOnly</flattenMode>
+              </configuration>
             </plugin>
         </plugins>
     </build>
@@ -1275,17 +1273,13 @@ from system library in Java 11+ -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-checkstyle-plugin</artifactId>
-                        <dependencies>
-                            <dependency>
-                                <groupId>com.puppycrawl.tools</groupId>
-                                <artifactId>checkstyle</artifactId>
-                                <version>10.17.0</version>
-                            </dependency>
-                        </dependencies>
                         <executions>
                             <execution>
                                 <id>checkstyle-check</id>
                                 <phase>validate</phase>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
                                 <configuration>
                                     <failOnViolation>true</failOnViolation>
                                     <failsOnError>false</failsOnError>
@@ -1293,11 +1287,15 @@ from system library in Java 11+ -->
                                     <maxAllowedViolations>${maxAllowedViolations}</maxAllowedViolations>
                                     <violationSeverity>warning</violationSeverity>
                                 </configuration>
-                                <goals>
-                                    <goal>check</goal>
-                                </goals>
                             </execution>
                         </executions>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.puppycrawl.tools</groupId>
+                                <artifactId>checkstyle</artifactId>
+                                <version>10.17.0</version>
+                            </dependency>
+                        </dependencies>
                     </plugin>
                 </plugins>
             </build>
@@ -1359,13 +1357,6 @@ from system library in Java 11+ -->
                     <plugin>
                         <groupId>com.github.spotbugs</groupId>
                         <artifactId>spotbugs-maven-plugin</artifactId>
-                        <configuration>
-                            <xmlOutput>true</xmlOutput>
-                            <xmlOutputDirectory>target/spotbugsreports</xmlOutputDirectory>
-                            <effort>Max</effort>
-                            <failOnError>false</failOnError>
-                            <threshold>medium</threshold>
-                        </configuration>
                         <executions>
                             <execution>
                                 <phase>compile</phase>
@@ -1374,6 +1365,13 @@ from system library in Java 11+ -->
                                 </goals>
                             </execution>
                         </executions>
+                        <configuration>
+                            <xmlOutput>true</xmlOutput>
+                            <xmlOutputDirectory>target/spotbugsreports</xmlOutputDirectory>
+                            <effort>Max</effort>
+                            <failOnError>false</failOnError>
+                            <threshold>medium</threshold>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
@@ -1386,15 +1384,15 @@ from system library in Java 11+ -->
                         <groupId>org.flywaydb</groupId>
                         <artifactId>flyway-maven-plugin</artifactId>
                         <version>${flyway-maven-plugin.version}</version>
-                        <configuration>
-                            <configFiles>
-                                <!-- local configuration file -->
-                                <!--<configFile>${main.basedir}/config-local/flyway.properties</configFile>-->
-                                <configFile>
-                                    ${main.basedir}/Kitodo-DataManagement/src/main/resources/db/config/flyway.properties
-                                </configFile>
-                            </configFiles>
-                        </configuration>
+                        <executions>
+                            <execution>
+                                <phase>${phase.prop}</phase>
+                                <goals>
+                                    <goal>baseline</goal>
+                                    <goal>migrate</goal>
+                                </goals>
+                            </execution>
+                        </executions>
                         <dependencies>
                             <dependency>
                                 <groupId>com.mysql</groupId>
@@ -1407,15 +1405,15 @@ from system library in Java 11+ -->
                                 <version>${mariadb-java-client.version}</version>
                             </dependency>
                         </dependencies>
-                        <executions>
-                            <execution>
-                                <phase>${phase.prop}</phase>
-                                <goals>
-                                    <goal>baseline</goal>
-                                    <goal>migrate</goal>
-                                </goals>
-                            </execution>
-                        </executions>
+                        <configuration>
+                            <configFiles>
+                                <!-- local configuration file -->
+                                <!--<configFile>${main.basedir}/config-local/flyway.properties</configFile>-->
+                                <configFile>
+                                    ${main.basedir}/Kitodo-DataManagement/src/main/resources/db/config/flyway.properties
+                                </configFile>
+                            </configFiles>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>
@@ -1428,24 +1426,23 @@ from system library in Java 11+ -->
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
                         <version>${maven-javadoc-plugin.version}</version>
-                        <configuration>
-                            <reportOutputDirectory>${doctarget}</reportOutputDirectory>
-                            <destDir>${docdir}</destDir>
-                            <!-- Default configuration for all reports -->
-                            <failOnError>false</failOnError>
-                            <doclint>-html</doclint>
-                        </configuration>
                         <executions>
                             <execution>
                                 <id>aggregate</id>
+                                <phase>site</phase>
                                 <goals>
                                     <goal>aggregate</goal>
                                 </goals>
-                                <phase>site</phase>
-                                <configuration>
-                                </configuration>
+                                <configuration></configuration>
                             </execution>
                         </executions>
+                        <configuration>
+                            <reportOutputDirectory>${doctarget}</reportOutputDirectory>
+                            <destDir>${docdir}</destDir>
+                            <!-- Default configuration for all reports -->
+                            <failOnError>false</failOnError>
+                            <doclint>-html</doclint>
+                        </configuration>
                     </plugin>
                 </plugins>
             </build>