From e443168b481bb88fecbad73084147e7e8c882908 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <thomas.lenz@egiz.gv.at>
Date: Tue, 10 Dec 2019 07:39:27 +0100
Subject: refactoring to new EGIZ code requirements

---
 connector/pom.xml | 216 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 115 insertions(+), 101 deletions(-)

(limited to 'connector/pom.xml')

diff --git a/connector/pom.xml b/connector/pom.xml
index 2b1f4ee8..af1d5947 100644
--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -1,100 +1,114 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-		<groupId>at.asitplus.eidas</groupId>
-		<artifactId>ms_specific</artifactId>
-	  <version>1.0.3-snapshot</version>
-	</parent>
-  
+    <groupId>at.asitplus.eidas</groupId>
+    <artifactId>ms_specific</artifactId>
+    <version>1.0.3-snapshot</version>
+  </parent>
+
   <groupId>at.asitplus.eidas.ms_specific</groupId>
   <artifactId>ms_specific_connector</artifactId>
-  <packaging>war</packaging>  
+  <packaging>war</packaging>
   <name>Connector Maven Webapp</name>
   <url>http://maven.apache.org</url>
-    
+
   <dependencies>
-  	<!-- Web application --> 
-  	
-  		<dependency> 
-    		<groupId>at.gv.egiz.components</groupId>
-    		<artifactId>egiz-spring-api</artifactId>
-    	</dependency>
-    	<dependency>
-    		<groupId>at.gv.egiz.components</groupId>
-    		<artifactId>eventlog-slf4j</artifactId>
-    	</dependency>
-    	<dependency>
-    		<groupId>at.gv.egiz.eaaf</groupId>
-  			<artifactId>eaaf-core</artifactId>
-  		</dependency>
-  		<dependency>
-  			<groupId>at.gv.egiz.eaaf</groupId>
-	  		<artifactId>eaaf_module_pvp2_idp</artifactId>
-	  		<exclusions>
-	  			<exclusion>
-	  				<groupId>org.slf4j</groupId>
-	  				<artifactId>log4j-over-slf4j</artifactId>
-	  			</exclusion>
-	  		</exclusions>	  		
-  		</dependency>
-  		<dependency>
-  			<groupId>at.asitplus.eidas.ms_specific</groupId>
-  			<artifactId>connector_lib</artifactId>
-  		</dependency>  		    
-  		<dependency>
-  			<groupId>at.asitplus.eidas.ms_specific.modules</groupId>
-  			<artifactId>authmodule-eIDAS-v2</artifactId>
-  		</dependency>
-    	
-    	<!-- Third party libs -->
-    	<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-webmvc</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-  			<artifactId>spring-context</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.thymeleaf</groupId>
-    		<artifactId>thymeleaf-spring5</artifactId>
-		</dependency>
-		<dependency>
-    		<groupId>org.slf4j</groupId>
-    		<artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-    		<groupId>org.slf4j</groupId>
-    		<artifactId>slf4j-log4j12</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-    		<artifactId>commons-collections4</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>javax.servlet</groupId>
-			<artifactId>javax.servlet-api</artifactId>
-			<scope>provided</scope>
-		</dependency>
-  
-  
-  	<!-- Testing -->
-    	<dependency>
-      		<groupId>junit</groupId>
-      		<artifactId>junit</artifactId>
-      		<scope>test</scope>
-  	 	</dependency>
-  	 	<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-  	 	
+    <!-- Web application -->
+
+    <dependency>
+      <groupId>at.gv.egiz.components</groupId>
+      <artifactId>egiz-spring-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>at.gv.egiz.components</groupId>
+      <artifactId>eventlog-slf4j</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>at.gv.egiz.eaaf</groupId>
+      <artifactId>eaaf-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>at.gv.egiz.eaaf</groupId>
+      <artifactId>eaaf_module_pvp2_idp</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>org.slf4j</groupId>
+          <artifactId>log4j-over-slf4j</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>at.asitplus.eidas.ms_specific</groupId>
+      <artifactId>connector_lib</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>at.asitplus.eidas.ms_specific.modules</groupId>
+      <artifactId>authmodule-eIDAS-v2</artifactId>
+    </dependency>
+
+    <!-- Third party libs -->
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-webmvc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.thymeleaf</groupId>
+      <artifactId>thymeleaf-spring5</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+
+    <!-- Testing -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>at.gv.egiz.eaaf</groupId>
+      <artifactId>eaaf_core_utils</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+    <dependency>
+      <groupId>at.gv.egiz.eaaf</groupId>
+      <artifactId>eaaf-core</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>
+    </dependency>
+
   </dependencies>
   <build>
     <finalName>ms_connector</finalName>
-    
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -104,22 +118,22 @@
           <target>1.8</target>
         </configuration>
       </plugin>
-      
+
       <!-- enable co-existence of testng and junit -->
-			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<threadCount>1</threadCount>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.apache.maven.surefire</groupId>
-						<artifactId>surefire-junit47</artifactId>
-						<version>${surefire.version}</version>
-					</dependency>
-				</dependencies>
-			</plugin>
-      
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <threadCount>1</threadCount>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.maven.surefire</groupId>
+            <artifactId>surefire-junit47</artifactId>
+            <version>${surefire.version}</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+
     </plugins>
   </build>
 </project>
-- 
cgit v1.2.3