From 90b7f4418ac35fe07a0bccd8aa069a8173881237 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 7 Aug 2014 07:20:27 +0200
Subject: Fix possible classloader problems with TSL library   - exclude sub
 librarys in maven pom file

---
 spss/server/serverlib/pom.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'spss/server/serverlib')

diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index f762ecdf6..3ee362890 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -144,7 +144,21 @@
 		
 		<dependency>
 			<groupId>iaik</groupId>
-			<artifactId>iaik_tsl</artifactId>			
+			<artifactId>iaik_tsl</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>iaik_pki_module</artifactId>
+					<groupId>iaik</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>iaik_ecc_signed</artifactId>
+					<groupId>iaik</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>iaik_jce_eval_signed</artifactId>
+					<groupId>iaik</groupId>
+				</exclusion>
+			</exclusions>			
 		</dependency>
 		<dependency>
 			<groupId>iaik</groupId>
-- 
cgit v1.2.3


From 2f4f5750cf0d3fc83793a31017daee331410015a Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Mon, 11 Aug 2014 15:31:57 +0200
Subject: Update iaik-TSL library (ETSI TS119612 V1.2.1)

* change Version to 2.0.2
---
 spss/server/serverlib/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spss/server/serverlib')

diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index 3ee362890..4ba4aa708 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -160,7 +160,7 @@
 				</exclusion>
 			</exclusions>			
 		</dependency>
-		<dependency>
+<!-- 		<dependency>
 			<groupId>iaik</groupId>
 			<artifactId>iaik_util</artifactId>
 		</dependency>
@@ -183,7 +183,7 @@
 		<dependency>
 			<groupId>iaik</groupId>
 		  	<artifactId>iaik_jsse</artifactId>
-  		</dependency>
+  		</dependency> -->
 		
 		 
 		 
-- 
cgit v1.2.3


From 30bd1dd3de38c29af4fbeef8ef87be7ecbecfd53 Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Mon, 25 Aug 2014 18:03:32 +0200
Subject: resolving build issues

---
 spss/server/serverlib/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'spss/server/serverlib')

diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index 4ba4aa708..cd9518d53 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -160,6 +160,16 @@
 				</exclusion>
 			</exclusions>			
 		</dependency>
+                <dependency>
+                        <groupId>iaik</groupId>
+                        <artifactId>iaik_xsect_eval</artifactId>
+                </dependency>
+		<dependency>
+		  <groupId>org.xerial</groupId>
+		  <artifactId>sqlite-jdbc</artifactId>
+		  <version>3.7.8-SNAPSHOT</version>
+		</dependency>
+
 <!-- 		<dependency>
 			<groupId>iaik</groupId>
 			<artifactId>iaik_util</artifactId>
-- 
cgit v1.2.3


From fb63a316cf16d84ff357df87b4ed2ddba063044a Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Wed, 10 Sep 2014 11:16:09 +0200
Subject: remove dependency entries

---
 spss/server/serverlib/pom.xml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'spss/server/serverlib')

diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index cd9518d53..cc96d411a 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -160,16 +160,7 @@
 				</exclusion>
 			</exclusions>			
 		</dependency>
-                <dependency>
-                        <groupId>iaik</groupId>
-                        <artifactId>iaik_xsect_eval</artifactId>
-                </dependency>
-		<dependency>
-		  <groupId>org.xerial</groupId>
-		  <artifactId>sqlite-jdbc</artifactId>
-		  <version>3.7.8-SNAPSHOT</version>
-		</dependency>
-
+		
 <!-- 		<dependency>
 			<groupId>iaik</groupId>
 			<artifactId>iaik_util</artifactId>
-- 
cgit v1.2.3


From 6f5319b465eb857e13ee562ccfd9a94f1e681501 Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Fri, 12 Sep 2014 12:27:49 +0200
Subject: update dependency version   > org.apache.struts:struts2-core 2.3.16.3
   > org.apache.struts:struts2-json-plugin 2.3.16.3   > joda-time:joda-time
 2.4   > org.slf4j:jcl-over-slf4j 1.7.7   > org.slf4j:jul-to-slf4j 1.7.7   >
 org.slf4j:slf4j-api 1.7.7   > org.slf4j:slf4j-log4j12 1.7.7   >
 mysql:mysql-connector-java 5.1.32   > org.hibernate:hibernate-core
 4.3.6.Final   > org.hibernate:hibernate-entitymanager 4.3.6.Final   >
 org.hibernate:hibernate-c3p0 4.3.6.Final   >
 com.google.http-client:google-http-client-jackson2 1.19.0   >
 com.google.oauth-client:google-oauth-client-jetty 1.19.0   >
 org.apache.commons:commons-lang3 3.3.2   > commons-codec:commons-codec 1.9  
 > commons-logging:commons-logging 1.2   > xerces:xercesImpl 2.11.0   >
 postgresql:postgresql 9.3-1102-jdbc41   > junit:junit 3.8.2

---
 spss/server/serverlib/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'spss/server/serverlib')

diff --git a/spss/server/serverlib/pom.xml b/spss/server/serverlib/pom.xml
index cc96d411a..3cf8d0bd7 100644
--- a/spss/server/serverlib/pom.xml
+++ b/spss/server/serverlib/pom.xml
@@ -58,7 +58,7 @@
 			<artifactId>log4j</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>postgresql</groupId>
+			<groupId>org.postgresql</groupId>
 			<artifactId>postgresql</artifactId>
 		</dependency>
 		<dependency>
-- 
cgit v1.2.3