You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pa...@apache.org on 2019/09/13 18:08:59 UTC
[camel] branch master updated: Upgrade Hamcrest to version 2.1
This is an automated email from the ASF dual-hosted git repository.
pascalschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 698f40b Upgrade Hamcrest to version 2.1
698f40b is described below
commit 698f40b2d813419a82f94fec9d3becb45881a174
Author: Pascal Schumacher <pa...@gmx.net>
AuthorDate: Wed Sep 11 12:34:56 2019 +0200
Upgrade Hamcrest to version 2.1
---
components/camel-activemq/pom.xml | 3 +--
components/camel-ahc/pom.xml | 2 +-
components/camel-atomix/pom.xml | 3 +--
components/camel-aws-xray/pom.xml | 3 +--
components/camel-cdi/pom.xml | 3 +--
components/camel-ehcache/pom.xml | 3 +--
components/camel-hipchat/pom.xml | 3 +--
components/camel-jcache/pom.xml | 3 +--
components/camel-metrics/pom.xml | 3 +--
components/camel-micrometer/pom.xml | 3 +--
components/camel-pdf/pom.xml | 3 +--
components/camel-tika/pom.xml | 3 +--
components/camel-wordpress/pom.xml | 4 +---
core/camel-cloud/pom.xml | 2 +-
core/camel-core/pom.xml | 2 +-
core/camel-endpointdsl/pom.xml | 2 +-
core/camel-management-impl/pom.xml | 2 +-
core/camel-util/pom.xml | 3 +--
examples/camel-example-cdi-metrics/pom.xml | 3 +--
examples/camel-example-cdi-properties/pom.xml | 3 +--
examples/camel-example-cdi-rest-servlet/pom.xml | 3 +--
examples/camel-example-cdi-test/pom.xml | 3 +--
examples/camel-example-cdi-xml/pom.xml | 3 +--
parent/pom.xml | 4 ++--
.../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 4 ++--
tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml | 3 +--
26 files changed, 28 insertions(+), 48 deletions(-)
diff --git a/components/camel-activemq/pom.xml b/components/camel-activemq/pom.xml
index 4df67f7..665cac8 100644
--- a/components/camel-activemq/pom.xml
+++ b/components/camel-activemq/pom.xml
@@ -113,8 +113,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
index eb1faa1..8ec84dd 100644
--- a/components/camel-ahc/pom.xml
+++ b/components/camel-ahc/pom.xml
@@ -84,7 +84,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/components/camel-atomix/pom.xml b/components/camel-atomix/pom.xml
index d5b1002..d62b5e8 100644
--- a/components/camel-atomix/pom.xml
+++ b/components/camel-atomix/pom.xml
@@ -116,8 +116,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-aws-xray/pom.xml b/components/camel-aws-xray/pom.xml
index 448db6b..1109051 100644
--- a/components/camel-aws-xray/pom.xml
+++ b/components/camel-aws-xray/pom.xml
@@ -87,8 +87,7 @@
<!-- test dependencies -->
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
+ <artifactId>hamcrest</artifactId>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index ae819b4..f8ea5c9 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -176,8 +176,7 @@
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-ehcache/pom.xml b/components/camel-ehcache/pom.xml
index fbf89c0..e4a6884 100644
--- a/components/camel-ehcache/pom.xml
+++ b/components/camel-ehcache/pom.xml
@@ -81,8 +81,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-hipchat/pom.xml b/components/camel-hipchat/pom.xml
index d48000d..5544fa0 100644
--- a/components/camel-hipchat/pom.xml
+++ b/components/camel-hipchat/pom.xml
@@ -96,8 +96,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-jcache/pom.xml b/components/camel-jcache/pom.xml
index 408ec17..7b9f168 100644
--- a/components/camel-jcache/pom.xml
+++ b/components/camel-jcache/pom.xml
@@ -102,8 +102,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml
index 78efea3..835f011 100644
--- a/components/camel-metrics/pom.xml
+++ b/components/camel-metrics/pom.xml
@@ -98,8 +98,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-micrometer/pom.xml b/components/camel-micrometer/pom.xml
index 37347d3..0784ade 100644
--- a/components/camel-micrometer/pom.xml
+++ b/components/camel-micrometer/pom.xml
@@ -97,8 +97,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
diff --git a/components/camel-pdf/pom.xml b/components/camel-pdf/pom.xml
index 79dda04..02a0260 100644
--- a/components/camel-pdf/pom.xml
+++ b/components/camel-pdf/pom.xml
@@ -97,8 +97,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-tika/pom.xml b/components/camel-tika/pom.xml
index ce35e76..ca3575d 100644
--- a/components/camel-tika/pom.xml
+++ b/components/camel-tika/pom.xml
@@ -93,8 +93,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/components/camel-wordpress/pom.xml b/components/camel-wordpress/pom.xml
index 6c31625..de4e22f 100644
--- a/components/camel-wordpress/pom.xml
+++ b/components/camel-wordpress/pom.xml
@@ -35,7 +35,6 @@
<description>Wordpress REST API support</description>
<properties>
- <hamcrest-version>1.3</hamcrest-version>
<camel.osgi.import.additional>
org.apache.cxf.*;version="${cxf-version-range}"
</camel.osgi.import.additional>
@@ -78,8 +77,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/core/camel-cloud/pom.xml b/core/camel-cloud/pom.xml
index a2c716d..608e97d 100644
--- a/core/camel-cloud/pom.xml
+++ b/core/camel-cloud/pom.xml
@@ -82,7 +82,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 21c6412..8304eff 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -223,7 +223,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/core/camel-endpointdsl/pom.xml b/core/camel-endpointdsl/pom.xml
index 44f0462..9b737a8 100644
--- a/core/camel-endpointdsl/pom.xml
+++ b/core/camel-endpointdsl/pom.xml
@@ -83,7 +83,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/core/camel-management-impl/pom.xml b/core/camel-management-impl/pom.xml
index e52ee02..e70315f 100644
--- a/core/camel-management-impl/pom.xml
+++ b/core/camel-management-impl/pom.xml
@@ -87,7 +87,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/core/camel-util/pom.xml b/core/camel-util/pom.xml
index 4a2f125..2f47bf9 100644
--- a/core/camel-util/pom.xml
+++ b/core/camel-util/pom.xml
@@ -63,8 +63,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/examples/camel-example-cdi-metrics/pom.xml b/examples/camel-example-cdi-metrics/pom.xml
index f909bc3..635002a 100644
--- a/examples/camel-example-cdi-metrics/pom.xml
+++ b/examples/camel-example-cdi-metrics/pom.xml
@@ -100,8 +100,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/examples/camel-example-cdi-properties/pom.xml b/examples/camel-example-cdi-properties/pom.xml
index 5f51baa..ae255bc 100644
--- a/examples/camel-example-cdi-properties/pom.xml
+++ b/examples/camel-example-cdi-properties/pom.xml
@@ -106,8 +106,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
diff --git a/examples/camel-example-cdi-rest-servlet/pom.xml b/examples/camel-example-cdi-rest-servlet/pom.xml
index e5115eb..3c0ea7e 100644
--- a/examples/camel-example-cdi-rest-servlet/pom.xml
+++ b/examples/camel-example-cdi-rest-servlet/pom.xml
@@ -110,8 +110,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/examples/camel-example-cdi-test/pom.xml b/examples/camel-example-cdi-test/pom.xml
index bcb9155..c2e9671 100644
--- a/examples/camel-example-cdi-test/pom.xml
+++ b/examples/camel-example-cdi-test/pom.xml
@@ -89,8 +89,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
diff --git a/examples/camel-example-cdi-xml/pom.xml b/examples/camel-example-cdi-xml/pom.xml
index 34267bc..127beaf 100644
--- a/examples/camel-example-cdi-xml/pom.xml
+++ b/examples/camel-example-cdi-xml/pom.xml
@@ -93,8 +93,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/parent/pom.xml b/parent/pom.xml
index 37edc6e..8773332 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -252,7 +252,7 @@
<hadoop2-bundle-version>2.7.2_1</hadoop2-bundle-version>
<hadoop2-version>2.7.4</hadoop2-version>
<hadoop2-protobuf-version>2.5.0</hadoop2-protobuf-version>
- <hamcrest-version>2.0.0.0</hamcrest-version>
+ <hamcrest-version>2.1</hamcrest-version>
<hapi-version>2.3</hapi-version>
<hapi-fhir-version>3.7.0</hapi-fhir-version>
<hawtbuf-version>1.11</hawtbuf-version>
@@ -4843,7 +4843,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
+ <artifactId>hamcrest</artifactId>
<version>${hamcrest-version}</version>
</dependency>
<dependency>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index f4f9afb..40f9862 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3812,8 +3812,8 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>2.0.0.0</version>
+ <artifactId>hamcrest</artifactId>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>org.jruby</groupId>
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
index 8649dfd..7625352 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
@@ -123,8 +123,7 @@
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
- <artifactId>java-hamcrest</artifactId>
- <version>${hamcrest-version}</version>
+ <artifactId>hamcrest</artifactId>
<scope>test</scope>
</dependency>