From 6fa8a9968e44fb5d56fc8d9c3ddd536a8997f7a9 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Wed, 9 Mar 2022 13:49:51 +0100
Subject: refactor(core): split 'ms-connector' WebApp into 'core' and
 'ms-connector' to reuse some code for 'ms-proxy' WebApp

# Conflicts:
#	connector/src/main/resources/specific_eIDAS_connector.beans.xml
#	connector/src/test/resources/spring/SpringTest_connector.beans.xml
#	core_common_webapp/src/main/java/at/asitplus/eidas/specific/core/builder/AuthenticationDataBuilder.java
#	core_common_webapp/src/test/java/at/asitplus/eidas/specific/core/test/utils/AuthenticationDataBuilderTest.java
#	eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/IdAustriaAuthConstants.java
#	eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/ReceiveFromIdAustriaSystemTask.java
#	eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/RequestIdAustriaSystemTask.java
#	eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/controller/IdAustriaAuthMetadataControllerFirstTest.java
#	eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/task/ReceiveAuthnResponseTaskTest.java
#	eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/task/RequestIdAustriaSystemTaskTest.java
#	eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/utils/IdAustriaAuthCredentialProviderTest.java
#	eidas_modules/authmodule_id-austria/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/utils/IdAustriaAuthMetadataProviderFirstTest.java
#	eidas_modules/authmodule_id-austria/src/test/resources/spring/SpringTest-context_basic_mapConfig.xml
#	eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/MsProxyServiceConstants.java
#	eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/EidasProxyServiceController.java
#	eidas_modules/eidas_proxy-sevice/src/main/java/at/asitplus/eidas/specific/modules/msproxyservice/protocol/ProxyServiceAuthenticationAction.java
#	eidas_modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/EidasProxyServiceControllerTest.java
#	eidas_modules/eidas_proxy-sevice/src/test/java/at/asitplus/eidas/specific/modules/auth/idaustria/test/protocol/ProxyServiceAuthenticationActionTest.java
#	eidas_modules/eidas_proxy-sevice/src/test/resources/spring/SpringTest-context_basic_mapConfig.xml
---
 pom.xml | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 718fa785..c2c00db6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,6 +123,7 @@
     <module>connector</module>
     <module>eidas_modules</module>
     <module>build_reporting</module>
+    <module>core_common_webapp</module>
   </modules>
 
   <dependencyManagement>
@@ -153,6 +154,11 @@
         <artifactId>eaaf_module_pvp2_idp</artifactId>
         <version>${eaaf-core.version}</version>
       </dependency>
+      <dependency>
+        <groupId>at.gv.egiz.eaaf</groupId>
+        <artifactId>eaaf_module_pvp2_sp</artifactId>
+        <version>${eaaf-core.version}</version>
+      </dependency>            
       <dependency>
         <groupId>at.asitplus.eidas.ms_specific</groupId>
         <artifactId>ms_specific_connector</artifactId>
@@ -174,6 +180,11 @@
         <artifactId>core_common_lib</artifactId>
         <version>${egiz.eidas.version}</version>
       </dependency>
+      <dependency>
+        <groupId>at.asitplus.eidas.ms_specific</groupId>
+        <artifactId>core_common_webapp</artifactId>
+        <version>${egiz.eidas.version}</version>
+      </dependency>
 
       <!-- eIDAS reference implemenation libs -->
       <dependency>
@@ -464,14 +475,29 @@
         <artifactId>eaaf_module_pvp2_sp</artifactId>
         <version>${eaaf-core.version}</version>
         <scope>test</scope>
+        <type>test-jar</type>
       </dependency>
+      <dependency>
+        <groupId>at.gv.egiz.eaaf</groupId>
+        <artifactId>eaaf_module_pvp2_idp</artifactId>
+        <version>${eaaf-core.version}</version>
+        <scope>test</scope>
+        <type>test-jar</type>
+      </dependency>      
       <dependency>
         <groupId>at.asitplus.eidas.ms_specific</groupId>
-        <artifactId>connector_lib</artifactId>
+        <artifactId>core_common_lib</artifactId>
         <version>${egiz.eidas.version}</version>
         <scope>test</scope>
         <type>test-jar</type>
       </dependency>
+      <dependency>
+        <groupId>at.asitplus.eidas.ms_specific</groupId>
+        <artifactId>core_common_webapp</artifactId>
+        <version>${egiz.eidas.version}</version>
+        <scope>test</scope>
+        <type>test-jar</type>
+      </dependency>            
       <dependency>
         <groupId>at.asitplus.eidas.ms_specific.modules</groupId>
         <artifactId>authmodule-eIDAS-v2</artifactId>
-- 
cgit v1.2.3