Merge branch 'snapshots'

[aquarium] / pom.xml

diff --git a/pom.xml b/pom.xml
index 3628cc8..fc3a906 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
   <!-- 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>
@@ -100,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 -->
@@ -151,21 +150,25 @@
       <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>
     </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
@@ -174,24 +177,6 @@
     </dependency>
 
     <dependency>
-      <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>
       <version>2.4</version>
@@ -314,13 +299,6 @@
       <artifactId>akka-slf4j</artifactId>
       <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>com.twitter</groupId>
@@ -352,26 +330,38 @@
       <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>
+    <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>
+
+    <dependency>
+      <groupId>org.apache.avro</groupId>
+      <artifactId>avro</artifactId>
+      <version>1.7.2</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.avro</groupId>
+      <artifactId>avro-ipc</artifactId>
+      <version>1.7.2</version>
+    </dependency>
   </dependencies>
 
   <!--Build configuration-->
@@ -401,19 +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.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>
@@ -429,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>
@@ -469,6 +462,7 @@
           </execution>
         </executions>
       </plugin>
+
       <!-- Release plug-in configuration -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -478,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>