From a6a867eff88bfe5db4552b825e961fec81ac5134 Mon Sep 17 00:00:00 2001
From: Martin Hug <martin.hug@rwth-aachen.de>
Date: Wed, 5 Oct 2016 14:22:05 +0200
Subject: [PATCH] Rolling back service dependencies

---
 .classpath                               | 22 +++++++++++-----------
 etc/ant_configuration/service.properties |  2 +-
 etc/ivy/ivy.xml                          | 18 +++++++++---------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/.classpath b/.classpath
index b277e3e..db0444e 100644
--- a/.classpath
+++ b/.classpath
@@ -5,18 +5,18 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="lib/activation-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/annotations-2.0.1.jar"/>
-	<classpathentry kind="lib" path="service/commons-dbcp2-2.0.jar"/>
-	<classpathentry kind="lib" path="service/commons-io-2.4.jar"/>
+	<classpathentry kind="lib" path="lib/commons-dbcp2-2.0.jar"/>
+	<classpathentry kind="lib" path="lib/commons-io-2.4.jar"/>
 	<classpathentry kind="lib" path="lib/commons-codec-1.10.jar"/>
 	<classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
-	<classpathentry kind="lib" path="service/commons-logging-1.2.jar"/>
-	<classpathentry kind="lib" path="service/commons-pool2-2.2.jar"/>
+	<classpathentry kind="lib" path="lib/commons-logging-1.2.jar"/>
+	<classpathentry kind="lib" path="lib/commons-pool2-2.2.jar"/>
 	<classpathentry kind="lib" path="lib/FreePastry-2.1.1.jar"/>
-	<classpathentry kind="lib" path="service/gson-2.3.jar"/>
+	<classpathentry kind="lib" path="lib/gson-2.3.jar"/>
 	<classpathentry kind="lib" path="lib/guava-18.0.jar"/>
 	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
-	<classpathentry kind="lib" path="service/httpclient-4.5.1.jar"/>
-	<classpathentry kind="lib" path="service/httpcore-4.4.3.jar"/>
+	<classpathentry kind="lib" path="lib/httpclient-4.5.1.jar"/>
+	<classpathentry kind="lib" path="lib/httpcore-4.4.3.jar"/>
 	<classpathentry kind="lib" path="lib/i5-simpleXML-0.2.jar"/>
 	<classpathentry kind="lib" path="lib/jackson-annotations-2.4.5.jar"/>
 	<classpathentry kind="lib" path="lib/jackson-core-2.4.5.jar"/>
@@ -30,9 +30,9 @@
 	<classpathentry kind="lib" path="lib/javassist-3.18.2-GA.jar"/>
 	<classpathentry kind="lib" path="lib/jcip-annotations-1.0.jar"/>
 	<classpathentry kind="lib" path="lib/joda-time-2.2.jar"/>
-	<classpathentry kind="lib" path="service/jooq-3.8.2.jar"/>
-	<classpathentry kind="lib" path="service/jooq-codegen-3.8.2.jar"/>
-	<classpathentry kind="lib" path="service/jooq-meta-3.8.2.jar"/>
+	<classpathentry kind="lib" path="lib/jooq-3.8.2.jar"/>
+	<classpathentry kind="lib" path="lib/jooq-codegen-3.8.2.jar"/>
+	<classpathentry kind="lib" path="lib/jooq-meta-3.8.2.jar"/>
 	<classpathentry kind="lib" path="lib/json-smart-1.3.1.jar"/>
 	<classpathentry kind="lib" path="lib/jsr311-api-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
@@ -41,7 +41,7 @@
 	<classpathentry kind="lib" path="lib/las2peer-rest-mapper-0.5.7.jar"/>
 	<classpathentry kind="lib" path="lib/las2peer-web-connector-0.5.7.jar"/>
 	<classpathentry kind="lib" path="lib/mail-1.4.7.jar"/>
-	<classpathentry kind="lib" path="service/mysql-connector-java-5.1.6.jar"/>
+	<classpathentry kind="lib" path="lib/mysql-connector-java-5.1.6.jar"/>
 	<classpathentry kind="lib" path="lib/nimbus-jose-jwt-4.0.jar"/>
 	<classpathentry kind="lib" path="lib/oauth2-oidc-sdk-4.17.jar"/>
 	<classpathentry kind="lib" path="lib/reflections-0.9.10.jar"/>
diff --git a/etc/ant_configuration/service.properties b/etc/ant_configuration/service.properties
index 5bb343b..0ad55a4 100644
--- a/etc/ant_configuration/service.properties
+++ b/etc/ant_configuration/service.properties
@@ -3,4 +3,4 @@ service.name=de.rwth.dbis.acis.activitytracker.service
 service.path=de/rwth/dbis/acis/activitytracker/service
 service.class=ActivityTrackerService
 service.passphrase=Passphrase
-service.dependencies=commons-codec;version="1.9", commons-dbcp2;version="2.0", commons-io;version="2.4", commons-logging;version="1.2", commons-pool2;version="2.2", gson;version="2.3", httpclient;version="4.5.1", httpcore;version="4.4.3", jooq;version="3.8.2", jooq-codegen;version="3.8.2", jooq-meta;version="3.8.2", mysql-connector-java;version="5.1.6"
+service.dependencies=
\ No newline at end of file
diff --git a/etc/ivy/ivy.xml b/etc/ivy/ivy.xml
index 7ffc8ad..1acadcc 100644
--- a/etc/ivy/ivy.xml
+++ b/etc/ivy/ivy.xml
@@ -14,14 +14,14 @@
         <dependency org="i5" name="las2peer-web-connector" rev="0.5.7" changing="true" conf="platform->*"/>
         <dependency org="junit" name="junit" rev="4.12" conf="platform->*"/>
         <!-- service dependencies -->
-        <dependency org="mysql" name="mysql-connector-java" rev="5.1.6" conf="bundle->default"/>
-        <dependency org="org.apache.commons" name="commons-pool2" rev="2.2" conf="bundle->default"/>
-        <dependency org="org.apache.commons" name="commons-dbcp2" rev="2.0" conf="bundle->default"/>
-        <dependency org="org.jooq" name="jooq" rev="3.8.2" conf="bundle->default"/>
-        <dependency org="org.jooq" name="jooq-codegen" rev="3.8.2" conf="bundle->default"/>
-        <dependency org="org.jooq" name="jooq-meta" rev="3.8.2" conf="bundle->default"/>
-        <dependency org="com.google.code.gson" name="gson" rev="2.3" conf="bundle->default"/>
-        <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.1" conf="bundle->default"/>
-        <dependency org="commons-io" name="commons-io" rev="2.4" conf="bundle->default"/>
+        <dependency org="mysql" name="mysql-connector-java" rev="5.1.6" conf="platform->*"/>
+        <dependency org="org.apache.commons" name="commons-pool2" rev="2.2" conf="platform->*"/>
+        <dependency org="org.apache.commons" name="commons-dbcp2" rev="2.0" conf="platform->*"/>
+        <dependency org="org.jooq" name="jooq" rev="3.8.2" conf="platform->*"/>
+        <dependency org="org.jooq" name="jooq-codegen" rev="3.8.2" conf="platform->*"/>
+        <dependency org="org.jooq" name="jooq-meta" rev="3.8.2" conf="platform->*"/>
+        <dependency org="com.google.code.gson" name="gson" rev="2.3" conf="platform->*"/>
+        <dependency org="org.apache.httpcomponents" name="httpclient" rev="4.5.1" conf="platform->*"/>
+        <dependency org="commons-io" name="commons-io" rev="2.4" conf="platform->*"/>
     </dependencies>
 </ivy-module>