Updated Branches: refs/heads/master 84fd7c988 -> d7abf5440
Upgraded to newer scalatest Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d7abf544 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d7abf544 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d7abf544 Branch: refs/heads/master Commit: d7abf5440167d23f920a0fc58b5ea9f2c13d3b58 Parents: 84fd7c9 Author: Claus Ibsen <davscl...@apache.org> Authored: Wed May 15 08:55:51 2013 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed May 15 08:55:51 2013 +0200 ---------------------------------------------------------------------- components/camel-scala/pom.xml | 4 ++-- parent/pom.xml | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/d7abf544/components/camel-scala/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml index 79d8bcb..e9d0093 100644 --- a/components/camel-scala/pom.xml +++ b/components/camel-scala/pom.xml @@ -52,9 +52,9 @@ <dependency> <groupId>org.scalatest</groupId> <artifactId>scalatest_2.10</artifactId> - <version>1.9.1</version> + <version>${scalatest-version}</version> <scope>test</scope> - <!-- TODO: remove the following exclusions as soon as the scala version being used by scalatest_2.10 is in sync with ${scala-version} --> + <!-- exclude scala compiler so we can control which version we are using --> <exclusions> <exclusion> <groupId>org.scala-lang</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/d7abf544/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 9b57f41..23aa0a0 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -322,6 +322,7 @@ <saxon-version>9.4.0.4</saxon-version> <scala-version>2.10.1</scala-version> <scala-maven-plugin-version>3.1.2</scala-maven-plugin-version> + <scalatest-version>2.0.M5b</scalatest-version> <scriptengines-version>1.1</scriptengines-version> <serp-bundle-version>1.14.1_1</serp-bundle-version> <servicemix-specs-version>2.2.0</servicemix-specs-version>
