From b557ff02ff830682bfe1a1049cfad72e3d9a11e0 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Thu, 6 Nov 2014 15:28:31 +0100
Subject: Revert "Merge branch 'moa-2.1-Snapshot' of
 gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa-2.1-Snapshot"

This reverts commit 775e39a724baf237085280510216fbd688df6dd9, reversing
changes made to 1fbff5f5a86733bc6a75c8ae901153baa0963441.
---
 .../moa/id/protocols/stork2/PhyPersonMandateContainer.java        | 1 +
 id/server/stork2-commons/pom.xml                                  | 5 ++---
 id/server/stork2-saml-engine/pom.xml                              | 8 +-------
 3 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'id/server')

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/PhyPersonMandateContainer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/PhyPersonMandateContainer.java
index 2ea6cce00..ba89663ab 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/PhyPersonMandateContainer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/PhyPersonMandateContainer.java
@@ -127,4 +127,5 @@ public class PhyPersonMandateContainer extends MandateContainer {
     public void setPhyPersMandatorIdentificationType(String phyPersMandatorIdentificationType) {
         this.phyPersMandatorIdentificationType = phyPersMandatorIdentificationType;
     }
+
 }
diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index 86b37a143..555d6cec7 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -13,7 +13,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<stork.version>1.4.0</stork.version>
-		<opensaml.version>2.6.1</opensaml.version>
+		<opensaml.version>2.6.3</opensaml.version>
 	</properties>
 	<version>${stork.version}</version>
   <description>
@@ -62,7 +62,7 @@
 			</exclusions>
 		</dependency>
 
-        <dependency>
+		<dependency>
   		<groupId>org.opensaml</groupId>
   		<artifactId>opensaml</artifactId>
 			<exclusions>
@@ -89,7 +89,6 @@
 			</exclusions>			
 		</dependency>
 
-
 		<!-- Bouncy Castle -->
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index 1979c770e..30f2bff7c 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -17,7 +17,7 @@
 		<samlspec.version>0.5.2</samlspec.version>
 		<samlspecacept.version>0.5.1</samlspecacept.version>
 		<commons.version>1.4.0</commons.version>
-		<opensaml.version>2.6.0</opensaml.version>
+		<opensaml.version>2.6.2</opensaml.version>
 		<timestamp>${maven.build.timestamp}</timestamp>
 		<repositoryPath>${basedir}/../../../repository</repositoryPath>
 	</properties>
@@ -89,12 +89,6 @@
 			</exclusions>
 		</dependency>
 
-        <!--
-        <dependency>
-            <groupId>org.opensaml</groupId>
-            <artifactId>xmltooling</artifactId>
-        </dependency>
-        -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-- 
cgit v1.2.3