diff --git a/build-plugins/build.gradle b/build-plugins/build.gradle
index 88e4532555..1e8836b601 100644
--- a/build-plugins/build.gradle
+++ b/build-plugins/build.gradle
@@ -33,7 +33,7 @@ apply from: file( '../gradle/dependencies.gradle' )
 dependencies {
   implementation gradleApi()
   implementation 'com.github.node-gradle:gradle-node-plugin:2.2.4'
-  implementation 'gradle.plugin.com.hierynomus.gradle.plugins:license-gradle-plugin:0.15.0'
+  implementation 'org.scm-manager:gradle-license-plugin:0.7.1'
 
   implementation libraries.guava
   implementation libraries.jettyServer
diff --git a/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy b/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy
index 1978e26395..6ce1582905 100644
--- a/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy
+++ b/build-plugins/src/main/groovy/com/cloudogu/scm/JavaModulePlugin.groovy
@@ -23,7 +23,6 @@
  */
 package com.cloudogu.scm
 
-import com.hierynomus.gradle.license.tasks.LicenseCheck
 import org.gradle.api.Plugin
 import org.gradle.api.Project
 import org.gradle.api.publish.maven.MavenPublication
@@ -36,7 +35,7 @@ class JavaModulePlugin implements Plugin<Project> {
   void apply(Project project) {
     project.plugins.apply("java")
     project.plugins.apply("maven-publish")
-    project.plugins.apply("com.github.hierynomus.license")
+    project.plugins.apply("org.scm-manager.license")
 
     project.java {
       toolchain {
@@ -110,14 +109,8 @@ class JavaModulePlugin implements Plugin<Project> {
 
     project.license {
       header project.rootProject.file('LICENSE.txt')
-      strictCheck true
-
-      mapping {
-        tsx = 'SLASHSTAR_STYLE'
-        ts = 'SLASHSTAR_STYLE'
-        java = 'SLASHSTAR_STYLE'
-        gradle = 'SLASHSTAR_STYLE'
-      }
+      newLine = true
+      ignoreNewLine = true
 
       exclude "**/*.mustache"
       exclude "**/*.json"
@@ -133,17 +126,14 @@ class JavaModulePlugin implements Plugin<Project> {
       exclude "**/*.jpg"
       exclude "**/*.gif"
       exclude "**/*.dump"
+
+      tasks {
+        gradle {
+          files.from("build.gradle", "settings.gradle", "gradle.properties")
+        }
+      }
     }
 
-    project.tasks.register("licenseBuild", LicenseCheck) {
-      source = project.fileTree(dir: ".").include("build.gradle", "settings.gradle", "gradle.properties")
-      enabled = true
-    }
-
-    project.tasks.getByName("license").configure {
-      dependsOn("licenseBuild")
-      enabled = true
-    }
   }
 
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c023..7454180f2a 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2a563242c1..e750102e09 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0c81..1b6c787337 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/scm-annotations/src/main/resources/META-INF/scm/module.xml b/scm-annotations/src/main/resources/META-INF/scm/module.xml
index 1401201080..d37ac4d643 100644
--- a/scm-annotations/src/main/resources/META-INF/scm/module.xml
+++ b/scm-annotations/src/main/resources/META-INF/scm/module.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <module>
   <extension-point>
     <class>javax.servlet.ServletContextListener</class>
diff --git a/scm-core/build.gradle b/scm-core/build.gradle
index f50710fbf2..f555b6a56b 100644
--- a/scm-core/build.gradle
+++ b/scm-core/build.gradle
@@ -128,7 +128,7 @@ dependencies {
 }
 
 jar {
-  from project.buildDirectory.dir('info')
+  from project.layout.buildDirectory.dir('info')
   dependsOn 'build-info'
 }
 
diff --git a/scm-core/src/test/resources/META-INF/validation.xml b/scm-core/src/test/resources/META-INF/validation.xml
index 521ef2b195..c09458c79e 100644
--- a/scm-core/src/test/resources/META-INF/validation.xml
+++ b/scm-core/src/test/resources/META-INF/validation.xml
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <validation-config
   xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/scm-core/src/test/resources/sonia/scm/plugin/module.xml b/scm-core/src/test/resources/sonia/scm/plugin/module.xml
index 03882e378c..37e16a7178 100644
--- a/scm-core/src/test/resources/sonia/scm/plugin/module.xml
+++ b/scm-core/src/test/resources/sonia/scm/plugin/module.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <module>
 
   <!-- subscribers -->
diff --git a/scm-core/src/test/resources/sonia/scm/plugin/review-plugin.xml b/scm-core/src/test/resources/sonia/scm/plugin/review-plugin.xml
index dccadb5b12..0274e51dc6 100644
--- a/scm-core/src/test/resources/sonia/scm/plugin/review-plugin.xml
+++ b/scm-core/src/test/resources/sonia/scm/plugin/review-plugin.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <plugin>
   <scm-version>2</scm-version>
   <information>
diff --git a/scm-core/src/test/resources/sonia/scm/util/xmlutil.01.xml b/scm-core/src/test/resources/sonia/scm/util/xmlutil.01.xml
index d78f619f4c..1435c056e5 100644
--- a/scm-core/src/test/resources/sonia/scm/util/xmlutil.01.xml
+++ b/scm-core/src/test/resources/sonia/scm/util/xmlutil.01.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <root>
   <entry01>value01</entry01>
   <parent>
diff --git a/scm-dao-xml/src/test/resources/sonia/scm/store/fixed.format.xml b/scm-dao-xml/src/test/resources/sonia/scm/store/fixed.format.xml
index dbabc24c53..0f017db35f 100644
--- a/scm-dao-xml/src/test/resources/sonia/scm/store/fixed.format.xml
+++ b/scm-dao-xml/src/test/resources/sonia/scm/store/fixed.format.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" ?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <configuration>
   <entry>
     <key>3ZOHKUePB3</key>
diff --git a/scm-dao-xml/src/test/resources/sonia/scm/store/repositoryDaoMetadata.xml b/scm-dao-xml/src/test/resources/sonia/scm/store/repositoryDaoMetadata.xml
index e17b0dffbd..80ef1de5ee 100644
--- a/scm-dao-xml/src/test/resources/sonia/scm/store/repositoryDaoMetadata.xml
+++ b/scm-dao-xml/src/test/resources/sonia/scm/store/repositoryDaoMetadata.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <repositories>
     <properties/>
     <id>existing</id>
diff --git a/scm-dao-xml/src/test/resources/sonia/scm/store/wrong.format.xml b/scm-dao-xml/src/test/resources/sonia/scm/store/wrong.format.xml
index ba5ae8d5b3..4e92f76f14 100644
--- a/scm-dao-xml/src/test/resources/sonia/scm/store/wrong.format.xml
+++ b/scm-dao-xml/src/test/resources/sonia/scm/store/wrong.format.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" ?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <configuration>
   <entry>
     <key>3ZOHKUePB3</key>
diff --git a/scm-packaging/deb/Vagrantfile b/scm-packaging/deb/Vagrantfile
index 52e6f418e3..4734125d0f 100644
--- a/scm-packaging/deb/Vagrantfile
+++ b/scm-packaging/deb/Vagrantfile
@@ -1,5 +1,26 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
+#
+# MIT License
+#
+# Copyright (c) 2020-present Cloudogu GmbH and Contributors
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
 
 Vagrant.configure("2") do |config|
   config.vm.box = "bento/ubuntu-18.04"
diff --git a/scm-packaging/deb/build.gradle b/scm-packaging/deb/build.gradle
index 3c0dc035d2..c8131f8439 100644
--- a/scm-packaging/deb/build.gradle
+++ b/scm-packaging/deb/build.gradle
@@ -21,12 +21,13 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 import org.gradle.util.VersionNumber
 
 plugins {
   id 'nebula.ospackage' version '8.5.6'
   id 'org.scm-manager.packaging'
-  id 'com.github.hierynomus.license-base' version '0.15.0'
+  id 'org.scm-manager.license' version '0.7.1'
 }
 
 configurations {
@@ -168,20 +169,15 @@ artifacts {
 
 license {
   header rootProject.file("LICENSE.txt")
-  strictCheck true
 
-  mapping {
-    gradle = 'SLASHSTAR_STYLE'
+  tasks {
+    build {
+      files.from("build.gradle", "Vagrantfile")
+    }
+    main {
+      files.from("src")
+    }
   }
-
-  exclude '**/build/**'
-  include '**/src/**'
-  include 'build.gradle'
-  include 'Vagrantfile'
-}
-
-task license(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
-  source = fileTree('.')
 }
 
 task publish(type: HttpUploadTask) {
diff --git a/scm-packaging/deb/src/main/fs/etc/scm/logging.xml b/scm-packaging/deb/src/main/fs/etc/scm/logging.xml
index f07dfe47b4..39a4bfc37c 100644
--- a/scm-packaging/deb/src/main/fs/etc/scm/logging.xml
+++ b/scm-packaging/deb/src/main/fs/etc/scm/logging.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!--
     Document   : logback.release.xml
     Created on : February 3, 2011, 6:36 PM
diff --git a/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml b/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml
index 698acc83de..6a16453b6e 100644
--- a/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml
+++ b/scm-packaging/deb/src/main/fs/etc/scm/server-config.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
 <Configure id="ScmServer" class="org.eclipse.jetty.server.Server">
 
diff --git a/scm-packaging/deb/src/main/fs/opt/scm-server/var/webapp/docroot/index.html b/scm-packaging/deb/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
index a3bff3f8b3..bf3ece6e22 100644
--- a/scm-packaging/deb/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
+++ b/scm-packaging/deb/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
diff --git a/scm-packaging/docker/build.gradle b/scm-packaging/docker/build.gradle
index ebfaf40735..f33cd8b4b1 100644
--- a/scm-packaging/docker/build.gradle
+++ b/scm-packaging/docker/build.gradle
@@ -25,7 +25,7 @@
 plugins {
   id 'com.bmuschko.docker-remote-api' version '6.6.1'
   id 'org.scm-manager.packaging'
-  id 'com.github.hierynomus.license-base' version '0.15.0'
+  id 'org.scm-manager.license' version '0.7.1'
 }
 
 import org.gradle.util.VersionNumber
@@ -119,18 +119,17 @@ artifacts {
 
 license {
   header rootProject.file("LICENSE.txt")
-  strictCheck true
 
-  mapping {
-    gradle = 'SLASHSTAR_STYLE'
+  tasks {
+    build {
+      files.from("build.gradle", "Dockerfile")
+    }
+    main {
+      files.from("src")
+    }
   }
-
-  exclude '**/build/**'
-  include '**/src/**'
-  include 'build.gradle'
-  include 'Dockerfile'
 }
 
-task license(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
-  source = fileTree('.')
+task check {
+  dependsOn checkLicenses
 }
diff --git a/scm-packaging/docker/src/main/fs/etc/scm/logging.xml b/scm-packaging/docker/src/main/fs/etc/scm/logging.xml
index a05aa9caf0..c6c0bdbe57 100644
--- a/scm-packaging/docker/src/main/fs/etc/scm/logging.xml
+++ b/scm-packaging/docker/src/main/fs/etc/scm/logging.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!--
     Document   : logback.release.xml
     Created on : February 3, 2011, 6:36 PM
diff --git a/scm-packaging/docker/src/main/fs/etc/scm/server-config.xml b/scm-packaging/docker/src/main/fs/etc/scm/server-config.xml
index 698acc83de..6a16453b6e 100644
--- a/scm-packaging/docker/src/main/fs/etc/scm/server-config.xml
+++ b/scm-packaging/docker/src/main/fs/etc/scm/server-config.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
 <Configure id="ScmServer" class="org.eclipse.jetty.server.Server">
 
diff --git a/scm-packaging/docker/src/main/fs/opt/scm-server/var/webapp/docroot/index.html b/scm-packaging/docker/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
index a3bff3f8b3..bf3ece6e22 100644
--- a/scm-packaging/docker/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
+++ b/scm-packaging/docker/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
diff --git a/scm-packaging/helm/build.gradle b/scm-packaging/helm/build.gradle
index 983f5d5ff4..876b08fe78 100644
--- a/scm-packaging/helm/build.gradle
+++ b/scm-packaging/helm/build.gradle
@@ -26,7 +26,7 @@ plugins {
   id 'org.unbroken-dome.helm' version '1.5.0'
   id 'org.unbroken-dome.helm-publish' version '1.5.0'
   id 'org.scm-manager.packaging'
-  id 'com.github.hierynomus.license-base' version '0.15.0'
+  id 'org.scm-manager.license' version '0.7.1'
 }
 
 configurations {
@@ -97,23 +97,20 @@ task publish {
 
 license {
   header rootProject.file("LICENSE.txt")
-  strictCheck true
 
-  mapping {
-    gradle = 'SLASHSTAR_STYLE'
-  }
-
-  // TODO
-  // we get a strange build error with the license header,
-  // so we remove it for now
   exclude '**/Chart.yaml'
-
-  exclude '**/build/**'
   exclude '**/*.txt'
-  include '**/src/**'
-  include 'build.gradle'
+
+  tasks {
+    build {
+      files.from("build.gradle")
+    }
+    main {
+      files.from("src")
+    }
+  }
 }
 
-task license(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
-  source = fileTree('.')
+task check {
+  dependsOn checkLicenses
 }
diff --git a/scm-packaging/release-yaml/build.gradle b/scm-packaging/release-yaml/build.gradle
index 2d0473e04c..3c4449f628 100644
--- a/scm-packaging/release-yaml/build.gradle
+++ b/scm-packaging/release-yaml/build.gradle
@@ -1,5 +1,3 @@
-import com.cloudogu.scm.GitHubUploadTask
-
 /*
  * MIT License
  *
@@ -24,9 +22,11 @@ import com.cloudogu.scm.GitHubUploadTask
  * SOFTWARE.
  */
 
+import com.cloudogu.scm.GitHubUploadTask
+
 plugins {
   id 'org.scm-manager.packaging'
-  id 'com.github.hierynomus.license-base' version '0.15.0'
+  id 'org.scm-manager.license' version '0.7.1'
 }
 
 configurations {
@@ -68,15 +68,15 @@ task publish(type: GitHubUploadTask) {
 
 license {
   header rootProject.file("LICENSE.txt")
-  strictCheck true
-
-  mapping {
-    gradle = 'SLASHSTAR_STYLE'
+  tasks {
+    gradle {
+      files.from('build.gradle')
+    }
   }
-
-  include 'build.gradle'
 }
 
-task license(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
-  source = fileTree('.')
+
+task check {
+  dependsOn checkLicenses
 }
+
diff --git a/scm-packaging/rpm/Vagrantfile b/scm-packaging/rpm/Vagrantfile
index 8c67229fa8..6a7fe40042 100644
--- a/scm-packaging/rpm/Vagrantfile
+++ b/scm-packaging/rpm/Vagrantfile
@@ -1,5 +1,26 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
+#
+# MIT License
+#
+# Copyright (c) 2020-present Cloudogu GmbH and Contributors
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
 
 Vagrant.configure("2") do |config|
 
diff --git a/scm-packaging/rpm/build.gradle b/scm-packaging/rpm/build.gradle
index 679fff9e64..fbfcfffbfb 100644
--- a/scm-packaging/rpm/build.gradle
+++ b/scm-packaging/rpm/build.gradle
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 import org.gradle.util.VersionNumber
 
 // nebula.ospackage uses redline to build the rpm package.
@@ -48,7 +49,7 @@ buildscript {
 plugins {
   id 'nebula.ospackage' version '8.5.6'
   id 'org.scm-manager.packaging'
-  id 'com.github.hierynomus.license-base' version '0.15.0'
+  id 'org.scm-manager.license' version '0.7.1'
 }
 
 configurations {
@@ -182,20 +183,15 @@ artifacts {
 
 license {
   header rootProject.file("LICENSE.txt")
-  strictCheck true
 
-  mapping {
-    gradle = 'SLASHSTAR_STYLE'
+  tasks {
+    build {
+      files.from("build.gradle", "Vagrantfile")
+    }
+    main {
+      files.from("src")
+    }
   }
-
-  exclude '**/build/**'
-  include '**/src/**'
-  include 'build.gradle'
-  include 'Vagrantfile'
-}
-
-task license(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
-  source = fileTree('.')
 }
 
 task publish(type: HttpUploadTask) {
diff --git a/scm-packaging/rpm/src/main/fs/etc/scm/logging.xml b/scm-packaging/rpm/src/main/fs/etc/scm/logging.xml
index f07dfe47b4..39a4bfc37c 100644
--- a/scm-packaging/rpm/src/main/fs/etc/scm/logging.xml
+++ b/scm-packaging/rpm/src/main/fs/etc/scm/logging.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!--
     Document   : logback.release.xml
     Created on : February 3, 2011, 6:36 PM
diff --git a/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml b/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml
index 698acc83de..6a16453b6e 100644
--- a/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml
+++ b/scm-packaging/rpm/src/main/fs/etc/scm/server-config.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
 <Configure id="ScmServer" class="org.eclipse.jetty.server.Server">
 
diff --git a/scm-packaging/rpm/src/main/fs/opt/scm-server/var/webapp/docroot/index.html b/scm-packaging/rpm/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
index a3bff3f8b3..bf3ece6e22 100644
--- a/scm-packaging/rpm/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
+++ b/scm-packaging/rpm/src/main/fs/opt/scm-server/var/webapp/docroot/index.html
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
diff --git a/scm-packaging/unix/build.gradle b/scm-packaging/unix/build.gradle
index 164c2694f6..9dbde2504c 100644
--- a/scm-packaging/unix/build.gradle
+++ b/scm-packaging/unix/build.gradle
@@ -21,13 +21,14 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 import org.gradle.util.VersionNumber
 
 plugins {
   id 'org.scm-manager.packaging'
   id 'signing'
   id 'maven-publish'
-  id 'com.github.hierynomus.license-base' version '0.15.0'
+  id 'org.scm-manager.license' version '0.7.1'
 }
 
 configurations {
@@ -127,18 +128,13 @@ project.rootProject.publishing.repositories.each { r ->
 
 license {
   header rootProject.file("LICENSE.txt")
-  strictCheck true
 
-  mapping {
-    gradle = 'SLASHSTAR_STYLE'
+  tasks {
+    build {
+      files.from("build.gradle", "Dockerfile")
+    }
+    main {
+      files.from("src")
+    }
   }
-
-  exclude '**/build/**'
-  exclude '**/*.txt'
-  include '**/src/**'
-  include 'build.gradle'
-}
-
-task license(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
-  source = fileTree('.')
 }
diff --git a/scm-packaging/unix/src/main/fs/conf/logging.xml b/scm-packaging/unix/src/main/fs/conf/logging.xml
index e5e7491ea6..b6689c7acb 100644
--- a/scm-packaging/unix/src/main/fs/conf/logging.xml
+++ b/scm-packaging/unix/src/main/fs/conf/logging.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!--
     Document   : logback.release.xml
     Created on : February 3, 2011, 6:36 PM
diff --git a/scm-packaging/unix/src/main/fs/conf/server-config.xml b/scm-packaging/unix/src/main/fs/conf/server-config.xml
index c7518e97a0..49fecb4333 100644
--- a/scm-packaging/unix/src/main/fs/conf/server-config.xml
+++ b/scm-packaging/unix/src/main/fs/conf/server-config.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
 <Configure id="ScmServer" class="org.eclipse.jetty.server.Server">
 
diff --git a/scm-packaging/unix/src/main/fs/var/webapp/docroot/index.html b/scm-packaging/unix/src/main/fs/var/webapp/docroot/index.html
index a3bff3f8b3..bf3ece6e22 100644
--- a/scm-packaging/unix/src/main/fs/var/webapp/docroot/index.html
+++ b/scm-packaging/unix/src/main/fs/var/webapp/docroot/index.html
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
diff --git a/scm-packaging/windows/build.gradle b/scm-packaging/windows/build.gradle
index 424397899c..2a3a4cad71 100644
--- a/scm-packaging/windows/build.gradle
+++ b/scm-packaging/windows/build.gradle
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+
 import org.gradle.util.VersionNumber
 
 plugins {
@@ -28,7 +29,7 @@ plugins {
   id 'org.scm-manager.packaging'
   id 'signing'
   id 'maven-publish'
-  id 'com.github.hierynomus.license-base' version '0.15.0'
+  id 'org.scm-manager.license' version '0.7.1'
 }
 
 configurations {
@@ -131,18 +132,13 @@ project.rootProject.publishing.repositories.each { r ->
 
 license {
   header rootProject.file("LICENSE.txt")
-  strictCheck true
 
-  mapping {
-    gradle = 'SLASHSTAR_STYLE'
+  tasks {
+    build {
+      files.from("build.gradle", "Dockerfile")
+    }
+    main {
+      files.from("src")
+    }
   }
-
-  exclude '**/build/**'
-  exclude '**/*.txt'
-  include '**/src/**'
-  include 'build.gradle'
-}
-
-task license(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
-  source = fileTree('.')
 }
diff --git a/scm-packaging/windows/src/main/fs/conf/logging.xml b/scm-packaging/windows/src/main/fs/conf/logging.xml
index eb49802935..a042102119 100644
--- a/scm-packaging/windows/src/main/fs/conf/logging.xml
+++ b/scm-packaging/windows/src/main/fs/conf/logging.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!--
     Document   : logback.release.xml
     Created on : February 3, 2011, 6:36 PM
diff --git a/scm-packaging/windows/src/main/fs/conf/server-config.xml b/scm-packaging/windows/src/main/fs/conf/server-config.xml
index 568134ffdd..d502c0a729 100644
--- a/scm-packaging/windows/src/main/fs/conf/server-config.xml
+++ b/scm-packaging/windows/src/main/fs/conf/server-config.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "http://www.eclipse.org/jetty/configure_9_0.dtd">
 <Configure id="ScmServer" class="org.eclipse.jetty.server.Server">
 
diff --git a/scm-packaging/windows/src/main/fs/scm-server.xml b/scm-packaging/windows/src/main/fs/scm-server.xml
index 79986130ef..cd7ee27d59 100644
--- a/scm-packaging/windows/src/main/fs/scm-server.xml
+++ b/scm-packaging/windows/src/main/fs/scm-server.xml
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,7 +20,6 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
 
 <service>
diff --git a/scm-packaging/windows/src/main/fs/webapp/docroot/index.html b/scm-packaging/windows/src/main/fs/webapp/docroot/index.html
index a3bff3f8b3..bf3ece6e22 100644
--- a/scm-packaging/windows/src/main/fs/webapp/docroot/index.html
+++ b/scm-packaging/windows/src/main/fs/webapp/docroot/index.html
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
diff --git a/scm-plugins/scm-git-plugin/build.gradle b/scm-plugins/scm-git-plugin/build.gradle
index 1ef13287b6..7ce2d8a5d7 100644
--- a/scm-plugins/scm-git-plugin/build.gradle
+++ b/scm-plugins/scm-git-plugin/build.gradle
@@ -22,9 +22,8 @@
  * SOFTWARE.
  */
 
-
 plugins {
-  id 'org.scm-manager.smp' version '0.9.4'
+  id 'org.scm-manager.smp' version '0.10.0'
 }
 
 def jgitVersion = '5.11.1.202105131744-r-scm1'
diff --git a/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/permissions.xml b/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/permissions.xml
index 01f155e8ed..0684134a6e 100644
--- a/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/permissions.xml
+++ b/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/permissions.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <permissions>
   
   <permission>
diff --git a/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/repository-permissions.xml b/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/repository-permissions.xml
index 2449c60b97..0cb187f684 100644
--- a/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/repository-permissions.xml
+++ b/scm-plugins/scm-git-plugin/src/main/resources/META-INF/scm/repository-permissions.xml
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <repository-permissions>
   <verbs>
     <verb>git</verb>
diff --git a/scm-plugins/scm-hg-plugin/build.gradle b/scm-plugins/scm-hg-plugin/build.gradle
index be5910cb90..11be32f537 100644
--- a/scm-plugins/scm-hg-plugin/build.gradle
+++ b/scm-plugins/scm-hg-plugin/build.gradle
@@ -22,9 +22,8 @@
  * SOFTWARE.
  */
 
-
 plugins {
-  id 'org.scm-manager.smp' version '0.9.4'
+  id 'org.scm-manager.smp' version '0.10.0'
 }
 
 dependencies {
diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/permissions.xml b/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/permissions.xml
index f19ec026aa..ecbb5ea77a 100644
--- a/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/permissions.xml
+++ b/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/permissions.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <permissions>
   
   <permission>
diff --git a/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/repository-permissions.xml b/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/repository-permissions.xml
index 406aadc8ca..6ceea3603b 100644
--- a/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/repository-permissions.xml
+++ b/scm-plugins/scm-hg-plugin/src/main/resources/META-INF/scm/repository-permissions.xml
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <repository-permissions>
   <verbs>
     <verb>hg</verb>
diff --git a/scm-plugins/scm-integration-test-plugin/build.gradle b/scm-plugins/scm-integration-test-plugin/build.gradle
index 49b4b1770c..7ad48e0ffe 100644
--- a/scm-plugins/scm-integration-test-plugin/build.gradle
+++ b/scm-plugins/scm-integration-test-plugin/build.gradle
@@ -22,9 +22,8 @@
  * SOFTWARE.
  */
 
-
 plugins {
-  id 'org.scm-manager.smp' version '0.9.4'
+  id 'org.scm-manager.smp' version '0.10.0'
 }
 
 dependencies {
diff --git a/scm-plugins/scm-legacy-plugin/build.gradle b/scm-plugins/scm-legacy-plugin/build.gradle
index 21b51aba51..4b7f6b1746 100644
--- a/scm-plugins/scm-legacy-plugin/build.gradle
+++ b/scm-plugins/scm-legacy-plugin/build.gradle
@@ -22,9 +22,8 @@
  * SOFTWARE.
  */
 
-
 plugins {
-  id 'org.scm-manager.smp' version '0.9.4'
+  id 'org.scm-manager.smp' version '0.10.0'
 }
 
 dependencies {
diff --git a/scm-plugins/scm-svn-plugin/build.gradle b/scm-plugins/scm-svn-plugin/build.gradle
index 9c618e8a27..c7ea159da3 100644
--- a/scm-plugins/scm-svn-plugin/build.gradle
+++ b/scm-plugins/scm-svn-plugin/build.gradle
@@ -22,9 +22,8 @@
  * SOFTWARE.
  */
 
-
 plugins {
-  id 'org.scm-manager.smp' version '0.9.4'
+  id 'org.scm-manager.smp' version '0.10.0'
 }
 
 def svnkitVersion = '1.10.3-scm1'
diff --git a/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/permissions.xml b/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/permissions.xml
index 8e47af000f..54a010cdab 100644
--- a/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/permissions.xml
+++ b/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/permissions.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <permissions>
   
   <permission>
diff --git a/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/repository-permissions.xml b/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/repository-permissions.xml
index 52a2fec932..2041269b40 100644
--- a/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/repository-permissions.xml
+++ b/scm-plugins/scm-svn-plugin/src/main/resources/META-INF/scm/repository-permissions.xml
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <repository-permissions>
   <verbs>
     <verb>svn</verb>
diff --git a/scm-ui/build.gradle b/scm-ui/build.gradle
index a40ab9914c..3424b96efe 100644
--- a/scm-ui/build.gradle
+++ b/scm-ui/build.gradle
@@ -22,10 +22,9 @@
  * SOFTWARE.
  */
 
-
 plugins {
   id 'com.github.node-gradle.node' version '2.2.4'
-  id 'com.github.hierynomus.license-base' version '0.15.0'
+  id 'org.scm-manager.license' version '0.7.1'
   id 'org.scm-manager.ci'
 }
 
@@ -104,7 +103,7 @@ task updateUiTestTimestamps(type: TouchFiles) {
 }
 
 task check {
-  dependsOn('typecheck', 'test', 'chromatic', 'license')
+  dependsOn('typecheck', 'test', 'chromatic', 'checkLicenses')
 }
 
 yarn_install {
@@ -223,14 +222,12 @@ task setVersionToNextSnapshot(type: YarnTask) {
 
 license {
   header rootProject.file("LICENSE.txt")
-  strictCheck true
+  newLine = true
+  ignoreNewLine = true
 
-  mapping {
-    tsx = 'SLASHSTAR_STYLE'
-    ts = 'SLASHSTAR_STYLE'
-    gradle = 'SLASHSTAR_STYLE'
-    feature = 'SCRIPT_STYLE'
-    scss = 'SLASHSTAR_STYLE'
+  style {
+    feature = 'HASH'
+    scss = 'BLOCK_COMMENT'
   }
 
   exclude '**/node_modules/**'
@@ -249,14 +246,11 @@ license {
   exclude '**/*.iml'
   exclude '**/.babelrc'
 
-}
-
-task license(type: com.hierynomus.gradle.license.tasks.LicenseCheck) {
-  source = fileTree('.')
-}
-
-task licenseFormat(type: com.hierynomus.gradle.license.tasks.LicenseFormat) {
-  source = fileTree('.')
+  tasks {
+    modules {
+      files.from(".")
+    }
+  }
 }
 
 sonarqube {
diff --git a/scm-ui/ui-components/.storybook/preview-head.html b/scm-ui/ui-components/.storybook/preview-head.html
index d5b19b0ac4..107692c5ee 100644
--- a/scm-ui/ui-components/.storybook/preview-head.html
+++ b/scm-ui/ui-components/.storybook/preview-head.html
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,6 +20,6 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <link id="ui-theme" data-theme="light" rel="stylesheet" type="text/css" href="/ui-theme-light.css">
diff --git a/scm-ui/ui-components/src/syntax-highlighting.module.css b/scm-ui/ui-components/src/syntax-highlighting.module.css
index ae242831ee..2d5591829f 100644
--- a/scm-ui/ui-components/src/syntax-highlighting.module.css
+++ b/scm-ui/ui-components/src/syntax-highlighting.module.css
@@ -1,4 +1,4 @@
-/**
+/*
  * MIT License
  *
  * Copyright (c) 2020-present Cloudogu GmbH and Contributors
diff --git a/scm-ui/ui-styles/public/_index.html b/scm-ui/ui-styles/public/_index.html
index 52a6252c00..e7f9977bc3 100644
--- a/scm-ui/ui-styles/public/_index.html
+++ b/scm-ui/ui-styles/public/_index.html
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!DOCTYPE html>
 <html lang="en">
 
diff --git a/scm-ui/ui-styles/public/_styleguide.html b/scm-ui/ui-styles/public/_styleguide.html
index 2f9d144823..5a64176328 100644
--- a/scm-ui/ui-styles/public/_styleguide.html
+++ b/scm-ui/ui-styles/public/_styleguide.html
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
   <section class="section">
     <div class="container">
       <div class="notification is-info">
diff --git a/scm-ui/ui-styles/public/_theme.html b/scm-ui/ui-styles/public/_theme.html
index b3eef94d24..b63bd70915 100644
--- a/scm-ui/ui-styles/public/_theme.html
+++ b/scm-ui/ui-styles/public/_theme.html
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!DOCTYPE html>
 <html lang="en">
 <head>
diff --git a/scm-webapp/build.gradle b/scm-webapp/build.gradle
index 474cf784e0..1c956d7be5 100644
--- a/scm-webapp/build.gradle
+++ b/scm-webapp/build.gradle
@@ -147,6 +147,7 @@ war {
   into('WEB-INF/classes/META-INF/scm') {
     from('build/openapi')
   }
+  duplicatesStrategy 'WARN'
   dependsOn 'copy-core-plugins', 'resolve'
 }
 
@@ -161,6 +162,7 @@ task 'dev-war' (type: War) {
   into('WEB-INF/classes/META-INF/scm') {
     from('build/openapi')
   }
+  duplicatesStrategy 'WARN'
   dependsOn 'copy-core-plugins', 'resolve'
 }
 
@@ -182,37 +184,16 @@ resolve {
   classpath = sourceSets.main.runtimeClasspath
   resourcePackages = ['sonia.scm.api.v2.resources']
   outputDir = file('build/openapi')
-  openApiFile = file('build/tmp/openapi.yml')
+  openApiFile = file('build/openapi_tmp/openapi.yml')
 }
 
 task prepareOpenAPI(type: Copy) {
   from 'src/main/doc/openapi.yml'
-  into 'build/tmp'
+  into 'build/openapi_tmp'
+  duplicatesStrategy 'WARN'
   expand(version: project.version)
 }
 
 tasks.getByName("resolve").configure {
   dependsOn 'prepareOpenAPI'
 }
-
-/**
-WTF???
-<!-- fix javadoc -->
-
-<dependency>
-  <groupId>javax.transaction</groupId>
-  <artifactId>jta</artifactId>
-  <version>1.1</version>
-  <scope>provided</scope>
-</dependency>
-
-<!--
-fix java.lang.NoClassDefFoundError org/w3c/dom/ElementTraversal
--->
-
-<dependency>
-  <groupId>xml-apis</groupId>
-  <artifactId>xml-apis</artifactId>
-  <version>1.4.01</version>
-</dependency>
-**/
diff --git a/scm-webapp/src/main/resources/META-INF/scm/permissions.xml b/scm-webapp/src/main/resources/META-INF/scm/permissions.xml
index 10b745b68d..79a6a82eb8 100644
--- a/scm-webapp/src/main/resources/META-INF/scm/permissions.xml
+++ b/scm-webapp/src/main/resources/META-INF/scm/permissions.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <permissions>
 
   <permission>
diff --git a/scm-webapp/src/main/resources/META-INF/scm/repository-permissions.xml b/scm-webapp/src/main/resources/META-INF/scm/repository-permissions.xml
index db2b6da81c..1467c9a692 100644
--- a/scm-webapp/src/main/resources/META-INF/scm/repository-permissions.xml
+++ b/scm-webapp/src/main/resources/META-INF/scm/repository-permissions.xml
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <repository-permissions>
   <verbs>
     <verb read-only="true">read</verb>
diff --git a/scm-webapp/src/main/resources/META-INF/validation.xml b/scm-webapp/src/main/resources/META-INF/validation.xml
index 521ef2b195..c09458c79e 100644
--- a/scm-webapp/src/main/resources/META-INF/validation.xml
+++ b/scm-webapp/src/main/resources/META-INF/validation.xml
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <validation-config
   xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
diff --git a/scm-webapp/src/main/resources/config/gcache.xml b/scm-webapp/src/main/resources/config/gcache.xml
index 5ee5e651ab..e85e8f19cb 100644
--- a/scm-webapp/src/main/resources/config/gcache.xml
+++ b/scm-webapp/src/main/resources/config/gcache.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <caches>
     
   <defaultCache 
diff --git a/scm-webapp/src/main/resources/logback.xml b/scm-webapp/src/main/resources/logback.xml
index e5e7491ea6..b6689c7acb 100644
--- a/scm-webapp/src/main/resources/logback.xml
+++ b/scm-webapp/src/main/resources/logback.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!--
     Document   : logback.release.xml
     Created on : February 3, 2011, 6:36 PM
diff --git a/scm-webapp/src/test/resources/META-INF/scm/repository-permissions.xml b/scm-webapp/src/test/resources/META-INF/scm/repository-permissions.xml
index 8bfdeb8626..c94aa467b6 100644
--- a/scm-webapp/src/test/resources/META-INF/scm/repository-permissions.xml
+++ b/scm-webapp/src/test/resources/META-INF/scm/repository-permissions.xml
@@ -1,5 +1,4 @@
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -21,8 +20,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <repository-permissions>
   <verbs>
     <verb>test</verb>
diff --git a/scm-webapp/src/test/resources/logback-test.xml b/scm-webapp/src/test/resources/logback-test.xml
index 98361f199d..0df3718065 100644
--- a/scm-webapp/src/test/resources/logback-test.xml
+++ b/scm-webapp/src/test/resources/logback-test.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <!--
     Document   : logback.xml
     Created on : January 18, 2011, 5:46 PM
diff --git a/scm-webapp/src/test/resources/someScript.sh b/scm-webapp/src/test/resources/someScript.sh
index ca2ad494a0..28dd71053f 100644
--- a/scm-webapp/src/test/resources/someScript.sh
+++ b/scm-webapp/src/test/resources/someScript.sh
@@ -23,7 +23,6 @@
 # SOFTWARE.
 #
 
-
 for f in * ; do
 	ls $f
 done
diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.001.xml b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.001.xml
index 4a17b00cbc..1c5fd6c02d 100644
--- a/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.001.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.001.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <ehcache xmlns="http://ehcache.org/ehcache.xsd">
     
   <diskStore path="java.io.tmpdir"/>
diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.002.xml b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.002.xml
index 26c8d75b7b..0b3644777d 100644
--- a/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.002.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.002.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <ehcache xmlns="http://ehcache.org/ehcache.xsd">
     
   
diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.003.xml b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.003.xml
index 53ead94d55..b20b178597 100644
--- a/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.003.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.003.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <ehcache xmlns="http://ehcache.org/ehcache.xsd">
     
   
diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.004.xml b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.004.xml
index f7963bc9b3..8728dfb9fa 100644
--- a/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.004.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.004.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <ehcache xmlns="http://ehcache.org/ehcache.xsd">
     
   
diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.005.xml b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.005.xml
index 2e504af651..d31342c4db 100644
--- a/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.005.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.005.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <ehcache xmlns="http://ehcache.org/ehcache.xsd">
   
   <defaultCache
diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.006.xml b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.006.xml
index 75a3cd9126..4e45b47f58 100644
--- a/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.006.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.006.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <ehcache xmlns="http://ehcache.org/ehcache.xsd" 
          updateCheck="false" 
          maxBytesLocalDisk="512M">
diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.007.xml b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.007.xml
index 6f8199917f..ed8b61abef 100644
--- a/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.007.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/cache/ehcache.007.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <ehcache xmlns="http://ehcache.org/ehcache.xsd" 
          updateCheck="true" 
          maxBytesLocalDisk="1G">
diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/gcache.001.xml b/scm-webapp/src/test/resources/sonia/scm/cache/gcache.001.xml
index 6ac27c894f..2b5ae36f1b 100644
--- a/scm-webapp/src/test/resources/sonia/scm/cache/gcache.001.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/cache/gcache.001.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <caches>
     
   <defaultCache 
diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/gcache.002.xml b/scm-webapp/src/test/resources/sonia/scm/cache/gcache.002.xml
index 2287cc7084..63660cc535 100644
--- a/scm-webapp/src/test/resources/sonia/scm/cache/gcache.002.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/cache/gcache.002.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <caches>
   
   <cache
diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/gcache.003.xml b/scm-webapp/src/test/resources/sonia/scm/cache/gcache.003.xml
index 75b4d45b91..166e88d388 100644
--- a/scm-webapp/src/test/resources/sonia/scm/cache/gcache.003.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/cache/gcache.003.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <caches>
 
   <cache
diff --git a/scm-webapp/src/test/resources/sonia/scm/cache/gcache.004.xml b/scm-webapp/src/test/resources/sonia/scm/cache/gcache.004.xml
index 902979b399..2820609039 100644
--- a/scm-webapp/src/test/resources/sonia/scm/cache/gcache.004.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/cache/gcache.004.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <caches>
   
   <cache
diff --git a/scm-webapp/src/test/resources/sonia/scm/plugin/scm-g-plugin.xml b/scm-webapp/src/test/resources/sonia/scm/plugin/scm-g-plugin.xml
index 8fca8bbdfc..fde69ffb7e 100644
--- a/scm-webapp/src/test/resources/sonia/scm/plugin/scm-g-plugin.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/plugin/scm-g-plugin.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <plugin>
 
   <scm-version>2</scm-version>
diff --git a/scm-webapp/src/test/resources/sonia/scm/plugin/scm-h-plugin.xml b/scm-webapp/src/test/resources/sonia/scm/plugin/scm-h-plugin.xml
index fb7977da6f..15c0d9490b 100644
--- a/scm-webapp/src/test/resources/sonia/scm/plugin/scm-h-plugin.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/plugin/scm-h-plugin.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <plugin>
 
   <scm-version>2</scm-version>
diff --git a/scm-webapp/src/test/resources/sonia/scm/plugin/scm-i-plugin.xml b/scm-webapp/src/test/resources/sonia/scm/plugin/scm-i-plugin.xml
index e49dd45da8..b8e51115ab 100644
--- a/scm-webapp/src/test/resources/sonia/scm/plugin/scm-i-plugin.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/plugin/scm-i-plugin.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <plugin>
 
   <scm-version>2</scm-version>
diff --git a/scm-webapp/src/test/resources/sonia/scm/plugin/scm-mail-plugin-2-0-0.xml b/scm-webapp/src/test/resources/sonia/scm/plugin/scm-mail-plugin-2-0-0.xml
index bf148adaac..dcf9d4f431 100644
--- a/scm-webapp/src/test/resources/sonia/scm/plugin/scm-mail-plugin-2-0-0.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/plugin/scm-mail-plugin-2-0-0.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <plugin>
 
   <scm-version>2</scm-version>
diff --git a/scm-webapp/src/test/resources/sonia/scm/plugin/scm-mail-plugin-2-1-0.xml b/scm-webapp/src/test/resources/sonia/scm/plugin/scm-mail-plugin-2-1-0.xml
index f642b1e65d..9b4854b255 100644
--- a/scm-webapp/src/test/resources/sonia/scm/plugin/scm-mail-plugin-2-1-0.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/plugin/scm-mail-plugin-2-1-0.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <plugin>
 
   <scm-version>2</scm-version>
diff --git a/scm-webapp/src/test/resources/sonia/scm/plugin/scm-review-plugin-2-0-0.xml b/scm-webapp/src/test/resources/sonia/scm/plugin/scm-review-plugin-2-0-0.xml
index 43517a4f47..f60fef0dac 100644
--- a/scm-webapp/src/test/resources/sonia/scm/plugin/scm-review-plugin-2-0-0.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/plugin/scm-review-plugin-2-0-0.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <plugin>
 
   <scm-version>2</scm-version>
diff --git a/scm-webapp/src/test/resources/sonia/scm/plugin/scm-review-plugin-2-1-0.xml b/scm-webapp/src/test/resources/sonia/scm/plugin/scm-review-plugin-2-1-0.xml
index 4feab0b7c4..f1e5fbb18d 100644
--- a/scm-webapp/src/test/resources/sonia/scm/plugin/scm-review-plugin-2-1-0.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/plugin/scm-review-plugin-2-1-0.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <plugin>
 
   <scm-version>2</scm-version>
diff --git a/scm-webapp/src/test/resources/sonia/scm/update/group/groups.xml b/scm-webapp/src/test/resources/sonia/scm/update/group/groups.xml
index 7636141f0a..dbbcb1bc54 100644
--- a/scm-webapp/src/test/resources/sonia/scm/update/group/groups.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/update/group/groups.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <group-db>
     <creationTime>1559548854204</creationTime>
     <groups>
diff --git a/scm-webapp/src/test/resources/sonia/scm/update/group/groups_empty_groups.xml b/scm-webapp/src/test/resources/sonia/scm/update/group/groups_empty_groups.xml
index 744409e081..d9c20aefd1 100644
--- a/scm-webapp/src/test/resources/sonia/scm/update/group/groups_empty_groups.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/update/group/groups_empty_groups.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <group-db>
     <creationTime>1558006904769</creationTime>
     <groups/>
diff --git a/scm-webapp/src/test/resources/sonia/scm/update/group/groups_no_groups.xml b/scm-webapp/src/test/resources/sonia/scm/update/group/groups_no_groups.xml
index e9f1dbc7a6..8d93cff632 100644
--- a/scm-webapp/src/test/resources/sonia/scm/update/group/groups_no_groups.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/update/group/groups_no_groups.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <group-db>
     <creationTime>1558006904769</creationTime>
     <lastModified>1558007174172</lastModified>
diff --git a/scm-webapp/src/test/resources/sonia/scm/update/repository/formerV2RepositoryFile.xml b/scm-webapp/src/test/resources/sonia/scm/update/repository/formerV2RepositoryFile.xml
index 250f0fa951..315730b26c 100644
--- a/scm-webapp/src/test/resources/sonia/scm/update/repository/formerV2RepositoryFile.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/update/repository/formerV2RepositoryFile.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <repositories creation-time="1558604015815" last-modified="1558605291416">
   <repository id="C2RRHjjeL2">repositories/C2RRHjjeL2</repository>
 </repositories>
diff --git a/scm-webapp/src/test/resources/sonia/scm/update/repository/metadataWithoutRoles.xml b/scm-webapp/src/test/resources/sonia/scm/update/repository/metadataWithoutRoles.xml
index 3c2b8f822e..a115c95875 100644
--- a/scm-webapp/src/test/resources/sonia/scm/update/repository/metadataWithoutRoles.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/update/repository/metadataWithoutRoles.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <repositories>
     <properties/>
     <contact>ich@du.er</contact>
diff --git a/scm-webapp/src/test/resources/sonia/scm/update/security/config-withAnon.xml b/scm-webapp/src/test/resources/sonia/scm/update/security/config-withAnon.xml
index 1ae982be55..b29760b102 100644
--- a/scm-webapp/src/test/resources/sonia/scm/update/security/config-withAnon.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/update/security/config-withAnon.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <scm-config>
   <admin-groups>admins,vogons</admin-groups>
   <admin-users>arthur,dent,ldap-admin</admin-users>
diff --git a/scm-webapp/src/test/resources/sonia/scm/update/security/config.xml b/scm-webapp/src/test/resources/sonia/scm/update/security/config.xml
index 575573a0f9..1c940de9ff 100644
--- a/scm-webapp/src/test/resources/sonia/scm/update/security/config.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/update/security/config.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <scm-config>
     <admin-groups>admins,vogons</admin-groups>
     <admin-users>arthur,dent,ldap-admin</admin-users>
diff --git a/scm-webapp/src/test/resources/sonia/scm/update/security/emptySecurityV1.xml b/scm-webapp/src/test/resources/sonia/scm/update/security/emptySecurityV1.xml
index c6c16aee28..697a61bdce 100644
--- a/scm-webapp/src/test/resources/sonia/scm/update/security/emptySecurityV1.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/update/security/emptySecurityV1.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" ?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,7 +21,7 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <configuration>
 </configuration>
diff --git a/scm-webapp/src/test/resources/sonia/scm/update/security/securityV1.xml b/scm-webapp/src/test/resources/sonia/scm/update/security/securityV1.xml
index 603c3c5b63..a1a053797f 100644
--- a/scm-webapp/src/test/resources/sonia/scm/update/security/securityV1.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/update/security/securityV1.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" ?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <configuration>
   <entry>
     <key>4lRWOA7DH1</key>
diff --git a/scm-webapp/src/test/resources/sonia/scm/update/user/users.xml b/scm-webapp/src/test/resources/sonia/scm/update/user/users.xml
index f0964f4f05..4c2a3f1dea 100644
--- a/scm-webapp/src/test/resources/sonia/scm/update/user/users.xml
+++ b/scm-webapp/src/test/resources/sonia/scm/update/user/users.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
-
     MIT License
 
     Copyright (c) 2020-present Cloudogu GmbH and Contributors
@@ -22,8 +21,8 @@
     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
     SOFTWARE.
-
 -->
+
 <user-db>
     <creationTime>1558597074729</creationTime>
     <lastModified>1558597185919</lastModified>
diff --git a/settings.gradle b/settings.gradle
index f4f4fbeee0..6d382f7959 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -33,7 +33,7 @@ buildscript {
     gradlePluginPortal()
   }
   dependencies {
-    classpath 'org.kordamp.gradle:enforcer-gradle-plugin:0.8.0'
+    classpath 'org.kordamp.gradle:enforcer-gradle-plugin:0.9.0'
   }
 }
 apply plugin: 'org.kordamp.gradle.enforcer'