This is an automated email from the ASF dual-hosted git repository. aldettinger pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel.git
commit 771028679e3dd249edee94b403a70bd0b6decb39 Author: aldettinger <aldettin...@gmail.com> AuthorDate: Fri Dec 1 19:16:10 2017 +0100 CAMEL-11869: Removed the now useless dependency to mockito v1 --- camel-core/pom.xml | 1 - components/camel-apns/pom.xml | 1 - components/camel-atmos/pom.xml | 1 - components/camel-atmosphere-websocket/pom.xml | 1 - components/camel-aws/pom.xml | 1 - components/camel-bam/pom.xml | 1 - components/camel-bean-validator/pom.xml | 1 - components/camel-beanstalk/pom.xml | 1 - components/camel-bonita/pom.xml | 1 - components/camel-cassandraql/pom.xml | 1 - components/camel-cometd/pom.xml | 1 - components/camel-core-xml/pom.xml | 1 - components/camel-couchbase/pom.xml | 1 - components/camel-couchdb/pom.xml | 1 - components/camel-cxf-transport/pom.xml | 1 - components/camel-cxf/pom.xml | 1 - components/camel-docker/pom.xml | 1 - components/camel-ftp/pom.xml | 1 - components/camel-google-bigquery/pom.xml | 1 - components/camel-gora/pom.xml | 1 - components/camel-groovy/pom.xml | 1 - components/camel-hazelcast/pom.xml | 1 - components/camel-hipchat/pom.xml | 1 - components/camel-influxdb/pom.xml | 1 - components/camel-irc/pom.xml | 1 - components/camel-jaxb/pom.xml | 1 - components/camel-jgroups/pom.xml | 1 - components/camel-kafka/pom.xml | 1 - components/camel-kura/pom.xml | 1 - components/camel-mail/pom.xml | 1 - components/camel-metrics/pom.xml | 1 - components/camel-mina/pom.xml | 1 - components/camel-mina2/pom.xml | 1 - components/camel-mongodb/pom.xml | 1 - components/camel-mybatis/pom.xml | 1 - components/camel-nagios/pom.xml | 1 - components/camel-openstack/pom.xml | 1 - components/camel-opentracing/pom.xml | 1 - components/camel-printer/pom.xml | 1 - components/camel-quickfix/pom.xml | 1 - components/camel-rabbitmq/pom.xml | 1 - components/camel-rest-swagger/pom.xml | 1 - components/camel-salesforce/camel-salesforce-component/pom.xml | 1 - components/camel-script/pom.xml | 1 - components/camel-smpp/pom.xml | 1 - components/camel-spark-rest/pom.xml | 1 - components/camel-splunk/pom.xml | 1 - components/camel-spring-batch/pom.xml | 1 - components/camel-spring-ldap/pom.xml | 1 - components/camel-spring-redis/pom.xml | 1 - components/camel-telegram/pom.xml | 1 - components/camel-weather/pom.xml | 1 - components/camel-websocket/pom.xml | 1 - parent/pom.xml | 9 +-------- tests/camel-itest/pom.xml | 1 - .../maven/camel-eip-documentation-enricher-maven-plugin/pom.xml | 1 - 56 files changed, 1 insertion(+), 63 deletions(-) diff --git a/camel-core/pom.xml b/camel-core/pom.xml index 65a00cd..3c1bf09 100644 --- a/camel-core/pom.xml +++ b/camel-core/pom.xml @@ -193,7 +193,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> diff --git a/components/camel-apns/pom.xml b/components/camel-apns/pom.xml index 4077ac2..ab90772 100644 --- a/components/camel-apns/pom.xml +++ b/components/camel-apns/pom.xml @@ -125,7 +125,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> diff --git a/components/camel-atmos/pom.xml b/components/camel-atmos/pom.xml index ff4ca47..d13720e 100644 --- a/components/camel-atmos/pom.xml +++ b/components/camel-atmos/pom.xml @@ -97,7 +97,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml index 9594611..d393290 100644 --- a/components/camel-atmosphere-websocket/pom.xml +++ b/components/camel-atmosphere-websocket/pom.xml @@ -89,7 +89,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml index c1533c1..93fc263 100644 --- a/components/camel-aws/pom.xml +++ b/components/camel-aws/pom.xml @@ -150,7 +150,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-bam/pom.xml b/components/camel-bam/pom.xml index e65965a..7ae0eb0 100644 --- a/components/camel-bam/pom.xml +++ b/components/camel-bam/pom.xml @@ -97,7 +97,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-bean-validator/pom.xml b/components/camel-bean-validator/pom.xml index 28d4abd..22f0567 100644 --- a/components/camel-bean-validator/pom.xml +++ b/components/camel-bean-validator/pom.xml @@ -82,7 +82,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-beanstalk/pom.xml b/components/camel-beanstalk/pom.xml index 77ad066..99f8445 100644 --- a/components/camel-beanstalk/pom.xml +++ b/components/camel-beanstalk/pom.xml @@ -63,7 +63,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml index 38a60a5..5e4820b 100644 --- a/components/camel-bonita/pom.xml +++ b/components/camel-bonita/pom.xml @@ -65,7 +65,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-cassandraql/pom.xml b/components/camel-cassandraql/pom.xml index 72a8ffc..8841491 100644 --- a/components/camel-cassandraql/pom.xml +++ b/components/camel-cassandraql/pom.xml @@ -108,7 +108,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml index 82ccf8e..8e786bd 100644 --- a/components/camel-cometd/pom.xml +++ b/components/camel-cometd/pom.xml @@ -99,7 +99,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-core-xml/pom.xml b/components/camel-core-xml/pom.xml index f06054a..5b4ffb2 100644 --- a/components/camel-core-xml/pom.xml +++ b/components/camel-core-xml/pom.xml @@ -49,7 +49,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-couchbase/pom.xml b/components/camel-couchbase/pom.xml index 440a1d4..8d84382 100644 --- a/components/camel-couchbase/pom.xml +++ b/components/camel-couchbase/pom.xml @@ -65,7 +65,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> diff --git a/components/camel-couchdb/pom.xml b/components/camel-couchdb/pom.xml index 7545e0c..145df14 100644 --- a/components/camel-couchdb/pom.xml +++ b/components/camel-couchdb/pom.xml @@ -61,7 +61,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml index 83ff1e9..7880d1e 100644 --- a/components/camel-cxf-transport/pom.xml +++ b/components/camel-cxf-transport/pom.xml @@ -151,7 +151,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml index 63199e2..fba4d35 100644 --- a/components/camel-cxf/pom.xml +++ b/components/camel-cxf/pom.xml @@ -321,7 +321,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-docker/pom.xml b/components/camel-docker/pom.xml index ecb1f1e..e15d05f 100644 --- a/components/camel-docker/pom.xml +++ b/components/camel-docker/pom.xml @@ -100,7 +100,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml index 6636802..323aa2d 100644 --- a/components/camel-ftp/pom.xml +++ b/components/camel-ftp/pom.xml @@ -153,7 +153,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-google-bigquery/pom.xml b/components/camel-google-bigquery/pom.xml index 812fea0..e51476e 100644 --- a/components/camel-google-bigquery/pom.xml +++ b/components/camel-google-bigquery/pom.xml @@ -70,7 +70,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-gora/pom.xml b/components/camel-gora/pom.xml index 54434e8..13258cf 100644 --- a/components/camel-gora/pom.xml +++ b/components/camel-gora/pom.xml @@ -73,7 +73,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-groovy/pom.xml b/components/camel-groovy/pom.xml index d71291b..11467f0 100644 --- a/components/camel-groovy/pom.xml +++ b/components/camel-groovy/pom.xml @@ -85,7 +85,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-hazelcast/pom.xml b/components/camel-hazelcast/pom.xml index 84b65fb..e5f0eb3 100644 --- a/components/camel-hazelcast/pom.xml +++ b/components/camel-hazelcast/pom.xml @@ -89,7 +89,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-hipchat/pom.xml b/components/camel-hipchat/pom.xml index a73352e..a726b29 100644 --- a/components/camel-hipchat/pom.xml +++ b/components/camel-hipchat/pom.xml @@ -87,7 +87,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-influxdb/pom.xml b/components/camel-influxdb/pom.xml index 244022f..d91246a 100644 --- a/components/camel-influxdb/pom.xml +++ b/components/camel-influxdb/pom.xml @@ -52,7 +52,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-irc/pom.xml b/components/camel-irc/pom.xml index eceaeef..4fb1f6b 100644 --- a/components/camel-irc/pom.xml +++ b/components/camel-irc/pom.xml @@ -75,7 +75,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml index f6bd87d..242f5da 100644 --- a/components/camel-jaxb/pom.xml +++ b/components/camel-jaxb/pom.xml @@ -99,7 +99,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-jgroups/pom.xml b/components/camel-jgroups/pom.xml index c87e97f..60b843f 100644 --- a/components/camel-jgroups/pom.xml +++ b/components/camel-jgroups/pom.xml @@ -56,7 +56,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml index 1273cb0..1775076 100644 --- a/components/camel-kafka/pom.xml +++ b/components/camel-kafka/pom.xml @@ -85,7 +85,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml index 2e36dbe..15e85c6 100644 --- a/components/camel-kura/pom.xml +++ b/components/camel-kura/pom.xml @@ -96,7 +96,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml index 2fc9bee..7872d63 100644 --- a/components/camel-mail/pom.xml +++ b/components/camel-mail/pom.xml @@ -107,7 +107,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml index 13675df..07c1a03 100644 --- a/components/camel-metrics/pom.xml +++ b/components/camel-metrics/pom.xml @@ -86,7 +86,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml index d017aa8..bae6271 100644 --- a/components/camel-mina/pom.xml +++ b/components/camel-mina/pom.xml @@ -88,7 +88,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-mina2/pom.xml b/components/camel-mina2/pom.xml index 6159d9e..97bd9f2 100644 --- a/components/camel-mina2/pom.xml +++ b/components/camel-mina2/pom.xml @@ -84,7 +84,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-mongodb/pom.xml b/components/camel-mongodb/pom.xml index b94f3a9..232310b 100644 --- a/components/camel-mongodb/pom.xml +++ b/components/camel-mongodb/pom.xml @@ -85,7 +85,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-mybatis/pom.xml b/components/camel-mybatis/pom.xml index 00e6b30..d05eed5 100644 --- a/components/camel-mybatis/pom.xml +++ b/components/camel-mybatis/pom.xml @@ -84,7 +84,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-nagios/pom.xml b/components/camel-nagios/pom.xml index e5c3213..8fb9e50 100644 --- a/components/camel-nagios/pom.xml +++ b/components/camel-nagios/pom.xml @@ -80,7 +80,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> diff --git a/components/camel-openstack/pom.xml b/components/camel-openstack/pom.xml index 75e7421..88fccde 100644 --- a/components/camel-openstack/pom.xml +++ b/components/camel-openstack/pom.xml @@ -59,7 +59,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> diff --git a/components/camel-opentracing/pom.xml b/components/camel-opentracing/pom.xml index defba92..95e79bb 100644 --- a/components/camel-opentracing/pom.xml +++ b/components/camel-opentracing/pom.xml @@ -104,7 +104,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> diff --git a/components/camel-printer/pom.xml b/components/camel-printer/pom.xml index 22def12..f0e3c9b 100644 --- a/components/camel-printer/pom.xml +++ b/components/camel-printer/pom.xml @@ -57,7 +57,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-quickfix/pom.xml b/components/camel-quickfix/pom.xml index ed90438..45a3ef6 100644 --- a/components/camel-quickfix/pom.xml +++ b/components/camel-quickfix/pom.xml @@ -83,7 +83,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-rabbitmq/pom.xml b/components/camel-rabbitmq/pom.xml index b8877eb..949cc9e 100644 --- a/components/camel-rabbitmq/pom.xml +++ b/components/camel-rabbitmq/pom.xml @@ -63,7 +63,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-rest-swagger/pom.xml b/components/camel-rest-swagger/pom.xml index 9ae8f6c..8d8500e 100644 --- a/components/camel-rest-swagger/pom.xml +++ b/components/camel-rest-swagger/pom.xml @@ -90,7 +90,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml index 5cd71eb..ab36d7c 100644 --- a/components/camel-salesforce/camel-salesforce-component/pom.xml +++ b/components/camel-salesforce/camel-salesforce-component/pom.xml @@ -179,7 +179,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-script/pom.xml b/components/camel-script/pom.xml index daa2602..59c5eb5 100644 --- a/components/camel-script/pom.xml +++ b/components/camel-script/pom.xml @@ -130,7 +130,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> diff --git a/components/camel-smpp/pom.xml b/components/camel-smpp/pom.xml index 85cfb6a..dc99822 100644 --- a/components/camel-smpp/pom.xml +++ b/components/camel-smpp/pom.xml @@ -69,7 +69,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-spark-rest/pom.xml b/components/camel-spark-rest/pom.xml index 764a985..3a8a840 100644 --- a/components/camel-spark-rest/pom.xml +++ b/components/camel-spark-rest/pom.xml @@ -105,7 +105,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> diff --git a/components/camel-splunk/pom.xml b/components/camel-splunk/pom.xml index 28160f2..77d7521 100644 --- a/components/camel-splunk/pom.xml +++ b/components/camel-splunk/pom.xml @@ -92,7 +92,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-spring-batch/pom.xml b/components/camel-spring-batch/pom.xml index 88b0a0e..97040bd 100644 --- a/components/camel-spring-batch/pom.xml +++ b/components/camel-spring-batch/pom.xml @@ -73,7 +73,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-spring-ldap/pom.xml b/components/camel-spring-ldap/pom.xml index 1ea986f..b4955f2 100644 --- a/components/camel-spring-ldap/pom.xml +++ b/components/camel-spring-ldap/pom.xml @@ -93,7 +93,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> diff --git a/components/camel-spring-redis/pom.xml b/components/camel-spring-redis/pom.xml index fd0e54e..88bb50a 100755 --- a/components/camel-spring-redis/pom.xml +++ b/components/camel-spring-redis/pom.xml @@ -65,7 +65,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-telegram/pom.xml b/components/camel-telegram/pom.xml index 28ea2a7..fd34ae3 100644 --- a/components/camel-telegram/pom.xml +++ b/components/camel-telegram/pom.xml @@ -84,7 +84,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/components/camel-weather/pom.xml b/components/camel-weather/pom.xml index 3a0026c..8277b1b 100644 --- a/components/camel-weather/pom.xml +++ b/components/camel-weather/pom.xml @@ -75,7 +75,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> </dependencies> diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml index 3a41832..76b30cc 100644 --- a/components/camel-websocket/pom.xml +++ b/components/camel-websocket/pom.xml @@ -103,7 +103,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/parent/pom.xml b/parent/pom.xml index 5ea8309..d182a0c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -504,8 +504,7 @@ <minimal-json-version>0.9.4</minimal-json-version> <mock-javamail-version>1.9</mock-javamail-version> <mockwebserver-version>0.0.17</mockwebserver-version> - <mockito-version>1.10.19</mockito-version> - <mockito2-version>2.11.0</mockito2-version> + <mockito-version>2.11.0</mockito-version> <mongo-java-driver-version>3.5.0</mongo-java-driver-version> <mongo-java-driver32-version>3.2.2</mongo-java-driver32-version> <mongo-hadoop-version>1.5.0</mongo-hadoop-version> @@ -4424,12 +4423,6 @@ <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> diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml index a9e0e1c..48bb056 100644 --- a/tests/camel-itest/pom.xml +++ b/tests/camel-itest/pom.xml @@ -229,7 +229,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <dependency> 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 fba87b2..e7c78ce 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml @@ -133,7 +133,6 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> - <version>${mockito2-version}</version> <scope>test</scope> </dependency> <!-- Camel annotations in provided scope to avoid compile errors in IDEs --> -- To stop receiving notification emails like this one, please contact "commits@camel.apache.org" <commits@camel.apache.org>.