Merge from develop

Author: rsarendus

README.md

@@ -49,25 +49,25 @@ Run following command:
 SiVa project compiles **3 fat executable JAR** files that You can run after successfully building the
 project by issuing below commands:
 
-**First start SiVa REST and SOAP web service**
+**First start SiVa REST and SOAP web service. NB! X.X.X denotes the version you are running.**
 
 ```bash
-./siva-parent/siva-webapp/target/siva-webapp-3.5.0.jar
+java -jar siva-parent/siva-webapp/target/siva-webapp-X.X.X-exec.jar
 ```
 
-**Second we need to start SiVa XRoad validation service**
+**Second we need to start SiVa XRoad validation service. NB! X.X.X denotes the version you are running.**
 
 ```bash
-./validation-services-parent/xroad-validation-service/target/xroad-validation-service-3.5.0.jar
+java -jar validation-services-parent/xroad-validation-service/target/xroad-validation-service-X.X.X-exec.jar
 ```
 
 The SiVa webapp by default runs on port **8080** and XRoad validation service starts up on port **8081**.
 Easiest way to test out validation is run SiVa demo application.
 
-**Start SiVa Demo Application**
+**Start SiVa Demo Application. NB! X.X.X denotes the version you are running.**
 
 ```bash
-./siva-parent/siva-sample-application/target/siva-sample-application-3.5.0.jar
+java -jar siva-parent/siva-sample-application/target/siva-sample-application-X.X.X.jar
 ```
 
 Now point Your browser to URL: <http://localhost:9000>
@@ -85,10 +85,10 @@ To build the WAR file use helper script with all the correct Maven parameters.
 ./war-build.sh
 ```
 
-Copy built WAR file into Tomcat `webapps` directory and start the servlet container.
+Copy built WAR file into Tomcat `webapps` directory and start the servlet container. NB! X.X.X denotes the version you are running.
 
 ```bash
-cp siva-parent/siva-webapp/target/siva-webapp-3.5.0.war apache-tomcat-7.0.70/webapps
+cp siva-parent/siva-webapp/target/siva-webapp-X.X.X.war apache-tomcat-7.0.70/webapps
 ./apache-tomcat-7.0.77/bin/catalina.sh run
 ```
 
@@ -132,10 +132,10 @@ tests, SiVa Web application has to be started before the tests are executed.
 > **Note**: PDF load test files contain test certificates. In order for PDF load tests to succeed
 > SiVa application should be started with test certificates preloaded.
 
-To load trusted test certificates in addition to TSL, "test" spring profile should be activated at startup, for example:
+To load trusted test certificates in addition to TSL, "test" spring profile should be activated at startup (NB! X.X.X denotes the version you are running), for example:
 
 ```bash
-java -Dspring.profiles.active=test -jar siva-webapp-3.5.0.jar
+java -Dspring.profiles.active=test -jar siva-parent/siva-webapp/target/siva-webapp-X.X.X-exec.jar
 ```
 
 To run load tests after unit tests in non GUI mode:

pom.xml

@@ -22,7 +22,7 @@
 
     <groupId>ee.openid.siva</groupId>
     <artifactId>siva</artifactId>
-    <version>3.5.0</version>
+    <version>3.5.1</version>
     <packaging>pom</packaging>
     <name>SiVa Digitally signed documents validation service</name>
     <url>https://github.com/open-eid/SiVa</url>
@@ -111,19 +111,14 @@
         <dss.version>5.7.d4j.2</dss.version>
         <commons.codec.version>1.15</commons.codec.version>
         <commons.collections.version>4.4</commons.collections.version>
-        <commons.io.version>2.9.0</commons.io.version>
-        <jackson.version>2.12.3</jackson.version>
-        <junit.jupiter.version>5.7.2</junit.jupiter.version>
-        <junit.platform.version>1.7.2</junit.platform.version>
-        <junit.version>4.13.2</junit.version>
-        <json.version>20210307</json.version>
-        <logback.version>1.2.3</logback.version>
-        <lombok.version>1.18.20</lombok.version>
-        <mockito.version>3.11.0</mockito.version>
-        <powermock.version>2.0.9</powermock.version>
-        <snakeyaml.version>1.29</snakeyaml.version>
-        <spring.boot.version>2.3.12.RELEASE</spring.boot.version>
-        <xmlsec.version>2.1.6</xmlsec.version>
+        <commons.io.version>2.11.0</commons.io.version>
+        <jackson.version>2.13.1</jackson.version>
+        <json.version>20211205</json.version>
+        <logback.version>1.2.10</logback.version>
+        <lombok.version>1.18.22</lombok.version>
+        <snakeyaml.version>1.30</snakeyaml.version>
+        <spring.boot.version>2.6.2</spring.boot.version>
+        <xmlsec.version>2.1.7</xmlsec.version>
 
         <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
         <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
@@ -151,7 +146,7 @@
             </plugin>
             <plugin>
                 <artifactId>maven-pmd-plugin</artifactId>
-                <version>3.14.0</version>
+                <version>3.15.0</version>
             </plugin>
         </plugins>
     </reporting>
@@ -161,7 +156,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.9.0</version>
                 <configuration>
                     <forceJavacCompilerUse>true</forceJavacCompilerUse>
                     <source>${language.level}</source>
@@ -205,7 +200,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.3</version>
+                <version>3.0.0-M5</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>