diff --git a/pom.xml b/pom.xml
index 300fd424e..d1989213a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
         <!-- build-parent properties -->
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <buildversion_prefix />
+        <buildversion_prefix/>
 
         <ant-contrib.version>1.0b3</ant-contrib.version>
 
@@ -102,7 +102,7 @@
         <servlet.version>3.0.1</servlet.version>
         <springockito.version>1.0.9</springockito.version>
         <spring.version>4.3.30.RELEASE</spring.version>
-        <spring-security.version>4.2.20.RELEASE</spring-security.version>
+        <spring-security.version>6.2.7</spring-security.version>
         <slf4j.version>1.7.7</slf4j.version>
         <auditlogger.version>8.3.1-SNAPSHOT</auditlogger.version>
         <surefire.plugin.version>2.12</surefire.plugin.version>
@@ -789,7 +789,7 @@
                             </goals>
                             <configuration>
                                 <target>
-                                    <echo message="writing target/${project.build.finalName}/${buildversion_prefix}buildversion.txt" />
+                                    <echo message="writing target/${project.build.finalName}/${buildversion_prefix}buildversion.txt"/>
                                     <echo file="target/${project.build.finalName}/${buildversion_prefix}buildversion.txt">
                                         <![CDATA[artifactId=${project.artifactId}
                                             version=${project.version}
@@ -799,8 +799,8 @@
                                             buildTtime=${maven.build.timestamp}
                                         ]]>
                                     </echo>
-                                    <loadfile property="buildversiontxt" srcFile="target/${project.build.finalName}/${buildversion_prefix}buildversion.txt" />
-                                    <echo message="${buildversiontxt}" />
+                                    <loadfile property="buildversiontxt" srcFile="target/${project.build.finalName}/${buildversion_prefix}buildversion.txt"/>
+                                    <echo message="${buildversiontxt}"/>
                                     <echo file="target/mavenversion.txt">${project.version}</echo>
                                 </target>
                             </configuration>
@@ -981,7 +981,7 @@
                             <requireJavaVersion>
                               <version>1.8</version>
                             </requireJavaVersion>
-                            <dependencyConvergence />
+                            <dependencyConvergence/>
                           </rules>
                         </configuration>
                       </execution>
@@ -1207,25 +1207,25 @@
                                 </goals>
                                 <configuration>
                                     <target>
-                                        <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />
+                                        <taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath"/>
                                         <if>
-                                            <available file="${project.build.directory}/classes/fi" />
+                                            <available file="${project.build.directory}/classes/fi"/>
                                             <then>
-                                                <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="maven.plugin.classpath" />
+                                                <taskdef name="findbugs" classname="edu.umd.cs.findbugs.anttask.FindBugsTask" classpathref="maven.plugin.classpath"/>
 
-                                                <property name="findbugsclasspath" refid="maven.plugin.classpath" />
-                                                <property name="runtime_classpath" refid="maven.runtime.classpath" />
-                                                <property name="compile_classpath" refid="maven.compile.classpath" />
+                                                <property name="findbugsclasspath" refid="maven.plugin.classpath"/>
+                                                <property name="runtime_classpath" refid="maven.runtime.classpath"/>
+                                                <property name="compile_classpath" refid="maven.compile.classpath"/>
 
-                                                <mkdir dir="${project.build.directory}/findbugs" />
+                                                <mkdir dir="${project.build.directory}/findbugs"/>
                                                 <echo>Using localRepository: ${settings.localRepository}</echo>
                                                 <findbugs output="html" outputFile="${project.build.directory}/findbugs/findbugs.html" classpath="${findbugsclasspath}" pluginlist="${settings.localRepository}/net/sourceforge/findbugs/coreplugin/${findbugs.version}/coreplugin-${findbugs.version}.jar" jvmargs="-Xmx256m" reportLevel="medium" effort="default" failOnError="true">
-                                                    <sourcePath location="${project.basedir}/src/main/java" />
-                                                    <class location="${project.build.directory}/classes" />
+                                                    <sourcePath location="${project.basedir}/src/main/java"/>
+                                                    <class location="${project.build.directory}/classes"/>
                                                     <auxClasspath>
-                                                        <path refid="maven.compile.classpath" />
-                                                        <path refid="maven.runtime.classpath" />
-                                                        <path refid="maven.plugin.classpath" />
+                                                        <path refid="maven.compile.classpath"/>
+                                                        <path refid="maven.runtime.classpath"/>
+                                                        <path refid="maven.plugin.classpath"/>
                                                     </auxClasspath>
                                                 </findbugs>
                                             </then>
@@ -1370,7 +1370,7 @@
                                         <echo>Deploy: ${project.version} to ${tomcat-host}</echo>
 
                                         <ant antfile="${project.basedir}\${ant.file}">
-                                            <property name="pom.version" value="${project.version}" />
+                                            <property name="pom.version" value="${project.version}"/>
                                         </ant>
                                     </target>
                                 </configuration>
@@ -1412,7 +1412,7 @@
                                     <target>
                                         <delete includeemptydirs="true" failonerror="false">
                                             <fileset dir="${clover.outputDirectory}_old">
-                                                <include name="**/**" />
+                                                <include name="**/**"/>
                                             </fileset>
                                         </delete>
                                     </target>
@@ -1457,11 +1457,11 @@
                                         <echo>Clean clover output directory from ${clover.base}.</echo>
                                         <delete includeemptydirs="true" failonerror="false">
                                             <fileset dir="${clover.base}">
-                                                <include name="**/**" />
-                                                <exclude name="history/**" />
+                                                <include name="**/**"/>
+                                                <exclude name="history/**"/>
                                             </fileset>
                                         </delete>
-                                        <move failonerror="false" file="${clover.outputDirectory}" tofile="${clover.outputDirectory}_old" />
+                                        <move failonerror="false" file="${clover.outputDirectory}" tofile="${clover.outputDirectory}_old"/>
                                     </target>
                                 </configuration>
                             </execution>
@@ -1561,7 +1561,7 @@
                                         <echo>Remove Scala files from target/clover directory.</echo>
                                         <delete failonerror="false" verbose="true">
                                             <fileset dir="target/clover">
-                                                <include name="**/*.scala" />
+                                                <include name="**/*.scala"/>
                                             </fileset>
                                         </delete>
                                     </target>