From b445b300db3a6895647f7f939f63e6b1f52ac0a3 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Tue, 25 Nov 2014 12:03:02 +0100
Subject: Fix build.

- Remove svn metadata.
- Fix local repository (inappropriate xalan-bin-dist dependency file names and copy-past error in dependency pom).
- Switch jdk 1.5/1.6 to 1.7.
- Exclude non working tests.
---
 id/server/stork2-commons/pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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

diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index 555d6cec7..44ab8ddaf 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -129,8 +129,8 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.1</version>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<source>1.7</source>
+						<target>1.7</target>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -180,9 +180,8 @@
 				<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/6/docs/api/</link>
+						<link>http://docs.oracle.com/javase/7/docs/api/</link>
 					</links>
 				</configuration>
 			</plugin>
-- 
cgit v1.2.3


From 0ed0a7702850b2001aaa8d5b194708a96e90dea3 Mon Sep 17 00:00:00 2001
From: Thomas Knall <t.knall@datentechnik-innovation.com>
Date: Fri, 9 Jan 2015 11:25:10 +0100
Subject: Apply several fixes.

- Disable erroneous IAIK PKI logger initialization (should be addressed by.
- Remove redundant maven-dependency version declarations.
- Fix maven/eclipse lifecyle warning problem.
---
 id/server/stork2-commons/pom.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index 44ab8ddaf..369e3fa6d 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -41,7 +41,6 @@
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
 			<exclusions>
 				<exclusion>
 					<groupId>javax.jms</groupId>
-- 
cgit v1.2.3


From bbd89ecac39989210f2572b41f5050cc2885be40 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 23 Jan 2015 13:07:47 +0100
Subject: update versions

---
 id/server/stork2-commons/pom.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index 43a02ae5d..926651b04 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -41,7 +41,6 @@
 		<dependency>
 			<groupId>log4j</groupId>
 			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
 			<exclusions>
 				<exclusion>
 					<groupId>javax.jms</groupId>
@@ -65,7 +64,6 @@
 		<dependency>
   		<groupId>org.opensaml</groupId>
   		<artifactId>opensaml</artifactId>
-			<version>${opensaml.version}</version>
 			<exclusions>
 				<exclusion>
 				    <groupId>org.slf4j</groupId>
@@ -130,8 +128,8 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.1</version>
 					<configuration>
-						<source>1.7</source>
-						<target>1.7</target>
+						<source>1.6</source>
+						<target>1.6</target>
                         <encoding>UTF-8</encoding>
 					</configuration>
 				</plugin>
-- 
cgit v1.2.3


From fb294d6394ef5d13590d2ed1b061a589f066e3da Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 20 Feb 2015 08:46:32 +0100
Subject: fix possible problem with different bouncycastle versions

---
 id/server/stork2-commons/pom.xml | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index dc9c22515..81f2cf4e5 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -92,7 +92,6 @@
 		<dependency>
 			<groupId>org.bouncycastle</groupId>
 			<artifactId>bcprov-jdk16</artifactId>
-			<version>1.46</version>
 		</dependency>
 
 		<!-- Servlet API -->
-- 
cgit v1.2.3


From d28e5b6e0d0793558f3328c5a420c17bdd606104 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 16 Apr 2015 13:48:50 +0200
Subject: update library versions

---
 id/server/stork2-commons/pom.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index 81f2cf4e5..1a8dfd786 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -34,7 +34,7 @@
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
-			<version>2.3</version>
+			<version>${jodatime.version}</version>
 		</dependency>
 
 		<!-- Log4J -->
@@ -113,7 +113,6 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-- 
cgit v1.2.3


From 9f2beccee247fb30235aeae28ecb91789e39cbe3 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 11 Aug 2015 13:26:30 +0200
Subject: approved some more changes

---
 id/server/stork2-commons/pom.xml | 27 +++++++--------------------
 1 file changed, 7 insertions(+), 20 deletions(-)

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

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>
-- 
cgit v1.2.3


From 04381eb4e2d67ced539b34747403bb06cdf36c53 Mon Sep 17 00:00:00 2001
From: Florian Reimair <florian.reimair@iaik.tugraz.at>
Date: Tue, 11 Aug 2015 14:30:07 +0200
Subject: poms

---
 id/server/stork2-commons/pom.xml | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

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

diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index c4eea5152..3bc3dae77 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -12,8 +12,7 @@
 	<name>Stork Commons</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<stork.version>1.4.0</stork.version>
-		<opensaml.version>2.6.3</opensaml.version>
+		<stork.version>1.5.1</stork.version>
 	</properties>
 	<version>${stork.version}</version>
   <description>
@@ -56,7 +55,6 @@
 		<dependency>
 			<groupId>org.opensaml</groupId>
 			<artifactId>opensaml</artifactId>
-			<version>${opensaml.version}</version>
 			<exclusions>
 				<exclusion>
 				    <groupId>org.slf4j</groupId>
@@ -86,7 +84,6 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -136,27 +133,6 @@
 			</plugins>
 		</pluginManagement>
 		<plugins>
-		
-		           	 
-<!-- 		          <plugin>
-            		<groupId>org.codehaus.mojo</groupId>
-            		<artifactId>properties-maven-plugin</artifactId>
-            		<version>1.0-alpha-2</version>
-            		<executions>
-                		<execution>
-                    		<phase>initialize</phase>
-                    		<goals>
-                        		<goal>read-project-properties</goal>
-                    		</goals>
-                    		<configuration>
-    	                   		<files>
-		                            <file>${basedir}/../../../moa-id.properties</file>
-      		                  </files>
-          		          </configuration>
-              		  </execution>
-            		</executions>
-        		</plugin> -->
-		
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-- 
cgit v1.2.3