Merge remote-tracking branch 'remotes/origin/vidp' into moa2_0_tlenz

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
	id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
	id/server/moa-id-commons/pom.xml
	id/server/stork2-saml-engine/pom.xml
	pom.xml
	repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jar
	repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom

1 files changed, 64 insertions, 64 deletions

diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index deb287419..af6dfd21c 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -13,29 +13,29 @@
 	<name>STORKSAMLEngine</name>

 	<properties>

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

-		<saml.version>1.1.0</saml.version>

+		<saml.version>1.4.0</saml.version>

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

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

-		<commons.version>1.2.0</commons.version>

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

 		<opensaml.version>2.6.0</opensaml.version>

-    	<timestamp>${maven.build.timestamp}</timestamp>

+		<timestamp>${maven.build.timestamp}</timestamp>

 	</properties>

-	<version>${saml.version}</version>	

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

 	<description>

         The STORKSAMLEngine library provides tools to support developers working with the Security Assertion Markup Language (SAML).

     </description>

 

 	<repositories>

-	    <repository>

-	      <id>org.opensaml</id>

-	      <url>https://build.shibboleth.net/nexus/content/repositories/releases</url>

-	    </repository>	

+		<repository>

+			<id>org.opensaml</id>

+			<url>https://build.shibboleth.net/nexus/content/repositories/releases</url>

+		</repository>

 		<!-- repository OpenSaml -->

 		<repository>

 			<id>shibboleth-release</id>

 			<name>Internet2 Releases</name>

 			<layout>default</layout>

-            <url>https://build.shibboleth.net/nexus/content/repositories/releases</url>

+			<url>https://build.shibboleth.net/nexus/content/repositories/releases</url>

 			<snapshots>

 				<enabled>false</enabled>

 			</snapshots>

@@ -56,52 +56,52 @@
 			<version>${opensaml.version}</version>

 			<exclusions>

 				<exclusion>

-				    <groupId>org.slf4j</groupId>

-				    <artifactId>slf4j-api</artifactId>

+					<groupId>org.slf4j</groupId>

+					<artifactId>slf4j-api</artifactId>

 				</exclusion>

 				<exclusion>

-				 	<groupId>org.slf4j</groupId>

-				    <artifactId>slf4j-simple</artifactId>

+					<groupId>org.slf4j</groupId>

+					<artifactId>slf4j-simple</artifactId>

 				</exclusion>

 				<exclusion>

-				    <groupId>org.slf4j</groupId>

-				    <artifactId>jcl-over-slf4j</artifactId>

+					<groupId>org.slf4j</groupId>

+					<artifactId>jcl-over-slf4j</artifactId>

 				</exclusion>

 				<exclusion>

-				    <groupId>org.slf4j</groupId>

-				    <artifactId>log4j-over-slf4j</artifactId>

+					<groupId>org.slf4j</groupId>

+					<artifactId>log4j-over-slf4j</artifactId>

 				</exclusion>

 				<exclusion>

-				    <groupId>org.slf4j</groupId>

-				    <artifactId>jul-to-slf4j</artifactId>

+					<groupId>org.slf4j</groupId>

+					<artifactId>jul-to-slf4j</artifactId>

 				</exclusion>

-			</exclusions>			

+			</exclusions>

 		</dependency>

 

 		<dependency>

-		    <groupId>org.slf4j</groupId>

-		    <artifactId>slf4j-api</artifactId>

-		    <version>1.7.5</version>

+			<groupId>org.slf4j</groupId>

+			<artifactId>slf4j-api</artifactId>

+			<version>1.7.5</version>

 		</dependency>

 		<dependency>

-		    <groupId>org.slf4j</groupId>

-		    <artifactId>slf4j-simple</artifactId>

-		    <version>1.7.5</version>

+			<groupId>org.slf4j</groupId>

+			<artifactId>slf4j-simple</artifactId>

+			<version>1.7.5</version>

 		</dependency>

 		<dependency>

-		    <groupId>org.slf4j</groupId>

-		    <artifactId>jcl-over-slf4j</artifactId>

-		    <version>1.7.5</version>

+			<groupId>org.slf4j</groupId>

+			<artifactId>jcl-over-slf4j</artifactId>

+			<version>1.7.5</version>

 		</dependency>

 		<dependency>

-		    <groupId>org.slf4j</groupId>

-		    <artifactId>log4j-over-slf4j</artifactId>

-		    <version>1.7.5</version>

+			<groupId>org.slf4j</groupId>

+			<artifactId>log4j-over-slf4j</artifactId>

+			<version>1.7.5</version>

 		</dependency>

 		<dependency>

-		    <groupId>org.slf4j</groupId>

-		    <artifactId>jul-to-slf4j</artifactId>

-		    <version>1.7.5</version>

+			<groupId>org.slf4j</groupId>

+			<artifactId>jul-to-slf4j</artifactId>

+			<version>1.7.5</version>

 		</dependency>

 

 		<dependency>

@@ -123,7 +123,7 @@
 			<scope>test</scope>

 		</dependency>

 	</dependencies>

-	

+

 	<build>

 		<pluginManagement>

 			<plugins>

@@ -132,8 +132,8 @@
 					<artifactId>maven-compiler-plugin</artifactId>

 					<version>2.3.2</version>

 					<configuration>

-						<source>1.6</source>

-						<target>1.6</target>

+						<source>1.7</source>

+						<target>1.7</target>

 					</configuration>

 				</plugin>

 

@@ -161,42 +161,42 @@
 				</executions>

 			</plugin>

 			<plugin>

-        		<groupId>org.apache.maven.plugins</groupId>

-		        <artifactId>maven-jar-plugin</artifactId>

-	 			<configuration>

+				<groupId>org.apache.maven.plugins</groupId>

+				<artifactId>maven-jar-plugin</artifactId>

+				<configuration>

 					<archive>

-			            <manifestEntries>

-					        <SAMLEngineVersion>${saml.version}</SAMLEngineVersion>

-					        <SAMLSpecVersion-accept>${samlspecacept.version}</SAMLSpecVersion-accept>

-					        <SAMLSpecVersion-send>${samlspec.version}</SAMLSpecVersion-send>

-					        <SAMLSpecKnownIssues>None</SAMLSpecKnownIssues>

+						<manifestEntries>

+							<SAMLEngineVersion>${saml.version}</SAMLEngineVersion>

+							<SAMLSpecVersion-accept>${samlspecacept.version}</SAMLSpecVersion-accept>

+							<SAMLSpecVersion-send>${samlspec.version}</SAMLSpecVersion-send>

+							<SAMLSpecKnownIssues>None</SAMLSpecKnownIssues>

 							<timestamp>${timestamp}</timestamp>

-            			</manifestEntries>

-          			</archive>

-        		</configuration>

-        	</plugin>

+						</manifestEntries>

+					</archive>

+				</configuration>

+			</plugin>

 		</plugins>

 	</build>

 	<profiles>

-	   <profile>

+		<profile>

 			<id>metrics</id>

 			<build>

-			<plugins>

-				<plugin>

-				<groupId>org.codehaus.mojo</groupId>

-				<artifactId>cobertura-maven-plugin</artifactId>

-				<version>2.5.1</version>

-					<configuration>

-						<formats>

-							<format>html</format>

-							<format>xml</format>

+				<plugins>

+					<plugin>

+						<groupId>org.codehaus.mojo</groupId>

+						<artifactId>cobertura-maven-plugin</artifactId>

+						<version>2.5.1</version>

+						<configuration>

+							<formats>

+								<format>html</format>

+								<format>xml</format>

 							</formats>

-					</configuration>

-				</plugin>

-			</plugins>

+						</configuration>

+					</plugin>

+				</plugins>

 			</build>

 		</profile>

 	</profiles>

 	<reporting>

-    </reporting>

+	</reporting>

 </project>