From 6c7a6f8e222e4fb39a11c220b63e785f2037d428 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Thu, 16 Jan 2014 08:55:06 +0100
Subject: fix added real source of stork modules

---
 id/server/stork2-saml-engine/pom.xml | 194 +++++++++++++++++++++++++++++++++++
 1 file changed, 194 insertions(+)
 create mode 100644 id/server/stork2-saml-engine/pom.xml

(limited to 'id/server/stork2-saml-engine/pom.xml')

diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
new file mode 100644
index 000000000..1fbc13b1e
--- /dev/null
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -0,0 +1,194 @@
+<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>
+	<groupId>eu.stork</groupId>
+	<artifactId>saml-engine</artifactId>
+	<packaging>jar</packaging>
+	<name>STORKSAMLEngine</name>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<saml.version>1.1.0</saml.version>
+		<samlspec.version>0.5.2</samlspec.version>
+		<samlspecacept.version>0.5.1</samlspecacept.version>
+		<commons.version>1.1.0</commons.version>
+		<opensaml.version>2.6.0</opensaml.version>
+    	<timestamp>${maven.build.timestamp}</timestamp>
+	</properties>
+	<version>${saml.version}</version>	
+	<description>
+        The STORKSAMLEngine library provides tools to support developers working with the Security Assertion Markup Language (SAML).
+    </description>
+
+	<repositories>	
+		<!-- repository OpenSaml -->
+		<repository>
+			<id>shibboleth-release</id>
+			<name>Internet2 Releases</name>
+			<layout>default</layout>
+            <url>https://build.shibboleth.net/nexus/content/repositories/releases</url>
+			<snapshots>
+				<enabled>false</enabled>
+			</snapshots>
+		</repository>
+	</repositories>
+
+	<dependencies>
+		<!-- Compile dependencies -->
+		<dependency>
+			<groupId>eu.stork</groupId>
+			<artifactId>stork-commons</artifactId>
+			<version>${commons.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.opensaml</groupId>
+			<artifactId>opensaml</artifactId>
+			<version>${opensaml.version}</version>
+			<exclusions>
+				<exclusion>
+				    <groupId>org.slf4j</groupId>
+				    <artifactId>slf4j-api</artifactId>
+				</exclusion>
+				<exclusion>
+				 	<groupId>org.slf4j</groupId>
+				    <artifactId>slf4j-simple</artifactId>
+				</exclusion>
+				<exclusion>
+				    <groupId>org.slf4j</groupId>
+				    <artifactId>jcl-over-slf4j</artifactId>
+				</exclusion>
+				<exclusion>
+				    <groupId>org.slf4j</groupId>
+				    <artifactId>log4j-over-slf4j</artifactId>
+				</exclusion>
+				<exclusion>
+				    <groupId>org.slf4j</groupId>
+				    <artifactId>jul-to-slf4j</artifactId>
+				</exclusion>
+			</exclusions>			
+		</dependency>
+
+		<dependency>
+		    <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>
+		</dependency>
+		<dependency>
+		    <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>
+		</dependency>
+		<dependency>
+		    <groupId>org.slf4j</groupId>
+		    <artifactId>jul-to-slf4j</artifactId>
+		    <version>1.7.5</version>
+		</dependency>
+
+		<dependency>
+			<groupId>commons-io</groupId>
+			<artifactId>commons-io</artifactId>
+			<version>2.2</version>
+			<scope>compile</scope>
+		</dependency>
+		<dependency>
+			<groupId>xerces</groupId>
+			<artifactId>xercesImpl</artifactId>
+			<version>2.11.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.11</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	
+	<build>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-compiler-plugin</artifactId>
+					<version>2.3.2</version>
+					<configuration>
+						<source>1.6</source>
+						<target>1.6</target>
+					</configuration>
+				</plugin>
+
+				<plugin>
+					<groupId>org.apache.maven.plugins</groupId>
+					<artifactId>maven-surefire-plugin</artifactId>
+					<configuration>
+						<skip>false</skip>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>2.2.1</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<phase>verify</phase>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+        		<groupId>org.apache.maven.plugins</groupId>
+		        <artifactId>maven-jar-plugin</artifactId>
+				<version>2.4</version>
+	 			<configuration>
+					<archive>
+			            <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>
+		</plugins>
+	</build>
+	<profiles>
+	   <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>
+							</formats>
+					</configuration>
+				</plugin>
+			</plugins>
+			</build>
+		</profile>
+	</profiles>
+	<reporting>
+    </reporting>
+</project>
-- 
cgit v1.2.3


From 9cb68043945f53246928443cea723b58ee2b1c24 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 21 Jan 2014 14:38:35 +0100
Subject: updated samlengine

---
 id/server/stork2-saml-engine/pom.xml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'id/server/stork2-saml-engine/pom.xml')

diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index 1fbc13b1e..6be0472a7 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -2,7 +2,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eu.stork</groupId>
-	<artifactId>saml-engine</artifactId>
+	<artifactId>SamlEngine</artifactId>
 	<packaging>jar</packaging>
 	<name>STORKSAMLEngine</name>
 	<properties>
@@ -10,7 +10,7 @@
 		<saml.version>1.1.0</saml.version>
 		<samlspec.version>0.5.2</samlspec.version>
 		<samlspecacept.version>0.5.1</samlspecacept.version>
-		<commons.version>1.1.0</commons.version>
+		<commons.version>1.2.0</commons.version>
 		<opensaml.version>2.6.0</opensaml.version>
     	<timestamp>${maven.build.timestamp}</timestamp>
 	</properties>
@@ -19,7 +19,11 @@
         The STORKSAMLEngine library provides tools to support developers working with the Security Assertion Markup Language (SAML).
     </description>
 
-	<repositories>	
+	<repositories>
+	    <repository>
+	      <id>org.opensaml</id>
+	      <url>https://build.shibboleth.net/nexus/content/repositories/releases</url>
+	    </repository>	
 		<!-- repository OpenSaml -->
 		<repository>
 			<id>shibboleth-release</id>
@@ -36,7 +40,7 @@
 		<!-- Compile dependencies -->
 		<dependency>
 			<groupId>eu.stork</groupId>
-			<artifactId>stork-commons</artifactId>
+			<artifactId>Commons</artifactId>
 			<version>${commons.version}</version>
 		</dependency>
 
@@ -131,7 +135,7 @@
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
 					<configuration>
-						<skip>false</skip>
+						<skip>true</skip>
 					</configuration>
 				</plugin>
 			</plugins>
@@ -140,7 +144,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.2.1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -154,7 +157,6 @@
 			<plugin>
         		<groupId>org.apache.maven.plugins</groupId>
 		        <artifactId>maven-jar-plugin</artifactId>
-				<version>2.4</version>
 	 			<configuration>
 					<archive>
 			            <manifestEntries>
-- 
cgit v1.2.3


From ef35deb727190363d17d693d10f27171787cc92c Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 3 Feb 2014 15:38:24 +0100
Subject: Solve some merge problems

---
 id/server/stork2-saml-engine/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'id/server/stork2-saml-engine/pom.xml')

diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index 6be0472a7..b002471db 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -1,5 +1,11 @@
 <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">
+	<parent>
+		<groupId>MOA.id</groupId>
+		<artifactId>moa-id</artifactId>
+		<version>1.9.98-SNAPSHOT</version>
+	</parent>
+	
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>eu.stork</groupId>
 	<artifactId>SamlEngine</artifactId>
-- 
cgit v1.2.3