You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2016/07/01 15:13:59 UTC
[3/4] lucene-solr:branch_6x: SOLR-9076: Fix ivy config to pass
precommit
SOLR-9076: Fix ivy config to pass precommit
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/997489f7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/997489f7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/997489f7
Branch: refs/heads/branch_6x
Commit: 997489f78abe992677692e684458b3d9ac7115bd
Parents: 057c317
Author: Alan Woodward <ro...@apache.org>
Authored: Fri Jul 1 15:59:01 2016 +0100
Committer: Alan Woodward <ro...@apache.org>
Committed: Fri Jul 1 16:01:57 2016 +0100
----------------------------------------------------------------------
lucene/ivy-versions.properties | 2 +-
solr/contrib/map-reduce/ivy.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/997489f7/lucene/ivy-versions.properties
----------------------------------------------------------------------
diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index a90f173..510befa 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -215,8 +215,8 @@ org.apache.uima.version = 2.3.1
org.bouncycastle.version = 1.45
/org.bouncycastle/bcmail-jdk15 = ${org.bouncycastle.version}
-/org.bouncycastle/bcprov-jdk15 = ${org.bouncycastle.version}
/org.bouncycastle/bcpkix-jdk15on = 1.47
+/org.bouncycastle/bcprov-jdk15 = ${org.bouncycastle.version}
/org.carrot2.attributes/attributes-binder = 1.3.1
/org.carrot2.shaded/carrot2-guava = 18.0
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/997489f7/solr/contrib/map-reduce/ivy.xml
----------------------------------------------------------------------
diff --git a/solr/contrib/map-reduce/ivy.xml b/solr/contrib/map-reduce/ivy.xml
index b9f9628..d2e158e 100644
--- a/solr/contrib/map-reduce/ivy.xml
+++ b/solr/contrib/map-reduce/ivy.xml
@@ -31,7 +31,7 @@
<dependency org="org.kitesdk" name="kite-morphlines-hadoop-sequencefile" rev="${/org.kitesdk/kite-morphlines-hadoop-sequencefile}" conf="compile" />
<dependency org="org.jboss.netty" name="netty" rev="${/org.jboss.netty/netty}" conf="test" />
<dependency org="org.bouncycastle" name="bcpkix-jdk15on" rev="${/org.bouncycastle/bcpkix-jdk15on}" conf="test"/>
- <dependency org="com.rometools" name="rome" rev="1.6.1" conf="test"/>
+ <dependency org="com.rometools" name="rome" rev="${/com.rometools/rome}" conf="test"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}" />
</dependencies>
</ivy-module>