Update Scala version and other dependencies

This fixes chirino#11
jirkadanek · Nov 4, 2016 · 6c503ee · 6c503ee
1 parent 705666b
commit 6c503ee
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/jms-benchmark/pom.xml b/jms-benchmark/pom.xml
@@ -48,6 +48,11 @@
       <artifactId>jackson-databind</artifactId>
       <version>${jackson-version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>${jackson-version}</version>
+    </dependency>
 
   </dependencies>
 

diff --git a/jms-benchmark/src/main/scala/org/fusesource/jmsbenchmark/Benchmark.scala b/jms-benchmark/src/main/scala/org/fusesource/jmsbenchmark/Benchmark.scala
@@ -30,7 +30,7 @@ import org.ocpsoft.prettytime.PrettyTime
 import java.util.Date
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.fasterxml.jackson.annotation.{JsonProperty, JsonInclude}
-import scala.reflect.BeanProperty
+import scala.beans.BeanProperty
 import scala._
 import scala.Some
 

diff --git a/pom.xml b/pom.xml
@@ -37,11 +37,12 @@
   <properties>
 
     <!-- dependency versions -->
-    <scala-version>2.9.1</scala-version>
-    <maven-scala-plugin-version>2.15.0</maven-scala-plugin-version>
-    <karaf-version>2.2.0</karaf-version>
-    <slf4j-version>1.6.6</slf4j-version>
-    <jackson-version>2.1.0</jackson-version>
+    <scala-version>2.11.8</scala-version>
+    <jline-version>2.10.6</jline-version>
+    <maven-scala-plugin-version>2.15.2</maven-scala-plugin-version>
+    <karaf-version>4.0.7</karaf-version>
+    <slf4j-version>1.7.21</slf4j-version>
+    <jackson-version>2.8.3</jackson-version>
 
   </properties>
 
@@ -65,7 +66,7 @@
     <dependency>
       <groupId>org.scala-lang</groupId>
       <artifactId>jline</artifactId>
-      <version>${scala-version}</version>
+      <version>${jline-version}</version>
     </dependency> 
   </dependencies>