X-Git-Url: https://code.grnet.gr/git/aquarium/blobdiff_plain/5459302ffb17ead6479e3209a832d53a9e9bea04..bacab01c4b4698b90244c5bd49abd476e79701d1:/pom.xml

diff --git a/pom.xml b/pom.xml
index 3424511..d02b3d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,19 +34,18 @@
   ~ or implied, of GRNET S.A.
   -->
 
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>gr.grnet</groupId>
   <artifactId>aquarium</artifactId>
-  <version>0.0.2-SNAPSHOT</version>
+  <version>0.2-SNAPSHOT</version>
 
   <!-- Project details-->
   <name>Aquarium</name>
   <description>
-    Account handling, sharing and charging services for the Okeanos cloud
+    Accounting services for the Okeanos cloud
   </description>
   <url>http://code.grnet.gr/projects/aquarium</url>
   <inceptionYear>2011</inceptionYear>
@@ -102,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>
@@ -127,19 +115,29 @@
     </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>
     </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>Typesafe</name>
+      <id>typesafe</id>
+      <url>http://repo.typesafe.com/typesafe/releases/</url>
+    </repository>
+
+    <repository>
+      <name>Spray</name>
+      <id>spray</id>
+      <url>http://repo.spray.cc/</url>
+    </repository>
+  </repositories>
 
   <!-- Master properties (inherited by modules) -->
   <dependencies>
@@ -154,10 +152,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>
@@ -166,20 +168,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>
@@ -197,13 +200,65 @@
     <dependency>
       <groupId>com.rabbitmq</groupId>
       <artifactId>amqp-client</artifactId>
-      <version>2.5.0</version>
+      <version>2.7.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.ckkloverdos</groupId>
+      <artifactId>jbootstrap</artifactId>
+      <version>3.0.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.ckkloverdos</groupId>
+      <artifactId>streamresource</artifactId>
+      <version>0.5.1</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.ckkloverdos</groupId>
+      <artifactId>maybe</artifactId>
+      <version>0.5.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.ckkloverdos</groupId>
+      <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>streamresource_2.9.1</artifactId>
-      <version>0.2.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>
@@ -221,139 +276,80 @@
     <dependency>
       <groupId>se.scalablesolutions.akka</groupId>
       <artifactId>akka-actor</artifactId>
-      <version>1.3-RC4</version>
+      <version>1.3.1</version>
+      <exclusions>
+        <exclusion>
+          <artifactId>scala-library</artifactId>
+          <groupId>org.scala-lang</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
       <groupId>se.scalablesolutions.akka</groupId>
       <artifactId>akka-remote</artifactId>
-      <version>1.3-RC4</version>
-    </dependency>
-
-    <dependency>
-      <groupId>se.scalablesolutions.akka</groupId>
-      <artifactId>akka-amqp</artifactId>
-      <version>1.3-RC4</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>
+        <exclusion>
+          <artifactId>h2-lzf</artifactId>
+          <groupId>voldemort.store.compress</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>akka-typed-actor</artifactId>
+          <groupId>se.scalablesolutions.akka</groupId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
       <groupId>se.scalablesolutions.akka</groupId>
       <artifactId>akka-slf4j</artifactId>
-      <version>1.3-RC4</version>
+      <version>1.3.1</version>
     </dependency>
-
+<!--
     <dependency>
       <groupId>se.scalablesolutions.akka</groupId>
       <artifactId>akka-testkit</artifactId>
-      <version>1.3-RC4</version>
+      <version>1.3</version>
       <scope>test</scope>
-    </dependency>
+    </dependency>-->
 
     <dependency>
-      <groupId>javax.ws.rs</groupId>
-      <artifactId>jsr311-api</artifactId>
-      <version>1.1.1</version>
+      <groupId>cc.spray</groupId>
+      <artifactId>spray-can</artifactId>
+      <version>0.9.3</version>
     </dependency>
 
     <dependency>
-      <groupId>cc.spray.can</groupId>
-      <artifactId>spray-can</artifactId>
-      <version>0.9.2-SNAPSHOT</version>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>12.0</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>
+      <groupId>com.github.scopt</groupId>
+      <artifactId>scopt_${scala.version}</artifactId>
+      <version>2.0.1</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>
+      <groupId>joda-time</groupId>
+      <artifactId>joda-time</artifactId>
+      <version>2.0</version>
+    </dependency>
 
-        <exclusion>
-          <groupId>javax.servlet</groupId>
-          <artifactId>servlet-api</artifactId>
-        </exclusion>
-      </exclusions>
+    <dependency>
+      <groupId>org.joda</groupId>
+      <artifactId>joda-convert</artifactId>
+      <version>1.1</version>
     </dependency>
   </dependencies>
 
@@ -364,6 +360,9 @@
     <resources>
       <resource>
         <directory>${basedir}/src/main/resources</directory>
+        <excludes>
+          <exclude>aquarium.properties</exclude>
+        </excludes>
       </resource>
       <resource>
         <directory>${project.build.directory}/generated-resources</directory>
@@ -381,9 +380,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>
@@ -394,6 +393,8 @@
           </jvmArgs>
           <args>
             <arg>-deprecation</arg>
+            <arg>-unchecked</arg>
+            <arg>-explaintypes</arg>
           </args>
         </configuration>
         <executions>
@@ -454,31 +455,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>