Repository: camel Updated Branches: refs/heads/master 607e14f60 -> 712b33524
Upgrade Hamcrest to version 2.0.0.0 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/40eea30f Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/40eea30f Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/40eea30f Branch: refs/heads/master Commit: 40eea30f9ccd5b04b70b67172081fcd66f96a3ce Parents: 607e14f Author: Antonin Stefanutti <anto...@stefanutti.fr> Authored: Mon Jan 25 10:01:46 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon Jan 25 13:53:38 2016 +0100 ---------------------------------------------------------------------- components/camel-cdi/pom.xml | 2 +- components/camel-hipchat/pom.xml | 2 +- components/camel-metrics/pom.xml | 2 +- .../camel/component/metrics/AbstractMetricsProducerTest.java | 4 ++-- .../apache/camel/component/metrics/CounterEndpointTest.java | 4 ++-- .../apache/camel/component/metrics/CounterProducerTest.java | 4 ++-- .../camel/component/metrics/HistogramEndpointTest.java | 7 ++++--- .../camel/component/metrics/HistogramProducerTest.java | 4 ++-- .../apache/camel/component/metrics/MeterEndpointTest.java | 4 ++-- .../apache/camel/component/metrics/MeterProducerTest.java | 7 ++++--- .../apache/camel/component/metrics/MetricsComponentTest.java | 2 +- .../apache/camel/component/metrics/MetricsEndpointTest.java | 4 ++-- .../org/apache/camel/component/metrics/MetricsTypeTest.java | 4 ++-- .../apache/camel/component/metrics/TimerEndpointTest.java | 4 ++-- .../apache/camel/component/metrics/TimerProducerTest.java | 4 ++-- components/camel-pdf/pom.xml | 2 +- .../java/org/apache/camel/component/pdf/PdfAppendTest.java | 4 ++-- .../java/org/apache/camel/component/pdf/PdfCreationTest.java | 4 ++-- .../apache/camel/component/pdf/PdfTextExtractionTest.java | 4 ++-- components/camel-splunk/pom.xml | 2 +- parent/pom.xml | 8 +++++++- .../camel-eip-documentation-enricher-maven-plugin/pom.xml | 3 +-- .../camel/maven/integration/EIPDocumentationMojoTest.java | 4 ++-- 23 files changed, 48 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-cdi/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml index 348a43d..61296f1 100644 --- a/components/camel-cdi/pom.xml +++ b/components/camel-cdi/pom.xml @@ -127,7 +127,7 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-library</artifactId> + <artifactId>java-hamcrest</artifactId> <version>${hamcrest-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-hipchat/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-hipchat/pom.xml b/components/camel-hipchat/pom.xml index 6f77379..5706659 100644 --- a/components/camel-hipchat/pom.xml +++ b/components/camel-hipchat/pom.xml @@ -94,7 +94,7 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>java-hamcrest</artifactId> <version>${hamcrest-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml index b80bf52..cc20b3a 100644 --- a/components/camel-metrics/pom.xml +++ b/components/camel-metrics/pom.xml @@ -93,7 +93,7 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-all</artifactId> + <artifactId>java-hamcrest</artifactId> <version>${hamcrest-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java index 706002c..037f473 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/AbstractMetricsProducerTest.java @@ -31,8 +31,8 @@ import org.mockito.runners.MockitoJUnitRunner; import static org.apache.camel.component.metrics.AbstractMetricsProducer.HEADER_PATTERN; import static org.apache.camel.component.metrics.MetricsConstants.HEADER_HISTOGRAM_VALUE; import static org.apache.camel.component.metrics.MetricsConstants.HEADER_METRIC_NAME; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterEndpointTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterEndpointTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterEndpointTest.java index ba423b7..6dff310 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterEndpointTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterEndpointTest.java @@ -27,11 +27,11 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertThat; @RunWith(MockitoJUnitRunner.class) public class CounterEndpointTest { http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterProducerTest.java index d2edf44..e59ca32 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterProducerTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/CounterProducerTest.java @@ -30,8 +30,8 @@ import org.mockito.runners.MockitoJUnitRunner; import static org.apache.camel.component.metrics.MetricsConstants.HEADER_COUNTER_DECREMENT; import static org.apache.camel.component.metrics.MetricsConstants.HEADER_COUNTER_INCREMENT; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramEndpointTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramEndpointTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramEndpointTest.java index 60b743d..0e03af5 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramEndpointTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramEndpointTest.java @@ -27,10 +27,11 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertThat; @RunWith(MockitoJUnitRunner.class) public class HistogramEndpointTest { @@ -67,7 +68,7 @@ public class HistogramEndpointTest { public void testCreateProducer() throws Exception { Producer producer = endpoint.createProducer(); assertThat(producer, is(notNullValue())); - assertThat(producer, is(HistogramProducer.class)); + assertThat(producer, is(instanceOf(HistogramProducer.class))); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramProducerTest.java index 6c4ce68..99ed77f 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramProducerTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/HistogramProducerTest.java @@ -29,8 +29,8 @@ import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; import static org.apache.camel.component.metrics.MetricsConstants.HEADER_HISTOGRAM_VALUE; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterEndpointTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterEndpointTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterEndpointTest.java index 5842cd0..d58d539 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterEndpointTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterEndpointTest.java @@ -27,11 +27,11 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertThat; @RunWith(MockitoJUnitRunner.class) public class MeterEndpointTest { http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterProducerTest.java index dfa85c4..02f5c61 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterProducerTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MeterProducerTest.java @@ -29,9 +29,10 @@ import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; import static org.apache.camel.component.metrics.MetricsConstants.HEADER_METER_MARK; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; +import static org.junit.Assert.assertThat; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; @@ -72,7 +73,7 @@ public class MeterProducerTest { @Test public void testMeterProducer() throws Exception { assertThat(producer, is(notNullValue())); - assertThat(producer.getEndpoint().equals(endpoint), is(true)); + assertThat(producer.getEndpoint(), is(equalTo(endpoint))); } @Test http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java index ec687a0..6f6b431 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsComponentTest.java @@ -33,8 +33,8 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.not; import static org.hamcrest.Matchers.notNullValue; import static org.junit.Assert.assertThat; http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsEndpointTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsEndpointTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsEndpointTest.java index 12978f0..e1607d2 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsEndpointTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsEndpointTest.java @@ -31,8 +31,8 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; import static org.mockito.Mockito.when; @RunWith(MockitoJUnitRunner.class) http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsTypeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsTypeTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsTypeTest.java index e8f39d5..2e77114 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsTypeTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/MetricsTypeTest.java @@ -20,8 +20,8 @@ import java.util.EnumSet; import org.junit.Test; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; +import static org.junit.Assert.assertThat; public class MetricsTypeTest { http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerEndpointTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerEndpointTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerEndpointTest.java index a9b7929..1cb8ea9 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerEndpointTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerEndpointTest.java @@ -27,11 +27,11 @@ import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertThat; @RunWith(MockitoJUnitRunner.class) public class TimerEndpointTest { http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerProducerTest.java b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerProducerTest.java index ce08aa9..fd66b16 100644 --- a/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerProducerTest.java +++ b/components/camel-metrics/src/test/java/org/apache/camel/component/metrics/TimerProducerTest.java @@ -29,10 +29,10 @@ import org.mockito.Mockito; import org.mockito.runners.MockitoJUnitRunner; import static org.apache.camel.component.metrics.MetricsConstants.HEADER_TIMER_ACTION; -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; +import static org.junit.Assert.assertThat; import static org.mockito.Mockito.times; import static org.mockito.Mockito.when; http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-pdf/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-pdf/pom.xml b/components/camel-pdf/pom.xml index c0817ba..e49da8c 100644 --- a/components/camel-pdf/pom.xml +++ b/components/camel-pdf/pom.xml @@ -84,7 +84,7 @@ <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> + <artifactId>java-hamcrest</artifactId> <version>${hamcrest-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java ---------------------------------------------------------------------- diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java index 2f5da2d..8269f96 100644 --- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java +++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfAppendTest.java @@ -39,8 +39,8 @@ import org.apache.pdfbox.util.PDFTextStripper; import org.junit.Before; import org.junit.Test; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.instanceOf; public class PdfAppendTest extends CamelTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java ---------------------------------------------------------------------- diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java index 7b65cbb..c74e1fb 100644 --- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java +++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfCreationTest.java @@ -33,8 +33,8 @@ import org.apache.pdfbox.util.PDFTextStripper; import org.junit.Before; import org.junit.Test; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.instanceOf; public class PdfCreationTest extends CamelTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java ---------------------------------------------------------------------- diff --git a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java index db46882..6d93d8a 100644 --- a/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java +++ b/components/camel-pdf/src/test/java/org/apache/camel/component/pdf/PdfTextExtractionTest.java @@ -34,8 +34,8 @@ import org.apache.pdfbox.pdmodel.encryption.StandardProtectionPolicy; import org.apache.pdfbox.pdmodel.font.PDType1Font; import org.junit.Test; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.instanceOf; public class PdfTextExtractionTest extends CamelTestSupport { http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/components/camel-splunk/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-splunk/pom.xml b/components/camel-splunk/pom.xml index 4d7ace8..f3e275d 100644 --- a/components/camel-splunk/pom.xml +++ b/components/camel-splunk/pom.xml @@ -84,7 +84,7 @@ </dependency> <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> + <artifactId>java-hamcrest</artifactId> <version>${hamcrest-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index d9bc26e..fa3c4b4 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -217,7 +217,7 @@ <hadoop-version>1.2.1</hadoop-version> <hadoop2-bundle-version>2.7.1_1</hadoop2-bundle-version> <hadoop2-version>2.7.1</hadoop2-version> - <hamcrest-version>1.3</hamcrest-version> + <hamcrest-version>2.0.0.0</hamcrest-version> <hapi-version>2.2</hapi-version> <hawtbuf-version>1.11</hawtbuf-version> <hawtdb-version>1.6</hawtdb-version> @@ -2304,6 +2304,12 @@ <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> <version>${mockito-version}</version> + <exclusions> + <exclusion> + <artifactId>hamcrest-core</artifactId> + <groupId>org.hamcrest</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>httpunit</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml ---------------------------------------------------------------------- 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 b2478e3..b6562cd 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml @@ -120,10 +120,9 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>org.hamcrest</groupId> - <artifactId>hamcrest-core</artifactId> + <artifactId>java-hamcrest</artifactId> <version>${hamcrest-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/40eea30f/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java index e5ce45a..efe20f7 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/test/java/org/apache/camel/maven/integration/EIPDocumentationMojoTest.java @@ -36,8 +36,8 @@ import org.apache.camel.maven.ResourceUtils; import org.junit.Before; import org.junit.Test; -import static org.hamcrest.CoreMatchers.containsString; -import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.Matchers.containsString; +import static org.hamcrest.Matchers.instanceOf; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat;
