X-Git-Url: https://code.grnet.gr/git/aquarium/blobdiff_plain/3bbab5921b0485b0d45d00a0ec9afc7ff536ed94..5156c447277f472fae4a2b4fade910cb55142527:/pom.xml

diff --git a/pom.xml b/pom.xml
index b9f67aa..f2cc62c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,7 +40,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>gr.grnet</groupId>
   <artifactId>aquarium</artifactId>
-  <version>0.2-SNAPSHOT</version>
+  <version>0.2.0-SNAPSHOT</version>
 
   <!-- Project details-->
   <name>Aquarium</name>
@@ -65,6 +65,11 @@
       <name>Christos KK Loverdos</name>
       <email>loverdos@grnet.gr</email>
     </developer>
+    <developer>
+      <id>pgerakios</id>
+      <name>Prodromos Gerakios</name>
+      <email>pgerakios@grnet.gr</email>
+    </developer>
   </developers>
 
   <scm>
@@ -133,9 +138,9 @@
     </repository>
 
     <repository>
-      <name>Spray</name>
-      <id>spray</id>
-      <url>http://repo.spray.cc/</url>
+      <name>Twitter</name>
+      <id>twitter</id>
+      <url>http://maven.twttr.com/</url>
     </repository>
   </repositories>
 
@@ -152,10 +157,14 @@
       <version>1.6.1</version>
     </dependency>
     <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.29</version>
+    </dependency>
+    <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>scala-compiler</artifactId>
       <version>${scala.version}</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -163,11 +172,25 @@
       <version>4.10</version>
       <scope>test</scope>
     </dependency>
+
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.3</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>2.0.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.0.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-scala</artifactId>
+      <version>2.0.2</version>
     </dependency>
+
     <dependency>
       <groupId>net.liftweb</groupId>
       <artifactId>lift-json_2.9.1</artifactId>
@@ -201,7 +224,7 @@
     <dependency>
       <groupId>com.rabbitmq</groupId>
       <artifactId>amqp-client</artifactId>
-      <version>2.5.0</version>
+      <version>2.8.4</version>
     </dependency>
 
     <dependency>
@@ -212,26 +235,54 @@
 
     <dependency>
       <groupId>com.ckkloverdos</groupId>
-      <artifactId>streamresource_2.9.1</artifactId>
-      <version>0.2.0</version>
+      <artifactId>streamresource</artifactId>
+      <version>0.5.1</version>
     </dependency>
 
     <dependency>
       <groupId>com.ckkloverdos</groupId>
-      <artifactId>maybe_2.9.1</artifactId>
-      <version>0.3.0</version>
+      <artifactId>maybe</artifactId>
+      <version>0.5.0</version>
     </dependency>
 
     <dependency>
       <groupId>com.ckkloverdos</groupId>
-      <artifactId>converter_2.9.1</artifactId>
-      <version>0.3.0</version>
+      <artifactId>converter</artifactId>
+      <version>0.5.0</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>scala-library</artifactId>
+          <groupId>org.scala-lang</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>logback-classic</artifactId>
+          <groupId>ch.qos.logback</groupId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>com.ckkloverdos</groupId>
+      <artifactId>sysprop</artifactId>
+      <version>0.5.1</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>scala-library</artifactId>
+          <groupId>org.scala-lang</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
       <groupId>com.ckkloverdos</groupId>
-      <artifactId>sysprop_2.9.1</artifactId>
-      <version>0.1.0</version>
+      <artifactId>typedkey</artifactId>
+      <version>0.5.0</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>scala-library</artifactId>
+          <groupId>org.scala-lang</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -247,37 +298,21 @@
     </dependency>
 
     <dependency>
-      <groupId>se.scalablesolutions.akka</groupId>
+      <groupId>com.typesafe.akka</groupId>
       <artifactId>akka-actor</artifactId>
-      <version>1.3.1</version>
+      <version>2.0.2</version>
     </dependency>
 
     <dependency>
-      <groupId>se.scalablesolutions.akka</groupId>
+      <groupId>com.typesafe.akka</groupId>
       <artifactId>akka-remote</artifactId>
-      <version>1.3.1</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>sjson_2.9.0</artifactId>
-          <groupId>net.debasishg</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>akka-stm</artifactId>
-          <groupId>se.scalablesolutions.akka</groupId>
-        </exclusion>
-      </exclusions>
+      <version>2.0.2</version>
     </dependency>
 
     <dependency>
-      <groupId>se.scalablesolutions.akka</groupId>
-      <artifactId>akka-amqp</artifactId>
-      <version>1.3.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>se.scalablesolutions.akka</groupId>
+      <groupId>com.typesafe.akka</groupId>
       <artifactId>akka-slf4j</artifactId>
-      <version>1.3.1</version>
+      <version>2.0.2</version>
     </dependency>
 <!--
     <dependency>
@@ -287,123 +322,22 @@
       <scope>test</scope>
     </dependency>-->
 
-    <!--<dependency>-->
-      <!--<groupId>javax.ws.rs</groupId>-->
-      <!--<artifactId>jsr311-api</artifactId>-->
-      <!--<version>1.1.1</version>-->
-    <!--</dependency>-->
-
     <dependency>
-      <groupId>cc.spray</groupId>
-      <artifactId>spray-can</artifactId>
-      <version>0.9.3</version>
+      <groupId>com.twitter</groupId>
+      <artifactId>finagle-core_2.9.1</artifactId>
+      <version>4.0.2</version>
     </dependency>
 
-    <!--    <dependency>
-      <groupId>com.yammer.metrics</groupId>
-      <artifactId>metrics-core</artifactId>
-      <version>2.0.0-BETA18-SNAPSHOT</version>
-    </dependency>-->
-<!--
     <dependency>
-      <groupId>org.apache.lucene</groupId>
-      <artifactId>lucene-core</artifactId>
-      <version>3.5.0</version>
-    </dependency>-->
+      <groupId>com.twitter</groupId>
+      <artifactId>finagle-http_2.9.1</artifactId>
+      <version>4.0.2</version>
+    </dependency>
 
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>11.0.2</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.solr</groupId>
-      <artifactId>solr-core</artifactId>
-      <version>3.5.0</version>
-      <exclusions>
-
-        <exclusion>
-          <groupId>org.apache.lucene</groupId>
-          <artifactId>lucene-analyzers</artifactId>
-        </exclusion>
-
-        <exclusion>
-          <groupId>org.apache.lucene</groupId>
-          <artifactId>lucene-highlighter</artifactId>
-        </exclusion>
-
-        <exclusion>
-          <groupId>org.apache.lucene</groupId>
-          <artifactId>lucene-memory</artifactId>
-        </exclusion>
-
-        <exclusion>
-          <groupId>org.apache.lucene</groupId>
-          <artifactId>lucene-misc</artifactId>
-        </exclusion>
-
-        <exclusion>
-          <groupId>org.apache.lucene</groupId>
-          <artifactId>lucene-queries</artifactId>
-        </exclusion>
-
-        <exclusion>
-          <groupId>org.apache.lucene</groupId>
-          <artifactId>lucene-spatial</artifactId>
-        </exclusion>
-
-        <exclusion>
-          <groupId>org.apache.lucene</groupId>
-          <artifactId>lucene-spellchecker</artifactId>
-        </exclusion>
-
-        <exclusion>
-          <groupId>org.apache.lucene</groupId>
-          <artifactId>lucene-grouping</artifactId>
-        </exclusion>
-
-        <exclusion>
-          <groupId>org.apache.solr</groupId>
-          <artifactId>solr-commons-csv</artifactId>
-        </exclusion>
-
-        <exclusion>
-          <groupId>org.apache.solr</groupId>
-          <artifactId>solr-noggit</artifactId>
-        </exclusion>
-
-        <exclusion>
-          <groupId>org.apache.solr</groupId>
-          <artifactId>solr-solrj</artifactId>
-        </exclusion>
-
-        <exclusion>
-          <groupId>commons-fileupload</groupId>
-          <artifactId>commons-fileupload</artifactId>
-        </exclusion>
-
-        <exclusion>
-          <groupId>commons-httpclient</groupId>
-          <artifactId>commons-httpclient</artifactId>
-        </exclusion>
-
-        <exclusion>
-          <groupId>org.slf4j</groupId>
-          <artifactId>jcl-over-slf4j</artifactId>
-        </exclusion>
-
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-
-    <dependency>
-      <groupId>com.github.scopt</groupId>
-      <artifactId>scopt_${scala.version}</artifactId>
-      <version>2.0.1</version>
+      <version>12.0</version>
     </dependency>
 
     <dependency>
@@ -417,6 +351,27 @@
       <artifactId>joda-convert</artifactId>
       <version>1.1</version>
     </dependency>
+
+      <dependency> <!-- quartz stuff  -->
+          <groupId>org.quartz-scheduler</groupId>
+          <artifactId>quartz</artifactId>
+          <version>2.1.5</version>
+      </dependency>
+      <dependency>
+          <groupId>org.quartz-scheduler</groupId>
+          <artifactId>quartz-oracle</artifactId>
+          <version>2.1.5</version>
+      </dependency>
+      <dependency>
+          <groupId>org.quartz-scheduler</groupId>
+          <artifactId>quartz-weblogic</artifactId>
+          <version>2.1.5</version>
+      </dependency>
+      <dependency>
+          <groupId>org.quartz-scheduler</groupId>
+          <artifactId>quartz-jboss</artifactId>
+          <version>2.1.5</version>
+      </dependency>
   </dependencies>
 
   <!--Build configuration-->
@@ -426,6 +381,9 @@
     <resources>
       <resource>
         <directory>${basedir}/src/main/resources</directory>
+        <excludes>
+          <exclude>aquarium.properties</exclude>
+        </excludes>
       </resource>
       <resource>
         <directory>${project.build.directory}/generated-resources</directory>