Merge branch 'development_preview'

1 files changed, 22 insertions, 16 deletions

diff --git a/pom.xml b/pom.xml
index 3bf3260ec..4b5431bbf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   <groupId>MOA</groupId>
   <artifactId>MOA</artifactId>
   <packaging>pom</packaging>
-  <version>4.1.2</version>
+  <version>4.1.3</version>
   <name>MOA</name>
 
   <properties>
@@ -14,14 +14,14 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- Project Version -->
-    <moa-id-version>4.1.2</moa-id-version>
+    <moa-id-version>4.1.3</moa-id-version>
 
-    <moa-id-version-final>4.1.2</moa-id-version-final>
-    <moa-id-version-edu>4.1.2</moa-id-version-edu>
+    <moa-id-version-final>4.1.3</moa-id-version-final>
+    <moa-id-version-edu>4.1.3</moa-id-version-edu>
 
     <moa-id-proxy-version>2.0.1</moa-id-proxy-version>
 
-    <configtool-version>3.0.3</configtool-version>
+    <configtool-version>3.0.4</configtool-version>
     <demo-oa-version>2.0.7</demo-oa-version>
 
     <moa-id-module-elga_mandate_client>1.3.2</moa-id-module-elga_mandate_client>
@@ -29,9 +29,9 @@
     <!-- =================================================================================== -->
     <egiz-spring-api.version>0.3</egiz-spring-api.version>
     <egiz.eaaf.version>1.0.14</egiz.eaaf.version>
-    <org.springframework.version>5.2.7.RELEASE</org.springframework.version>
-    <org.springframework.data.spring-data-jpa>2.3.1.RELEASE</org.springframework.data.spring-data-jpa>
-    <org.springframework.data.spring-data-redis>2.3.1.RELEASE</org.springframework.data.spring-data-redis>
+    <org.springframework.version>5.2.8.RELEASE</org.springframework.version>
+    <org.springframework.data.spring-data-jpa>2.3.3.RELEASE</org.springframework.data.spring-data-jpa>
+    <org.springframework.data.spring-data-redis>2.3.3.RELEASE</org.springframework.data.spring-data-redis>
     <surefire.version>2.22.0</surefire.version>
 
     <jaxb.version>2.3.1</jaxb.version>
@@ -45,7 +45,7 @@
     <jaxws-api.version>2.3.1</jaxws-api.version>
     <jws-api.version>1.1</jws-api.version>
 
-    <hibernate.version>5.4.18.Final</hibernate.version>
+    <hibernate.version>5.4.21.Final</hibernate.version>
     <org.apache.commons.commons.dbcp2>2.7.0</org.apache.commons.commons.dbcp2>
 
     <cxf.version>3.3.7</cxf.version>
@@ -59,18 +59,18 @@
     <httpcore.version>4.4.13</httpcore.version>
 
     <!-- Maybe problems with Hibernate 5.0.10 -->
-    <mysql-connector.java>8.0.20</mysql-connector.java>
+    <mysql-connector.java>8.0.21</mysql-connector.java>
     <!-- <mysql-connector.java>5.1.40</mysql-connector.java> -->
 
     <junit.version>4.12</junit.version>
     <org.apache.commons.io.version>2.7</org.apache.commons.io.version>
-    <org.apache.commons.lang3.version>3.10</org.apache.commons.lang3.version>
+    <org.apache.commons.lang3.version>3.11</org.apache.commons.lang3.version>
     <org.apache.commons.collections4.version>4.4</org.apache.commons.collections4.version>
     <org.apache.commons.collections3.version>3.2.2</org.apache.commons.collections3.version>
-    <org.apache.commons-text.version>1.8</org.apache.commons-text.version>
+    <org.apache.commons-text.version>1.9</org.apache.commons-text.version>
     <jodatime.version>2.10.6</jodatime.version>
 
-    <jackson-version>2.11.1</jackson-version>
+    <jackson-version>2.11.2</jackson-version>
     <apache-cli-version>1.4</apache-cli-version>
     <spring-orm-version>${org.springframework.version}</spring-orm-version>
 
@@ -133,6 +133,12 @@
   </profiles>
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+  
     <pluginManagement>
       <plugins>
         <plugin>
@@ -405,7 +411,7 @@
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-core</artifactId>
-        <version>2.5</version>
+        <version>2.13.3</version>
       </dependency>
 
       <dependency>
@@ -423,7 +429,7 @@
       <dependency>
          <groupId>org.postgresql</groupId>
          <artifactId>postgresql</artifactId>
-         <version>42.2.9</version>
+         <version>42.2.16</version>
       </dependency>
 
       <dependency>
@@ -434,7 +440,7 @@
       <dependency>
         <groupId>commons-fileupload</groupId>
         <artifactId>commons-fileupload</artifactId>
-        <version>1.3.3</version>
+        <version>1.4</version>
       </dependency>
       <dependency>
         <groupId>commons-httpclient</groupId>