From 791615f1f887f81ade19a374e2552f3cb1be89ab Mon Sep 17 00:00:00 2001
From: Bojan Suzic <bojan.suzic@iaik.tugraz.at>
Date: Mon, 3 Feb 2014 19:04:01 +0100
Subject: merging again

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

(limited to 'spss/server/serverws/pom.xml')

diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index b8a04eba4..4dc5319ec 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -17,6 +17,20 @@
         <repositoryPath>${basedir}/../../../repository</repositoryPath>
     </properties>
 
+
+    <repositories>
+        <repository>
+            <id>JBoss IAIK</id>
+            <url>http://nexus.iaik.tugraz.at/nexus/content/repositories/nexus/</url>
+            <!-- <releases><enabled>true</enabled></releases> -->
+        </repository>
+        <repository>
+            <id>IAIK libs</id>
+            <url>http://nexus.iaik.tugraz.at/nexus/content/repositories/iaik/</url>
+            <!-- <releases><enabled>true</enabled></releases> -->
+        </repository>
+    </repositories>
+
     <build>
         <plugins>
             <plugin>
-- 
cgit v1.2.3


From 5fa4dd6fd8955dd601375f81b992df26757f89e4 Mon Sep 17 00:00:00 2001
From: Klaus Stranacher <kstranacher@iaik.tugraz.at>
Date: Thu, 6 Mar 2014 20:54:43 +0100
Subject: Change to MOA-SPSS version 1.5.2

---
 spss/server/serverws/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spss/server/serverws/pom.xml')

diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index b8a04eba4..4372c76d0 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>MOA.spss</groupId>
         <artifactId>moa-spss</artifactId>
-        <version>2.0.x</version>
+        <version>1.5.x</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>MOA.spss.server</groupId>
     <artifactId>moa-spss-ws</artifactId>
     <packaging>war</packaging>
-    <version>2.0.0</version>
+    <version>1.5.2</version>
     <name>MOA SP/SS WebService</name>
 
     <properties>
-- 
cgit v1.2.3


From 6cc5cd2311c9e6cde062fa4034444969f9c293e0 Mon Sep 17 00:00:00 2001
From: Klaus Stranacher <kstranacher@iaik.tugraz.at>
Date: Sun, 9 Mar 2014 21:04:57 +0100
Subject: POMs added to dependencies maven-assembly-plugin version set to
 2.2-beta-1 (for MOA-SPSS) Update TSL parts

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

(limited to 'spss/server/serverws/pom.xml')

diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index 4372c76d0..0314cb454 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -22,7 +22,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
-                <version>2.1.1</version>
+                <version>2.3</version>
                 <!-- <version>2.0.2</version>-->
                 <configuration>
                     <archive>
-- 
cgit v1.2.3


From 403896aef0f9d3c76bbfcf3e970ae7dbc983ffd4 Mon Sep 17 00:00:00 2001
From: Klaus Stranacher <kstranacher@iaik.tugraz.at>
Date: Mon, 10 Mar 2014 15:48:06 +0100
Subject: Update trustprofiles and certstore Update TSL processing (working
 directory handling) Update groupId of IAIK dependencies

---
 spss/server/serverws/pom.xml | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'spss/server/serverws/pom.xml')

diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index 0314cb454..a99a573c1 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -70,7 +70,7 @@
 			<artifactId>iaik_ixsil</artifactId>
 		</dependency>
         <dependency>
-			<groupId>iaik.prod</groupId>
+			<groupId>iaik</groupId>
 			<artifactId>iaik_tsl</artifactId>
 		</dependency>
 		<dependency>
@@ -78,12 +78,12 @@
 			<artifactId>log4j</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>iaik.prod</groupId>
+			<groupId>iaik</groupId>
 			<artifactId>iaik_util</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_xsect</artifactId>
+			<groupId>iaik</groupId>
+			<artifactId>iaik_xsect_eval</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
@@ -98,13 +98,10 @@
 		  	<artifactId>sqlite-jdbc</artifactId>
   		</dependency>
 		<dependency>
-			<groupId>iaik.prod</groupId>
+			<groupId>iaik</groupId>
 		  	<artifactId>iaik_jsse</artifactId>
-  		</dependency>		
-		<dependency>
-			<groupId>iaik.prod</groupId>
-			<artifactId>iaik_util</artifactId>
-		</dependency>
+  		</dependency>	
+		
         <!-- transitive dependencies we don't want to include into the war -->
         <dependency>
             <groupId>iaik.prod</groupId>
-- 
cgit v1.2.3


From 51a43cf305020f780c52cfe1d70e793be9391f16 Mon Sep 17 00:00:00 2001
From: Klaus Stranacher <kstranacher@iaik.tugraz.at>
Date: Mon, 17 Mar 2014 21:13:42 +0100
Subject: Update to version 2.0.0 (pom, handbook, etc.) Handbook usage updated
 (TSL example added) Update TSL handling

---
 spss/server/serverws/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'spss/server/serverws/pom.xml')

diff --git a/spss/server/serverws/pom.xml b/spss/server/serverws/pom.xml
index a99a573c1..2a7467146 100644
--- a/spss/server/serverws/pom.xml
+++ b/spss/server/serverws/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>MOA.spss</groupId>
         <artifactId>moa-spss</artifactId>
-        <version>1.5.x</version>
+        <version>2.0.x</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>MOA.spss.server</groupId>
     <artifactId>moa-spss-ws</artifactId>
     <packaging>war</packaging>
-    <version>1.5.2</version>
+    <version>2.0.0</version>
     <name>MOA SP/SS WebService</name>
 
     <properties>
-- 
cgit v1.2.3