You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by he...@apache.org on 2015/12/11 16:50:01 UTC
camel git commit: Added Google Truth to BOM.
Repository: camel
Updated Branches:
refs/heads/master 0ad9e3786 -> 61b562738
Added Google Truth to BOM.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/61b56273
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/61b56273
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/61b56273
Branch: refs/heads/master
Commit: 61b5627380c0a011949b73aee68dd842fd2f1f6c
Parents: 0ad9e37
Author: Henryk Konsek <he...@gmail.com>
Authored: Fri Dec 11 16:49:50 2015 +0100
Committer: Henryk Konsek <he...@gmail.com>
Committed: Fri Dec 11 16:49:50 2015 +0100
----------------------------------------------------------------------
components/camel-spark/pom.xml | 2 --
parent/pom.xml | 16 +++++++++++-----
2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/61b56273/components/camel-spark/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml
index 2551f22..2d1d2d1 100644
--- a/components/camel-spark/pom.xml
+++ b/components/camel-spark/pom.xml
@@ -37,7 +37,6 @@ limitations under the License.
<!-- Spark 1.5.1 requires Jackson 2.4.4 -->
<jackson-version>2.4.4</jackson-version>
- <google-truth-version>0.27</google-truth-version>
<hadoop.version>2.2.0</hadoop.version>
<mongo-hadoop-core.version>1.4.2</mongo-hadoop-core.version>
<spark-version>1.5.1</spark-version>
@@ -98,7 +97,6 @@ limitations under the License.
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
- <version>${google-truth-version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/61b56273/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 95cc5e9..1464c01 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -196,6 +196,7 @@
<google-api-services-drive-version>v2-rev151-1.19.0</google-api-services-drive-version>
<google-api-services-calendar-version>v3-rev99-1.19.0</google-api-services-calendar-version>
<google-api-services-mail-version>v1-rev15-1.19.0</google-api-services-mail-version>
+ <google-truth-version>0.27</google-truth-version>
<grizzly-websockets-version>2.3.23</grizzly-websockets-version>
<groovy-version>2.4.5</groovy-version>
<gson-version>2.5</gson-version>
@@ -2236,6 +2237,16 @@
<version>${testng-version}</version>
</dependency>
<dependency>
+ <groupId>com.google.truth</groupId>
+ <artifactId>truth</artifactId>
+ <version>${google-truth-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jayway.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <version>${awaitility.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
<version>${easymock-version}</version>
@@ -2255,11 +2266,6 @@
<artifactId>httpunit</artifactId>
<version>${httpunit-version}</version>
</dependency>
- <dependency>
- <groupId>com.jayway.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <version>${awaitility.version}</version>
- </dependency>
<!-- default JPA support -->
<dependency>