Merge branch 'elasticFixNativeTypes' of github.com:pfcoperez/crossdat…

…a into elasticFixNativeTypes
Stratio · Aug 30, 2016 · fc44690 · fc44690
2 parents 980f841 + c927be6
commit fc44690
Show file tree

Hide file tree

Showing 33 changed files with 337 additions and 999 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ Only listing significant user-visible, not internal code cleanups and minor bug
 ## 1.6.0 (upcoming)
 
 * Elasticsearch: support import tables without specifying a particular resource
+* Major Akka version upgrade to 2.4 (2.4.9), thus enabling putting the server behind HAProxy. 
 
 ## 1.5.0 (August 2016)
 

diff --git a/common/pom.xml b/common/pom.xml
@@ -45,7 +45,17 @@
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-contrib_${scala.binary.version}</artifactId>
+            <artifactId>akka-actor_${scala.binary.version}</artifactId>
+            <version>${akka.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.typesafe.akka</groupId>
+            <artifactId>akka-cluster_${scala.binary.version}</artifactId>
+            <version>${akka.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.typesafe.akka</groupId>
+            <artifactId>akka-cluster-tools_${scala.binary.version}</artifactId>
             <version>${akka.version}</version>
         </dependency>
         <dependency>

diff --git a/driver/pom.xml b/driver/pom.xml
@@ -38,14 +38,19 @@
             <artifactId>crossdata-common_${scala.binary.version}</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.typesafe.akka</groupId>
+            <artifactId>akka-actor_${scala.binary.version}</artifactId>
+            <version>${akka.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-cluster_${scala.binary.version}</artifactId>
             <version>${akka.version}</version>
         </dependency>
         <dependency>
             <groupId>com.typesafe.akka</groupId>
-            <artifactId>akka-contrib_${scala.binary.version}</artifactId>
+            <artifactId>akka-cluster-tools_${scala.binary.version}</artifactId>
             <version>${akka.version}</version>
         </dependency>
         <dependency>
@@ -56,7 +61,7 @@
         <dependency>
             <groupId>com.typesafe.akka</groupId>
             <artifactId>akka-http-experimental_${scala.binary.version}</artifactId>
-            <version>2.0.3</version>
+            <version>${akka.version}</version>
         </dependency>
         <dependency>
             <groupId>jline</groupId>