You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2014/09/25 06:27:59 UTC
svn commit: r1627452 -
/lucene/dev/trunk/lucene/ivy-ignore-conflicts.properties
Author: sarowe
Date: Thu Sep 25 04:27:59 2014
New Revision: 1627452
URL: http://svn.apache.org/r1627452
Log:
Ignore the existence of a newer guice version that is an indirect dependency (4.0-beta5) than the direct dependency (3.0)
Modified:
lucene/dev/trunk/lucene/ivy-ignore-conflicts.properties
Modified: lucene/dev/trunk/lucene/ivy-ignore-conflicts.properties
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/ivy-ignore-conflicts.properties?rev=1627452&r1=1627451&r2=1627452&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/ivy-ignore-conflicts.properties (original)
+++ lucene/dev/trunk/lucene/ivy-ignore-conflicts.properties Thu Sep 25 04:27:59 2014
@@ -10,5 +10,6 @@
# trigger a conflict) when the ant check-lib-versions target is run.
/com.google.guava/guava = 16.0.1
+/com.google.inject/guice=4.0-beta5
/javax.servlet/servlet-api = 2.5, 3.0-alpha-1
/org.ow2.asm/asm = 5.0_BETA
\ No newline at end of file