approved some more changes

4 files changed, 20 insertions, 39 deletions

diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index 1a8dfd786..c4eea5152 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -20,21 +20,13 @@
         The STORKCommons library provides beans, Java Interfaces and utility classes to integrate PEPS and SAML Engine.
   </description>
    
-  <repositories>
-		<repository>
-			<id>shibboleth.internet2.edu</id>
-			<name>Internet2</name>
-			<url>https://build.shibboleth.net/nexus/content/groups/public/</url>
-		</repository>
-	</repositories> 
-   
 	<dependencies>
 
 		<!-- Joda -->
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
-			<version>${jodatime.version}</version>
+			<version>2.3</version>
 		</dependency>
 
 		<!-- Log4J -->
@@ -62,8 +54,9 @@
 		</dependency>
 
 		<dependency>
-  		<groupId>org.opensaml</groupId>
-  		<artifactId>opensaml</artifactId>
+			<groupId>org.opensaml</groupId>
+			<artifactId>opensaml</artifactId>
+			<version>${opensaml.version}</version>
 			<exclusions>
 				<exclusion>
 				    <groupId>org.slf4j</groupId>
@@ -88,12 +81,6 @@
 			</exclusions>			
 		</dependency>
 
-		<!-- Bouncy Castle -->
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk16</artifactId>
-		</dependency>
-
 		<!-- Servlet API -->
 		<!-- provided by Application Server -->
 		<dependency>
@@ -128,7 +115,6 @@
 					<configuration>
 						<source>1.7</source>
 						<target>1.7</target>
-                        <encoding>UTF-8</encoding>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -136,7 +122,7 @@
 					<artifactId>maven-surefire-plugin</artifactId>
 					<configuration>
             			<runOrder>reversealphabetical</runOrder>
-						<skip>false</skip>
+						<skip>true</skip>
           				<includes>
                             <runOrder>reversealphabetical</runOrder>
 				            <include>**/PEPSUtilTest.java</include>
@@ -178,8 +164,9 @@
 				<configuration>
 					<links>
 						<link>http://commons.apache.org/lang/api/</link>
+						<link>http://java.sun.com/j2se/1.6.0/docs/api/</link>
 						<link>http://www.bouncycastle.org/docs/docs1.6/</link>
-						<link>http://docs.oracle.com/javase/7/docs/api/</link>
+						<link>http://docs.oracle.com/javase/6/docs/api/</link>
 					</links>
 				</configuration>
 			</plugin>
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
index 87ab4275f..f326ccfe9 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
@@ -251,10 +251,9 @@ public final class Linker implements Serializable {
 		originalAssertions = new ArrayList<STORKAttrQueryResponse>();

 

 		// Gather all assertions

-		for (STORKAttrQueryResponse element : this.assertions.values()) {

-			originalAssertions.add(element);

+		for (List<STORKAttrQueryResponse> element : this.assertions.values()) {

+			originalAssertions.addAll(element);

 		}

-

 		return originalAssertions;

 	}

 

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
index 82ec6d3b4..c656f81ee 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
@@ -376,15 +376,6 @@ public class ObjectFactory {
 	}
 
 	/**
-	 * Create an instance of {@link JAXBElement }{@code <}{@link MandateType }{@code >}
-	 * 
-	 */
-	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandate")
-	public JAXBElement<MandateType> createMandate(MandateType value) {
-		return new JAXBElement<MandateType>(_Mandate_QNAME, MandateType.class, null, value);
-	}
-
-	/**
 	 * Create an instance of {@link JAXBElement }{@code <}{@link RequestedAttributeType }{@code >}
 	 * 
 	 */
@@ -394,6 +385,15 @@ public class ObjectFactory {
 	}
 
 	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link MandateType }{@code >}
+	 *
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandate")
+	public JAXBElement<MandateType> createMandate(MandateType value) {
+		return new JAXBElement<MandateType>(_Mandate_QNAME, MandateType.class, null, value);
+	}
+
+	/**
 	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
 	 * 
 	 */
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index 36df747e4..590e8f4c3 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -13,7 +13,7 @@
 	<name>STORKSAMLEngine</name>

 	<properties>

 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

-		<saml.version>1.4.0</saml.version>

+		<saml.version>1.5.1</saml.version>

 		<samlspec.version>0.5.2</samlspec.version>

 		<samlspecacept.version>0.5.1</samlspecacept.version>

 		<commons.version>1.4.0</commons.version>

@@ -49,17 +49,12 @@
 			<groupId>eu.stork</groupId>

 			<artifactId>Commons</artifactId>

 			<version>${commons.version}</version>

-<!-- 			<exclusions>

-				<exclusion>

-					<groupId>org.bouncycastle</groupId>

-					<artifactId>bcprov-jdk16</artifactId>				

-				</exclusion>

-			</exclusions> -->

 		</dependency>

 

 		<dependency>

 			<groupId>org.opensaml</groupId>

 			<artifactId>opensaml</artifactId>

+			<version>${opensaml.version}</version>

 			<exclusions>

 				<exclusion>

 					<groupId>org.slf4j</groupId>