update to scala 2.11.1

basho-labs · May 26, 2014 · ff4ecd4 · ff4ecd4
1 parent a64e36d
commit ff4ecd4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,5 @@ ebin
 Berksfile.lock
 .vagrant
 *.box
+.DS_Store
+erln8.config
diff --git a/tests/com.basho.dynamodb.integ/pom.xml b/tests/com.basho.dynamodb.integ/pom.xml
@@ -31,7 +31,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <powermock.version>1.5.4</powermock.version>
-    <scala.version>2.10.3</scala.version>
+    <scala.version>2.11.1</scala.version>
   </properties>
 
   <distributionManagement>
@@ -245,7 +245,7 @@
     <!-- Scala Test -->
     <dependency>
       <groupId>org.scalatest</groupId>
-      <artifactId>scalatest_2.10</artifactId>
+      <artifactId>scalatest_2.11</artifactId>
       <version>2.2.0-M1</version>
       <scope>test</scope>
       <exclusions>
@@ -267,8 +267,8 @@
     </dependency>
     <dependency>
       <groupId>org.scalacheck</groupId>
-      <artifactId>scalacheck_2.10</artifactId>
-      <version>1.11.2</version>
+      <artifactId>scalacheck_2.11</artifactId>
+      <version>1.11.4</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

diff --git a/tests/com.basho.dynamodb.integ/src/test/scala/bootstrap/rinamo/RinamoConsole.scala b/tests/com.basho.dynamodb.integ/src/test/scala/bootstrap/rinamo/RinamoConsole.scala
@@ -17,7 +17,7 @@ object RinamoConsole {
      val b = new Boot()
      b.boot
      MainGenericRunner.main(args)
-     exit(0)
+     System.exit(0)
    }
 
    def config():AmazonDynamoDBClient = {