From 1044640c80e6586192e14635ae5a65d2f6524dc8 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Tue, 24 Mar 2020 19:51:58 +0100
Subject: fix dependency problems with different Java Spring versions

---
 eaaf_core/pom.xml                          | 1 +
 eaaf_modules/eaaf_module_auth_sl20/pom.xml | 6 +++++-
 eaaf_modules/eaaf_module_moa-sig/pom.xml   | 7 ++++++-
 eaaf_modules/eaaf_module_pvp2_core/pom.xml | 6 ++++++
 eaaf_modules/eaaf_module_pvp2_idp/pom.xml  | 6 +++++-
 eaaf_modules/eaaf_module_pvp2_sp/pom.xml   | 6 +++++-
 pom.xml                                    | 2 +-
 7 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/eaaf_core/pom.xml b/eaaf_core/pom.xml
index f41463df..520884ea 100644
--- a/eaaf_core/pom.xml
+++ b/eaaf_core/pom.xml
@@ -37,6 +37,7 @@
   	<dependency>
   		<groupId>org.springframework</groupId>
 		<artifactId>spring-webmvc</artifactId>
+        <scope>provided</scope>
   	</dependency>
   	<dependency>
     	<groupId>org.slf4j</groupId>
diff --git a/eaaf_modules/eaaf_module_auth_sl20/pom.xml b/eaaf_modules/eaaf_module_auth_sl20/pom.xml
index 9b237b78..482596a2 100644
--- a/eaaf_modules/eaaf_module_auth_sl20/pom.xml
+++ b/eaaf_modules/eaaf_module_auth_sl20/pom.xml
@@ -42,7 +42,11 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
-
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
diff --git a/eaaf_modules/eaaf_module_moa-sig/pom.xml b/eaaf_modules/eaaf_module_moa-sig/pom.xml
index b9dd49f6..eb2cdae8 100644
--- a/eaaf_modules/eaaf_module_moa-sig/pom.xml
+++ b/eaaf_modules/eaaf_module_moa-sig/pom.xml
@@ -59,7 +59,12 @@
 	 	<groupId>at.gv.egiz.eaaf</groupId>
   		<artifactId>eaaf_core_api</artifactId>
 	</dependency>
-	
+	<dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
 	<dependency>
   		<groupId>joda-time</groupId>
     	<artifactId>joda-time</artifactId>
diff --git a/eaaf_modules/eaaf_module_pvp2_core/pom.xml b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
index 32d66501..efc359aa 100644
--- a/eaaf_modules/eaaf_module_pvp2_core/pom.xml
+++ b/eaaf_modules/eaaf_module_pvp2_core/pom.xml
@@ -47,6 +47,12 @@
       <artifactId>bcprov-jdk15on</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
diff --git a/eaaf_modules/eaaf_module_pvp2_idp/pom.xml b/eaaf_modules/eaaf_module_pvp2_idp/pom.xml
index cf833f67..b570c88a 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/pom.xml
+++ b/eaaf_modules/eaaf_module_pvp2_idp/pom.xml
@@ -19,7 +19,11 @@
   		<artifactId>eaaf_module_pvp2_core</artifactId>
   		<version>${egiz.eaaf.version}</version>
   	</dependency>
-  	
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <scope>provided</scope>
+    </dependency>  	
   	<dependency>
 		<groupId>javax.servlet</groupId>
 		<artifactId>javax.servlet-api</artifactId>
diff --git a/eaaf_modules/eaaf_module_pvp2_sp/pom.xml b/eaaf_modules/eaaf_module_pvp2_sp/pom.xml
index b936f307..cf2ac340 100644
--- a/eaaf_modules/eaaf_module_pvp2_sp/pom.xml
+++ b/eaaf_modules/eaaf_module_pvp2_sp/pom.xml
@@ -25,7 +25,11 @@
   			</exclusion>
   		</exclusions>
    	</dependency>
-  	
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+      <scope>provided</scope>
+    </dependency>  	
   	<dependency>
 		<groupId>javax.servlet</groupId>
 		<artifactId>javax.servlet-api</artifactId>
diff --git a/pom.xml b/pom.xml
index c63b31c0..735c7b3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 
     <!-- ===================================================================== -->
     <at.gv.egiz.components.eventlog-api.version>0.4</at.gv.egiz.components.eventlog-api.version>
-    <at.gv.egiz.components.egiz-spring-api>0.3</at.gv.egiz.components.egiz-spring-api>
+    <at.gv.egiz.components.egiz-spring-api>0.3.1</at.gv.egiz.components.egiz-spring-api>
 
     <MOA.spss.server.moa-sig-lib.version>3.1.2</MOA.spss.server.moa-sig-lib.version>
     <MOA.spss.tsl_lib.version>2.0.2</MOA.spss.tsl_lib.version>
-- 
cgit v1.2.3