Updated version to last docker image (#89)

Stratio · Dec 15, 2016 · 49e3ea9 · 49e3ea9
1 parent e6d18e6
commit 49e3ea9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 22 deletions.
diff --git a/.jenkins.yml b/.jenkins.yml
@@ -1,5 +1,5 @@
 ITSERVICES:
   - RABBITMQ:
-      image: rabbitmq:3.6.1-management 
+      image: rabbitmq:3-management
 ITPARAMETERS: >
       -Drabbitmq.hosts=%%RABBITMQ
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,9 @@
 # Changelog
 
-## 0.4.0 (December 2016)
+## 0.4.0
 
 * Upgrade scala version to 2.11.8
+* Upgrade to rabbitMQ library version 3.6.6
 * Removed Array[Byte] in createStream API
 * The library now run with Delivery message of RabbitMQ
 * Added tests with Delivery message option

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -10,15 +10,15 @@ hose {
 
     ITSERVICES = [
         ['RABBITMQ': [
-           'image': 'rabbitmq:3.6.1-management'           
+           'image': 'rabbitmq:3-management'
         ]],      
       ]
 
     ITPARAMETERS = "-Drabbitmq.hosts=%%RABBITMQ"
 
     DEV = { config ->
             doCompile(config)
-            //doIT(config)
+            doIT(config)
             doPackage(config)
 
             parallel(QC: {

diff --git a/pom.xml b/pom.xml
@@ -82,7 +82,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <scala.version>2.11.8</scala.version>
         <scala.binary.version>2.11</scala.binary.version>
-        <rabbitmq.version>3.6.1</rabbitmq.version>
+        <rabbitmq.version>3.6.6</rabbitmq.version>
         <joda.version>2.8.2</joda.version>
         <scalatest.version>2.2.2</scalatest.version>
         <junit.version>4.8.1</junit.version>

diff --git a/src/test/scala/org/apache/spark/streaming/rabbitmq/RabbitMQSuite.scala b/src/test/scala/org/apache/spark/streaming/rabbitmq/RabbitMQSuite.scala
@@ -16,23 +16,12 @@
 package org.apache.spark.streaming.rabbitmq
 
 import org.apache.spark.Logging
-import org.scalatest.concurrent.Timeouts
-import org.scalatest.{FunSuite, Outcome}
+import org.scalatest.FunSuite
+import org.scalatest.concurrent.{TimeLimitedTests, Timeouts}
+import org.scalatest.time.SpanSugar._
 
-private[rabbitmq] trait RabbitMQSuite extends FunSuite with Timeouts with Logging {
+private[rabbitmq] trait RabbitMQSuite extends FunSuite with Timeouts with Logging with TimeLimitedTests {
+
+  val timeLimit = 1 minutes
 
-  /**
-   * Log the suite name and the test name before and after each test.
-   */
-  final protected override def withFixture(test: NoArgTest): Outcome = {
-    val testName = test.text
-    val suiteName = this.getClass.getName
-    val shortSuiteName = suiteName.replaceAll("org.apache.spark", "o.a.s")
-    try {
-      logInfo(s"\n\n===== TEST OUTPUT FOR $shortSuiteName: '$testName' =====\n")
-      test()
-    } finally {
-      logInfo(s"\n\n===== FINISHED $shortSuiteName: '$testName' =====\n")
-    }
-  }
 }