Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Scala version and other dependencies #12

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Scala version and other dependencies #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions jms-benchmark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion jms-benchmark/src/main/scala/org/fusesource/jmsbenchmark/Benchmark.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
13 changes: 7 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand All @@ -65,7 +66,7 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>jline</artifactId>
<version>${scala-version}</version>
<version>${jline-version}</version>
</dependency>
</dependencies>

Expand Down