From 0a991b6029f362bf04edcdb76b235090b0005d2b Mon Sep 17 00:00:00 2001
From: Thomas Lenz <tlenz@iaik.tugraz.at>
Date: Thu, 21 Jan 2016 07:09:04 +0100
Subject: move or remove third-party library depentencies

---
 id/server/idserverlib/pom.xml                  | 86 +++-----------------------
 id/server/moa-id-commons/pom.xml               |  4 +-
 id/server/modules/moa-id-module-openID/pom.xml | 10 ++-
 id/server/modules/module-stork/pom.xml         | 27 ++++++++
 id/server/modules/pom.xml                      |  4 ++
 5 files changed, 50 insertions(+), 81 deletions(-)

(limited to 'id/server')

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index d9006dbf8..afc432628 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -90,11 +90,7 @@
             <artifactId>Commons</artifactId>
             <version>1.4.0</version>
         </dependency> -->
-        <dependency>
-            <groupId>eu.stork</groupId>
-            <artifactId>SamlEngine</artifactId>
-            <version>1.5.1</version>
-        </dependency>
+
 
 		<dependency>
 			<groupId>MOA</groupId>
@@ -405,78 +401,6 @@
 		</dependency>
         -->
 
-
-
-		<!-- JSON JWT implementation -->
-		<dependency>
-			<groupId>com.googlecode.jsontoken</groupId>
-			<artifactId>jsontoken</artifactId>
-			<version>1.1</version>
-			<exclusions>
-				<exclusion>
-					<groupId>javax.servlet</groupId>
-					<artifactId>servlet-api</artifactId>
-				</exclusion>
-				<exclusion>
-					<artifactId>google-collections</artifactId>
-					<groupId>com.google.collections</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>18.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>commons-codec</groupId>
-			<artifactId>commons-codec</artifactId>
-			<version>1.10</version>
-		</dependency>
-
-		<!-- Google OAuth Client -->
-		<dependency>
-			<groupId>com.google.http-client</groupId>
-			<artifactId>google-http-client-jackson2</artifactId>
-			<version>1.19.0</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.google.oauth-client</groupId>
-			<artifactId>google-oauth-client-jetty</artifactId>
-			<version>1.19.0</version>
-			<scope>test</scope>
-			<exclusions>
-				<exclusion>
-					<groupId>org.mortbay.jetty</groupId>
-					<artifactId>servlet-api</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
-		<dependency>
-			<groupId>eu.stork</groupId>
-			<artifactId>DocumentService</artifactId>
-			<version>0.0.1-SNAPSHOT</version>
-			<classifier>classes</classifier>
-			<exclusions>
-				<exclusion>
-					<artifactId>axis</artifactId>
-					<groupId>org.apache.axis</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>bcprov-jdk16</artifactId>
-					<groupId>org.bouncycastle</groupId>
-				</exclusion>
-				<exclusion>
-					<artifactId>jaxws-tools</artifactId>
-					<groupId>com.sun.xml.ws</groupId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
 		<!-- the core, which includes Streaming API, shared low-level abstractions (but NOT data-binding) -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
@@ -511,7 +435,7 @@
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
 			<version>1.4.178</version>
-			<scope>runtime</scope>
+			<scope>test</scope>
 		</dependency>
 
 		<!-- tools -->
@@ -543,6 +467,12 @@
 		</dependency> -->
 		
 
+        <dependency>
+            <groupId>eu.stork</groupId>
+            <artifactId>SamlEngine</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
 
 		<!-- spring -->
 		<dependency>
diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index d5ae6225c..244ea1412 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -178,7 +178,7 @@
 			<artifactId>spring-orm</artifactId>
 		</dependency>
 		
-	  <dependency>
+ 	  <dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
 		</dependency>
@@ -203,12 +203,14 @@
     		<groupId>cglib</groupId>
     		<artifactId>cglib</artifactId>
     		<version>2.2.2</version>
+    		<scope>test</scope>
 		</dependency>
 		    
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
 			<version>1.4.178</version>
+			<scope>test</scope>
 		</dependency>
 		
 		<dependency>
diff --git a/id/server/modules/moa-id-module-openID/pom.xml b/id/server/modules/moa-id-module-openID/pom.xml
index 318ee8228..080d5ae0b 100644
--- a/id/server/modules/moa-id-module-openID/pom.xml
+++ b/id/server/modules/moa-id-module-openID/pom.xml
@@ -19,6 +19,12 @@
   
   	<dependencies>
 
+		<dependency>
+			<groupId>commons-codec</groupId>
+			<artifactId>commons-codec</artifactId>
+			<version>1.10</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
@@ -67,11 +73,11 @@
 			</exclusions>
 		</dependency>
 
-		<dependency>
+<!-- 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
 			<version>19.0</version>
-		</dependency>
+		</dependency> -->
 		
 				<!-- TestNG -->
 		<dependency>
diff --git a/id/server/modules/module-stork/pom.xml b/id/server/modules/module-stork/pom.xml
index 234c8d28a..b52c10391 100644
--- a/id/server/modules/module-stork/pom.xml
+++ b/id/server/modules/module-stork/pom.xml
@@ -21,6 +21,33 @@
 
 	<dependencies>
 
+		<dependency>
+			<groupId>eu.stork</groupId>
+			<artifactId>DocumentService</artifactId>
+			<version>0.0.1-SNAPSHOT</version>
+			<classifier>classes</classifier>
+			<exclusions>
+				<exclusion>
+					<artifactId>axis</artifactId>
+					<groupId>org.apache.axis</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>bcprov-jdk16</artifactId>
+					<groupId>org.bouncycastle</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jaxws-tools</artifactId>
+					<groupId>com.sun.xml.ws</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+
+        <dependency>
+            <groupId>eu.stork</groupId>
+            <artifactId>SamlEngine</artifactId>
+            <version>1.5.1</version>
+        </dependency>
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
diff --git a/id/server/modules/pom.xml b/id/server/modules/pom.xml
index db03326ea..c164252c7 100644
--- a/id/server/modules/pom.xml
+++ b/id/server/modules/pom.xml
@@ -40,6 +40,10 @@
 					<groupId>ch.qos.logback</groupId>
 					<artifactId>logback-classic</artifactId>
 				</exclusion>
+				<exclusion>
+					<artifactId>DocumentService</artifactId>
+					<groupId>eu.stork</groupId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
-- 
cgit v1.2.3