X-Git-Url: https://code.grnet.gr/git/aquarium/blobdiff_plain/a4c33269dab90c8d34a028edbd88a4ced8f38b12..3bf7c95c9d80a1dded25d7634f7b471e573c32e8:/pom.xml

diff --git a/pom.xml b/pom.xml
index 26fbd36..86335ba 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.1</version>
+  <version>0.2-SNAPSHOT</version>
 
   <!-- Project details-->
   <name>Aquarium</name>
@@ -101,17 +101,6 @@
 
   <!-- Lib and plugin repositories -->
   <repositories>
-    <repository>
-      <id>scala-tools.releases</id>
-      <name>Scala-Tools Dependencies Repository for Releases</name>
-      <url>http://scala-tools.org/repo-releases</url>
-    </repository>
-    
-    <repository>
-      <id>scala-tools.snapshots</id>
-      <name>Scala-Tools Dependencies Repository for Snapshots</name>
-      <url>http://scala-tools.org/repo-snapshots</url>
-    </repository>
 
     <repository>
       <id>java.net.maven2</id>
@@ -126,6 +115,12 @@
     </repository>
 
     <repository>
+      <name>JBoss Scala-Tools</name>
+      <id>jboss-scala-tools</id>
+      <url>https://repository.jboss.org/nexus/content/repositories/scala-tools-releases</url>
+    </repository>
+
+    <repository>
       <name>jcrontab</name>
       <id>jcrontab</id>
       <url>http://kenai.com/projects/crontab-parser/sources/maven-repo/content/</url>
@@ -136,15 +131,13 @@
       <id>typesafe</id>
       <url>http://repo.typesafe.com/typesafe/releases/</url>
     </repository>
-  </repositories>
 
-  <pluginRepositories>
-    <pluginRepository>
-      <id>scala-tools.releases</id>
-      <name>Scala-Tools Plugins Repository for Releases</name>
-      <url>http://scala-tools.org/repo-releases</url>
-    </pluginRepository>
-  </pluginRepositories>
+    <repository>
+      <name>Spray</name>
+      <id>spray</id>
+      <url>http://repo.spray.cc/</url>
+    </repository>
+  </repositories>
 
   <!-- Master properties (inherited by modules) -->
   <dependencies>
@@ -159,6 +152,11 @@
       <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>
@@ -171,20 +169,21 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-log4j12</artifactId>
-      <version>1.6.3</version>
-    </dependency>
-    <dependency>
       <groupId>net.liftweb</groupId>
       <artifactId>lift-json_2.9.1</artifactId>
-      <version>2.4-M5</version>
+      <version>2.4</version>
     </dependency>
 
     <dependency>
       <groupId>net.liftweb</groupId>
       <artifactId>lift-json-ext_2.9.1</artifactId>
-      <version>2.4-M5</version>
+      <version>2.4</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>joda-time</artifactId>
+          <groupId>joda-time</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -207,8 +206,32 @@
 
     <dependency>
       <groupId>com.ckkloverdos</groupId>
-      <artifactId>streamresource_2.9.1</artifactId>
-      <version>0.2.0</version>
+      <artifactId>jbootstrap</artifactId>
+      <version>3.0.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.ckkloverdos</groupId>
+      <artifactId>streamresource</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.ckkloverdos</groupId>
+      <artifactId>maybe</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.ckkloverdos</groupId>
+      <artifactId>converter</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.ckkloverdos</groupId>
+      <artifactId>sysprop</artifactId>
+      <version>0.5.0-SNAPSHOT</version>
     </dependency>
 
     <dependency>
@@ -226,44 +249,48 @@
     <dependency>
       <groupId>se.scalablesolutions.akka</groupId>
       <artifactId>akka-actor</artifactId>
-      <version>1.3-RC5</version>
+      <version>1.3.1</version>
     </dependency>
 
     <dependency>
       <groupId>se.scalablesolutions.akka</groupId>
       <artifactId>akka-remote</artifactId>
-      <version>1.3-RC5</version>
+      <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>
     </dependency>
 
     <dependency>
       <groupId>se.scalablesolutions.akka</groupId>
       <artifactId>akka-amqp</artifactId>
-      <version>1.3-RC5</version>
+      <version>1.3.1</version>
     </dependency>
 
     <dependency>
       <groupId>se.scalablesolutions.akka</groupId>
       <artifactId>akka-slf4j</artifactId>
-      <version>1.3-RC5</version>
+      <version>1.3.1</version>
     </dependency>
 <!--
     <dependency>
       <groupId>se.scalablesolutions.akka</groupId>
       <artifactId>akka-testkit</artifactId>
-      <version>1.3-RC5</version>
+      <version>1.3</version>
       <scope>test</scope>
     </dependency>-->
 
     <dependency>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>jsr311-api</artifactId>
-      <version>1.1.1</version>
-    </dependency>
-
-    <dependency>
-      <groupId>gr.grnet.spray</groupId>
+      <groupId>cc.spray</groupId>
       <artifactId>spray-can</artifactId>
-      <version>0.9.2</version>
+      <version>0.9.3</version>
     </dependency>
 
     <!--    <dependency>
@@ -279,6 +306,12 @@
     </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>
@@ -364,7 +397,19 @@
     <dependency>
       <groupId>com.github.scopt</groupId>
       <artifactId>scopt_${scala.version}</artifactId>
-      <version>1.1.2</version>
+      <version>2.0.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>2.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.joda</groupId>
+      <artifactId>joda-convert</artifactId>
+      <version>1.1</version>
     </dependency>
   </dependencies>
 
@@ -392,9 +437,9 @@
     </testResources>
     <plugins>
       <plugin>
-        <groupId>org.scala-tools</groupId>
-        <artifactId>maven-scala-plugin</artifactId>
-        <version>2.15.2</version>
+        <groupId>net.alchim31.maven</groupId>
+        <artifactId>scala-maven-plugin</artifactId>
+        <version>3.0.1</version>
         <configuration>
           <charset>${project.build.sourceEncoding}</charset>
           <jvmArgs>
@@ -405,6 +450,8 @@
           </jvmArgs>
           <args>
             <arg>-deprecation</arg>
+            <arg>-unchecked</arg>
+            <arg>-explaintypes</arg>
           </args>
         </configuration>
         <executions>
@@ -465,31 +512,6 @@
           <preparationGoals>clean verify</preparationGoals>
         </configuration>
       </plugin>
-      <!--Build an executable jar with all dependencies-->
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2.2</version>
-        <configuration>
-          <archive>
-            <manifest>
-              <mainClass>gr.grnet.aquarium.Main</mainClass>
-            </manifest>
-          </archive>
-          <descriptorRefs>
-            <descriptorRef>jar-with-dependencies</descriptorRef>
-          </descriptorRefs>
-        </configuration>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
     </plugins>
   </build>
 </project>