diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 0ffe3338579..dea0b9bec67 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -123,6 +123,11 @@ Changes in backwards compatibility policy had a custom Directory implementation that extended Directory, you need to extend BaseDirectory instead. (Adrien Grand) +Build + +* LUCENE-5249: All Lucene/Solr modules should use the same dependency versions + (Steve Rowe) + ======================= Lucene 4.5.0 ======================= New features diff --git a/lucene/analysis/icu/ivy.xml b/lucene/analysis/icu/ivy.xml index 1ef176cf38d..398fb4c1f01 100644 --- a/lucene/analysis/icu/ivy.xml +++ b/lucene/analysis/icu/ivy.xml @@ -19,7 +19,7 @@ - + diff --git a/lucene/analysis/kuromoji/ivy.xml b/lucene/analysis/kuromoji/ivy.xml index ae8a8199c5f..7fa7fe0b4c3 100644 --- a/lucene/analysis/kuromoji/ivy.xml +++ b/lucene/analysis/kuromoji/ivy.xml @@ -25,10 +25,10 @@ - + - + diff --git a/lucene/analysis/morfologik/ivy.xml b/lucene/analysis/morfologik/ivy.xml index c4dd72fc7e8..fb700b68b35 100644 --- a/lucene/analysis/morfologik/ivy.xml +++ b/lucene/analysis/morfologik/ivy.xml @@ -19,9 +19,9 @@ - - - + + + diff --git a/lucene/analysis/phonetic/ivy.xml b/lucene/analysis/phonetic/ivy.xml index 1c2ae951ea1..9b46829b538 100644 --- a/lucene/analysis/phonetic/ivy.xml +++ b/lucene/analysis/phonetic/ivy.xml @@ -19,7 +19,7 @@ - + diff --git a/lucene/analysis/uima/ivy.xml b/lucene/analysis/uima/ivy.xml index 0eca94c97ee..5a9b1a4d355 100644 --- a/lucene/analysis/uima/ivy.xml +++ b/lucene/analysis/uima/ivy.xml @@ -19,9 +19,9 @@ - - - + + + diff --git a/lucene/benchmark/ivy.xml b/lucene/benchmark/ivy.xml index a640c72a09a..ff13fec2988 100644 --- a/lucene/benchmark/ivy.xml +++ b/lucene/benchmark/ivy.xml @@ -19,9 +19,9 @@ - - - + + + diff --git a/lucene/demo/ivy.xml b/lucene/demo/ivy.xml index a8bb411bd13..d5f840162ef 100644 --- a/lucene/demo/ivy.xml +++ b/lucene/demo/ivy.xml @@ -19,7 +19,7 @@ - + diff --git a/lucene/expressions/ivy.xml b/lucene/expressions/ivy.xml index e48e517a63a..ad6780bff82 100644 --- a/lucene/expressions/ivy.xml +++ b/lucene/expressions/ivy.xml @@ -19,9 +19,9 @@ - - - + + + diff --git a/lucene/ivy-settings.xml b/lucene/ivy-settings.xml index 575d74ed8b3..d9381f48fe8 100644 --- a/lucene/ivy-settings.xml +++ b/lucene/ivy-settings.xml @@ -21,6 +21,8 @@ + + diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties new file mode 100644 index 00000000000..2d5782f9a2c --- /dev/null +++ b/lucene/ivy-versions.properties @@ -0,0 +1,122 @@ +/cglib/cglib-nodep = 2.2 +/com.carrotsearch.randomizedtesting/junit4-ant = 2.0.10 +/com.carrotsearch.randomizedtesting/randomizedtesting-runner = 2.0.10 +/com.carrotsearch/hppc = 0.5.2 +/com.cybozu.labs/langdetect = 1.1-20120112 +/com.drewnoakes/metadata-extractor = 2.6.2 +/com.google.guava/guava = 14.0.1 +/com.google.protobuf/protobuf-java = 2.4.0a +/com.googlecode.concurrentlinkedhashmap/concurrentlinkedhashmap-lru = 1.2 +/com.googlecode.juniversalchardet/juniversalchardet = 1.0.3 +/com.googlecode.mp4parser/isoparser = 1.0-RC-1 +/com.ibm.icu/icu4j = 49.1 +/com.spatial4j/spatial4j = 0.3 +/com.sun.jersey/jersey-core = 1.16 +/commons-beanutils/commons-beanutils = 1.7.0 +/commons-cli/commons-cli = 1.2 +/commons-codec/commons-codec = 1.7 +/commons-collections/commons-collections = 3.2.1 +/commons-configuration/commons-configuration = 1.6 +/commons-digester/commons-digester = 2.0 +/commons-fileupload/commons-fileupload = 1.2.1 +/commons-io/commons-io = 2.1 +/commons-lang/commons-lang = 2.6 +/commons-logging/commons-logging = 1.1.1 +/de.l3s.boilerpipe/boilerpipe = 1.1.0 +/dom4j/dom4j = 1.6.1 +/edu.ucar/netcdf = 4.2-min +/hsqldb/hsqldb = 1.8.0.10 +/jakarta-regexp/jakarta-regexp = 1.4 +/javax.activation/activation = 1.1 +/javax.mail/mail = 1.4.1 +/javax.servlet/javax.servlet-api = 3.0.1 +/javax.servlet/servlet-api = 2.4 +/jdom/jdom = 1.0 +/joda-time/joda-time = 2.2 +/junit/junit = 4.10 +/log4j/log4j = 1.2.16 +/mecab/mecab-ipadic = 2.7.0-20070801 +/mecab/mecab-naist-jdic = 0.6.3b-20111013 +/net.arnx/jsonic = 1.2.7 +/net.sourceforge.nekohtml/nekohtml = 1.9.17 +/org.antlr/antlr-runtime = 3.5 +/org.apache.ant/ant = 1.8.2 +/org.apache.commons/commons-compress = 1.4.1 +/org.apache.derby/derby = 10.9.1.0 +hadoop.version = 2.0.5-alpha +/org.apache.hadoop/hadoop-annotations = ${hadoop.version} +/org.apache.hadoop/hadoop-auth = ${hadoop.version} +/org.apache.hadoop/hadoop-common = ${hadoop.version} +/org.apache.hadoop/hadoop-hdfs = ${hadoop.version} +/org.apache.httpcomponents/httpclient = 4.2.3 +/org.apache.httpcomponents/httpclient = 4.2.6 +/org.apache.httpcomponents/httpcore = 4.2.2 +/org.apache.httpcomponents/httpcore = 4.2.5 +/org.apache.httpcomponents/httpmime = 4.2.6 +/org.apache.james/apache-mime4j-core = 0.7.2 +/org.apache.james/apache-mime4j-dom = 0.7.2 +/org.apache.mahout/mahout-collections = 1.0 +/org.apache.mahout/mahout-math = 0.6 +/org.apache.pdfbox/fontbox = 1.8.1 +/org.apache.pdfbox/jempbox = 1.8.1 +/org.apache.pdfbox/pdfbox = 1.8.1 +/org.apache.poi/poi = 3.9 +/org.apache.poi/poi-ooxml = 3.9 +/org.apache.poi/poi-ooxml-schemas = 3.9 +/org.apache.poi/poi-scratchpad = 3.9 +/org.apache.tika/tika-core = 1.4 +/org.apache.tika/tika-parsers = 1.4 +/org.apache.uima/AlchemyAPIAnnotator = 2.3.1 +/org.apache.uima/OpenCalaisAnnotator = 2.3.1 +/org.apache.uima/Tagger = 2.3.1 +/org.apache.uima/WhitespaceTokenizer = 2.3.1 +/org.apache.uima/uimaj-core = 2.3.1 +/org.apache.velocity/velocity = 1.7 +/org.apache.velocity/velocity-tools = 2.0 +/org.apache.xmlbeans/xmlbeans = 2.3.0 +/org.apache.zookeeper/zookeeper = 3.4.5 +/org.bouncycastle/bcmail-jdk15 = 1.45 +/org.bouncycastle/bcprov-jdk15 = 1.45 +/org.carrot2.attributes/attributes-binder = 1.2.0 +/org.carrot2/carrot2-mini = 3.8.0 +/org.carrot2/morfologik-fsa = 1.7.1 +/org.carrot2/morfologik-polish = 1.7.1 +/org.carrot2/morfologik-stemming = 1.7.1 +/org.ccil.cowan.tagsoup/tagsoup = 1.2.1 +/org.codehaus.jackson/jackson-core-asl = 1.7.4 +/org.codehaus.jackson/jackson-mapper-asl = 1.7.4 +/org.codehaus.woodstox/wstx-asl = 3.2.7 +/org.easymock/easymock = 3.0 +/org.eclipse.jetty.orbit/javax.servlet = 3.0.0.v201112011016 +jetty.version = 8.1.10.v20130312 +/org.eclipse.jetty/jetty-continuation = ${jetty.version} +/org.eclipse.jetty/jetty-deploy = ${jetty.version} +/org.eclipse.jetty/jetty-http = ${jetty.version} +/org.eclipse.jetty/jetty-io = ${jetty.version} +/org.eclipse.jetty/jetty-jmx = ${jetty.version} +/org.eclipse.jetty/jetty-security = ${jetty.version} +/org.eclipse.jetty/jetty-server = ${jetty.version} +/org.eclipse.jetty/jetty-servlet = ${jetty.version} +/org.eclipse.jetty/jetty-start = ${jetty.version} +/org.eclipse.jetty/jetty-util = ${jetty.version} +/org.eclipse.jetty/jetty-webapp = ${jetty.version} +/org.eclipse.jetty/jetty-xml = ${jetty.version} +/org.gagravarr/vorbis-java-core = 0.1 +/org.gagravarr/vorbis-java-tika = 0.1 +/org.mortbay.jetty/jetty = 6.1.26 +/org.mortbay.jetty/jetty-util = 6.1.26 +/org.noggit/noggit = 0.5 +/org.objenesis/objenesis = 1.2 +/org.ow2.asm/asm = 4.1 +/org.ow2.asm/asm-commons = 4.1 +/org.restlet.jee/org.restlet = 2.1.1 +/org.restlet.jee/org.restlet.ext.servlet = 2.1.1 +/org.simpleframework/simple-xml = 2.7 +/org.slf4j/jcl-over-slf4j = 1.6.6 +/org.slf4j/jul-to-slf4j = 1.6.6 +/org.slf4j/slf4j-api = 1.6.6 +/org.slf4j/slf4j-log4j12 = 1.6.6 +/org.tukaani/xz = 1.0 +/rome/rome = 0.9 +/xerces/xercesImpl = 2.9.1 + diff --git a/lucene/licenses/httpclient-4.2.3.jar.sha1 b/lucene/licenses/httpclient-4.2.3.jar.sha1 deleted file mode 100644 index b7371916b97..00000000000 --- a/lucene/licenses/httpclient-4.2.3.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -37ced84d839a02fb856255eca85f0a4be95aa634 diff --git a/lucene/licenses/httpclient-4.2.6.jar.sha1 b/lucene/licenses/httpclient-4.2.6.jar.sha1 new file mode 100644 index 00000000000..595aa27658b --- /dev/null +++ b/lucene/licenses/httpclient-4.2.6.jar.sha1 @@ -0,0 +1 @@ +e4ca30a6a3a075053a61c6fc850d2432dc012ba7 diff --git a/lucene/licenses/httpcore-4.2.2.jar.sha1 b/lucene/licenses/httpcore-4.2.2.jar.sha1 deleted file mode 100644 index 0bc6aaa3f97..00000000000 --- a/lucene/licenses/httpcore-4.2.2.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -b76bee23cd3f3ee9b98bc7c2c14670e821ddbbfd diff --git a/lucene/licenses/httpcore-4.2.5.jar.sha1 b/lucene/licenses/httpcore-4.2.5.jar.sha1 new file mode 100644 index 00000000000..84d99e9ed76 --- /dev/null +++ b/lucene/licenses/httpcore-4.2.5.jar.sha1 @@ -0,0 +1 @@ +472f0f5f8dba5d1962cb9d7739feed739a31c30d diff --git a/lucene/replicator/ivy.xml b/lucene/replicator/ivy.xml index 0fa8dd76de1..d0ae57cfd8b 100644 --- a/lucene/replicator/ivy.xml +++ b/lucene/replicator/ivy.xml @@ -31,16 +31,16 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/lucene/sandbox/ivy.xml b/lucene/sandbox/ivy.xml index 94b89529d34..369205b1f87 100644 --- a/lucene/sandbox/ivy.xml +++ b/lucene/sandbox/ivy.xml @@ -19,7 +19,7 @@ - + diff --git a/lucene/spatial/ivy.xml b/lucene/spatial/ivy.xml index 3325872cf5e..7f59ff3d6e6 100644 --- a/lucene/spatial/ivy.xml +++ b/lucene/spatial/ivy.xml @@ -19,7 +19,7 @@ - + diff --git a/lucene/test-framework/ivy.xml b/lucene/test-framework/ivy.xml index ab3f66e524f..6967cd4a2a4 100644 --- a/lucene/test-framework/ivy.xml +++ b/lucene/test-framework/ivy.xml @@ -29,11 +29,11 @@ - + - - - + + + diff --git a/solr/build.xml b/solr/build.xml index 5be4bad1f6f..4a594e76465 100644 --- a/solr/build.xml +++ b/solr/build.xml @@ -282,10 +282,11 @@ + - + diff --git a/solr/common-build.xml b/solr/common-build.xml index 11e03304f35..ce6cc1e247a 100644 --- a/solr/common-build.xml +++ b/solr/common-build.xml @@ -57,10 +57,6 @@ - - - - - - + + + diff --git a/solr/contrib/clustering/ivy.xml b/solr/contrib/clustering/ivy.xml index 71f8c8c7fc9..f336018124a 100644 --- a/solr/contrib/clustering/ivy.xml +++ b/solr/contrib/clustering/ivy.xml @@ -19,17 +19,17 @@ - + - - - + + + - - + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + diff --git a/solr/contrib/langid/ivy.xml b/solr/contrib/langid/ivy.xml index b828b5a1c0e..c62f7176bd3 100644 --- a/solr/contrib/langid/ivy.xml +++ b/solr/contrib/langid/ivy.xml @@ -19,8 +19,8 @@ - - + + diff --git a/solr/contrib/uima/ivy.xml b/solr/contrib/uima/ivy.xml index 601fa33dd9d..69c3c40ac61 100644 --- a/solr/contrib/uima/ivy.xml +++ b/solr/contrib/uima/ivy.xml @@ -19,12 +19,12 @@ - - - - - - + + + + + + diff --git a/solr/contrib/velocity/ivy.xml b/solr/contrib/velocity/ivy.xml index e907049cd99..279c61fe202 100644 --- a/solr/contrib/velocity/ivy.xml +++ b/solr/contrib/velocity/ivy.xml @@ -19,10 +19,10 @@ - - - - + + + + diff --git a/solr/core/ivy.xml b/solr/core/ivy.xml index cbe7d5cae73..e3039510c2f 100644 --- a/solr/core/ivy.xml +++ b/solr/core/ivy.xml @@ -16,9 +16,6 @@ specific language governing permissions and limitations under the License. --> - -]> @@ -32,46 +29,46 @@ - - - - - - - - - - + + + + + + + + + + - - - - + + + + - + - - - - - - + + + + + + - + - + - - - - + + + + diff --git a/solr/example/example-DIH/ivy.xml b/solr/example/example-DIH/ivy.xml index 9a79eee43f4..cf29155f69d 100644 --- a/solr/example/example-DIH/ivy.xml +++ b/solr/example/example-DIH/ivy.xml @@ -20,8 +20,8 @@ - - + + diff --git a/solr/example/ivy.xml b/solr/example/ivy.xml index 9b62bcf97a8..b26fa765642 100644 --- a/solr/example/ivy.xml +++ b/solr/example/ivy.xml @@ -16,9 +16,6 @@ specific language governing permissions and limitations under the License. --> - -]> @@ -30,24 +27,24 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/solr/solrj/ivy.xml b/solr/solrj/ivy.xml index 9937a41c0c8..72b33596a7c 100644 --- a/solr/solrj/ivy.xml +++ b/solr/solrj/ivy.xml @@ -20,15 +20,15 @@ - - + + - + - - - - - - - - - + + + + + + + + + diff --git a/solr/test-framework/ivy.xml b/solr/test-framework/ivy.xml index 0fccb0fe8e6..59905386509 100644 --- a/solr/test-framework/ivy.xml +++ b/solr/test-framework/ivy.xml @@ -32,13 +32,13 @@ - + - + - - + +