From fd1f836eda8a6a7c4683dd6e0b1ba38e39a87148 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 17 Mar 2016 08:32:13 +0100
Subject: add missing eIDAS dependencies

---
 id/server/modules/moa-id-module-eIDAS/pom.xml | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

(limited to 'id/server/modules/moa-id-module-eIDAS/pom.xml')

diff --git a/id/server/modules/moa-id-module-eIDAS/pom.xml b/id/server/modules/moa-id-module-eIDAS/pom.xml
index b43efac9e..31e42b6c2 100644
--- a/id/server/modules/moa-id-module-eIDAS/pom.xml
+++ b/id/server/modules/moa-id-module-eIDAS/pom.xml
@@ -13,10 +13,32 @@
 		<repositoryPath>${basedir}/../../../../repository</repositoryPath>
 		
 		<eidas-commons.version>eidas.1.0</eidas-commons.version>
-		<eidas-saml-engine.version>eidas.1.0</eidas-saml-engine.version>
-		
+		<eidas-saml-engine.version>eidas.1.0</eidas-saml-engine.version>		
 	</properties>
   
+      <profiles>
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <repositories>
+                <repository>
+                    <id>local</id>
+                    <name>local</name>
+                    <url>file:${basedir}/../../../../repository</url>
+                </repository>
+                <repository>
+                    <id>egiz-commons</id>
+                    <url>https://demo.egiz.gv.at/int-repo/</url>
+                    <releases>
+                        <enabled>true</enabled>
+                    </releases>
+                </repository>
+            </repositories>
+        </profile>
+    </profiles>
+  
   <dependencies>
   	<dependency>
 			<groupId>org.springframework</groupId>
-- 
cgit v1.2.3


From 988e345f81b0ac67037a756cfaaea87afa83b4a5 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 17 Mar 2016 09:22:16 +0100
Subject: problems with eIDAS dependencies

---
 id/server/modules/moa-id-module-eIDAS/pom.xml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'id/server/modules/moa-id-module-eIDAS/pom.xml')

diff --git a/id/server/modules/moa-id-module-eIDAS/pom.xml b/id/server/modules/moa-id-module-eIDAS/pom.xml
index 31e42b6c2..9e95301bd 100644
--- a/id/server/modules/moa-id-module-eIDAS/pom.xml
+++ b/id/server/modules/moa-id-module-eIDAS/pom.xml
@@ -13,7 +13,10 @@
 		<repositoryPath>${basedir}/../../../../repository</repositoryPath>
 		
 		<eidas-commons.version>eidas.1.0</eidas-commons.version>
-		<eidas-saml-engine.version>eidas.1.0</eidas-saml-engine.version>		
+		<eidas-saml-engine.version>eidas.1.0</eidas-saml-engine.version>
+		<eidas-encryption.version>eidas.1.0</eidas-encryption.version>
+		<eidas-configmodule.version>eidas.1.0</eidas-configmodule.version>
+				
 	</properties>
   
       <profiles>
@@ -69,6 +72,18 @@
                 </exclusion>
             </exclusions>
 		</dependency>
+	
+		<dependency>
+			<groupId>eu.eidas</groupId>
+  		<artifactId>eidas-configmodule</artifactId>
+  		<version>${eidas-configmodule.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>eu.eidas</groupId>
+			<artifactId>eidas-encryption</artifactId>
+  		<version>${eidas-encryption.version}</version>
+		</dependency>
 
 		<!-- eidas SAML Engine -->
 		<dependency> 
-- 
cgit v1.2.3


From 23cded37cfe100bf51480c08827166666e464c6c Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 18 Mar 2016 11:35:31 +0100
Subject: update slf4j

---
 id/server/modules/moa-id-module-eIDAS/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'id/server/modules/moa-id-module-eIDAS/pom.xml')

diff --git a/id/server/modules/moa-id-module-eIDAS/pom.xml b/id/server/modules/moa-id-module-eIDAS/pom.xml
index 9e95301bd..addf086d8 100644
--- a/id/server/modules/moa-id-module-eIDAS/pom.xml
+++ b/id/server/modules/moa-id-module-eIDAS/pom.xml
@@ -77,12 +77,24 @@
 			<groupId>eu.eidas</groupId>
   		<artifactId>eidas-configmodule</artifactId>
   		<version>${eidas-configmodule.version}</version>
+  		<exclusions>
+  			<exclusion>
+  				<artifactId>log4j-over-slf4j</artifactId>
+  				<groupId>org.slf4j</groupId>
+  			</exclusion>
+  		</exclusions>
 		</dependency>
 
 		<dependency>
 			<groupId>eu.eidas</groupId>
 			<artifactId>eidas-encryption</artifactId>
   		<version>${eidas-encryption.version}</version>
+  		<exclusions>
+  			<exclusion>
+  				<artifactId>log4j-over-slf4j</artifactId>
+  				<groupId>org.slf4j</groupId>
+  			</exclusion>
+  		</exclusions>
 		</dependency>
 
 		<!-- eidas SAML Engine -->
-- 
cgit v1.2.3