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

diff --git a/pom.xml b/pom.xml
index b9f67aa..fc3a906 100644
--- a/pom.xml
+++ b/pom.xml
@@ -40,12 +40,12 @@
   <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>
   <description>
-    Accounting services for the Okeanos cloud
+    Charging services for the Okeanos cloud
   </description>
   <url>http://code.grnet.gr/projects/aquarium</url>
   <inceptionYear>2011</inceptionYear>
@@ -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>
@@ -95,8 +100,7 @@
   <properties>
     <scala.version>2.9.1</scala.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.reporting.outputEncoding>${project.build.sourceEncoding}
-    </project.reporting.outputEncoding>
+    <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
   </properties>
 
   <!-- Lib and plugin repositories -->
@@ -133,9 +137,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>
 
@@ -146,28 +150,32 @@
       <artifactId>scala-library</artifactId>
       <version>${scala.version}</version>
     </dependency>
+
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
       <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>
       <artifactId>junit</artifactId>
       <version>4.10</version>
       <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>
@@ -201,7 +209,7 @@
     <dependency>
       <groupId>com.rabbitmq</groupId>
       <artifactId>amqp-client</artifactId>
-      <version>2.5.0</version>
+      <version>2.8.4</version>
     </dependency>
 
     <dependency>
@@ -212,26 +220,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</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>converter_2.9.1</artifactId>
-      <version>0.3.0</version>
+      <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,175 +283,84 @@
     </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>
-      <groupId>se.scalablesolutions.akka</groupId>
-      <artifactId>akka-testkit</artifactId>
-      <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>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>
+      <version>12.0</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>
 
+    <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>com.github.scopt</groupId>
-      <artifactId>scopt_${scala.version}</artifactId>
-      <version>2.0.1</version>
+      <groupId>org.quartz-scheduler</groupId>
+      <artifactId>quartz-jboss</artifactId>
+      <version>2.1.5</version>
     </dependency>
 
     <dependency>
-      <groupId>joda-time</groupId>
-      <artifactId>joda-time</artifactId>
-      <version>2.0</version>
+      <groupId>org.apache.avro</groupId>
+      <artifactId>avro</artifactId>
+      <version>1.7.2</version>
     </dependency>
 
     <dependency>
-      <groupId>org.joda</groupId>
-      <artifactId>joda-convert</artifactId>
-      <version>1.1</version>
+      <groupId>org.apache.avro</groupId>
+      <artifactId>avro-ipc</artifactId>
+      <version>1.7.2</version>
     </dependency>
   </dependencies>
 
@@ -426,6 +371,9 @@
     <resources>
       <resource>
         <directory>${basedir}/src/main/resources</directory>
+        <excludes>
+          <exclude>aquarium.properties</exclude>
+        </excludes>
       </resource>
       <resource>
         <directory>${project.build.directory}/generated-resources</directory>
@@ -443,17 +391,36 @@
     </testResources>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.5.1</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+          <encoding>${project.build.sourceEncoding}</encoding>
+        </configuration>
+      </plugin>
+
+      <plugin>
         <groupId>net.alchim31.maven</groupId>
         <artifactId>scala-maven-plugin</artifactId>
-        <version>3.0.1</version>
+        <version>3.1.0</version>
         <configuration>
+          <recompileMode>incremental</recompileMode>
+          <javacArgs>
+            <!--<javacArg>-Xlint:unchecked</javacArg>-->
+            <javacArg>-Xlint:deprecation</javacArg>
+          </javacArgs>
+
           <charset>${project.build.sourceEncoding}</charset>
+
           <jvmArgs>
             <jvmArg>-Xmx1024m</jvmArg>
             <jvmArg>
               -DpackageLinkDefs=file://${project.build.directory}/packageLinkDefs.properties
             </jvmArg>
           </jvmArgs>
+
           <args>
             <arg>-deprecation</arg>
             <arg>-unchecked</arg>
@@ -469,37 +436,23 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Redmine maven plugin -->
-      <plugin>
-        <groupId>org.nuiton.jredmine</groupId>
-        <artifactId>maven-jredmine-plugin</artifactId>
-        <version>1.2.2</version>
-      </plugin>
-      <!-- Produces configuration files for Intellij Idea -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-idea-plugin</artifactId>
-        <version>2.2</version>
-        <configuration>
-          <downloadSources>true</downloadSources>
-          <downloadJavadocs>true</downloadJavadocs>
-        </configuration>
-      </plugin>
+
       <!-- Make sure tests display failures at the console-->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.9</version>
+        <version>2.12.3</version>
         <configuration>
           <useFile>false</useFile>
           <reportFormat>plain</reportFormat>
         </configuration>
       </plugin>
+
       <!-- Bundle up source code on release/snapshot -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>2.1.2</version>
+        <version>2.2</version>
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -509,6 +462,7 @@
           </execution>
         </executions>
       </plugin>
+
       <!-- Release plug-in configuration -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -518,6 +472,34 @@
           <preparationGoals>clean verify</preparationGoals>
         </configuration>
       </plugin>
+
+      <plugin>
+        <groupId>org.apache.avro</groupId>
+        <artifactId>avro-maven-plugin</artifactId>
+        <version>1.7.2</version>
+        <executions>
+          <execution>
+            <id>schemas</id>
+            <phase>generate-sources</phase>
+            <goals>
+              <goal>schema</goal>
+              <goal>protocol</goal>
+              <goal>idl-protocol</goal>
+            </goals>
+            <configuration>
+              <excludes>
+                <exclude>**/mapred/tether/**</exclude>
+              </excludes>
+              <stringType>String</stringType>
+              <sourceDirectory>${project.basedir}/src/main/avro/</sourceDirectory>
+              <outputDirectory>${project.basedir}/src/main/java/</outputDirectory>
+              <!--<outputDirectory>${project.build.directory}/generated-sources/java</outputDirectory>-->
+              <testSourceDirectory>${project.basedir}/src/test/avro/</testSourceDirectory>
+              <testOutputDirectory>${project.basedir}/src/test/java/</testOutputDirectory>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>