avro-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fo...@apache.org
Subject [avro] branch master updated: AVRO-2317 Update hamcrest-library to version 2.1 and remove hamcrest-all (#447)
Date Wed, 06 Feb 2019 21:47:08 GMT
This is an automated email from the ASF dual-hosted git repository.

fokko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/avro.git


The following commit(s) were added to refs/heads/master by this push:
     new 1f88d9e  AVRO-2317 Update hamcrest-library to version 2.1 and remove hamcrest-all
(#447)
1f88d9e is described below

commit 1f88d9ede26daad76f1343ca300f16cc824ef712
Author: Ismaël Mejía <iemejia@gmail.com>
AuthorDate: Wed Feb 6 22:47:04 2019 +0100

    AVRO-2317 Update hamcrest-library to version 2.1 and remove hamcrest-all (#447)
---
 lang/java/avro/pom.xml | 2 +-
 lang/java/pom.xml      | 4 ++--
 pom.xml                | 1 +
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lang/java/avro/pom.xml b/lang/java/avro/pom.xml
index a541a6e..b648ea7 100644
--- a/lang/java/avro/pom.xml
+++ b/lang/java/avro/pom.xml
@@ -178,7 +178,7 @@
     </dependency>
     <dependency>
       <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
+      <artifactId>hamcrest-library</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index affd84f..b9996e3 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -58,7 +58,7 @@
     <commons-logging.version>1.2</commons-logging.version>
     <tukaani.version>1.8</tukaani.version>
     <easymock.version>4.0.2</easymock.version>
-    <hamcrest.version>1.3</hamcrest.version>
+    <hamcrest.version>2.1</hamcrest.version>
     <joda.version>2.10.1</joda.version>
     <grpc.version>1.17.1</grpc.version>
     <netty-codec-http2.version>4.1.30.Final</netty-codec-http2.version>
@@ -487,7 +487,7 @@
       </dependency>
       <dependency>
         <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest-all</artifactId>
+        <artifactId>hamcrest-library</artifactId>
         <version>${hamcrest.version}</version>
       </dependency>
       <dependency>
diff --git a/pom.xml b/pom.xml
index 9cce4bc..4bb02a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -145,6 +145,7 @@
                   <excludes>
                     <exclude>com.google.code.findbugs:*</exclude>  <!-- GPL
-->
                     <exclude>com.google.guava:guava</exclude>
+                    <exclude>org.hamcrest:hamcrest-all</exclude>
                   </excludes>
                 </bannedDependencies>
               </rules>


Mime
View raw message