Index: build.xml =================================================================== --- build.xml (revision 1535303) +++ build.xml (working copy) @@ -137,15 +137,9 @@ - - - - - - - - + + @@ -471,4 +466,13 @@ + + + + + + + + + Index: dev-tools/maven/lucene/analysis/common/pom.xml.template =================================================================== --- dev-tools/maven/lucene/analysis/common/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/analysis/common/pom.xml.template (working copy) @@ -44,16 +44,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - +@lucene-analyzers-common.internal.dependencies@ +@lucene-analyzers-common.external.dependencies@ +@lucene-analyzers-common.internal.test.dependencies@ +@lucene-analyzers-common.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/analysis/icu/pom.xml.template =================================================================== --- dev-tools/maven/lucene/analysis/icu/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/analysis/icu/pom.xml.template (working copy) @@ -49,23 +49,12 @@ ${project.groupId} lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-analyzers-common - ${project.version} - - - com.ibm.icu - icu4j - +@lucene-analyzers-icu.internal.dependencies@ +@lucene-analyzers-icu.external.dependencies@ +@lucene-analyzers-icu.internal.test.dependencies@ +@lucene-analyzers-icu.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template =================================================================== --- dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/analysis/kuromoji/pom.xml.template (working copy) @@ -46,21 +46,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-analyzers-common - ${project.version} - +@lucene-analyzers-kuromoji.internal.dependencies@ +@lucene-analyzers-kuromoji.external.dependencies@ +@lucene-analyzers-kuromoji.internal.test.dependencies@ +@lucene-analyzers-kuromoji.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/analysis/morfologik/pom.xml.template =================================================================== --- dev-tools/maven/lucene/analysis/morfologik/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/analysis/morfologik/pom.xml.template (working copy) @@ -46,25 +46,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-analyzers-common - ${project.version} - - - org.carrot2 - morfologik-polish - +@lucene-analyzers-morfologik.internal.dependencies@ +@lucene-analyzers-morfologik.external.dependencies@ +@lucene-analyzers-morfologik.internal.test.dependencies@ +@lucene-analyzers-morfologik.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/analysis/phonetic/pom.xml.template =================================================================== --- dev-tools/maven/lucene/analysis/phonetic/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/analysis/phonetic/pom.xml.template (working copy) @@ -46,25 +46,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-analyzers-common - ${project.version} - - - commons-codec - commons-codec - +@lucene-analyzers-phonetic.internal.dependencies@ +@lucene-analyzers-phonetic.external.dependencies@ +@lucene-analyzers-phonetic.internal.test.dependencies@ +@lucene-analyzers-phonetic.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/analysis/smartcn/pom.xml.template =================================================================== --- dev-tools/maven/lucene/analysis/smartcn/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/analysis/smartcn/pom.xml.template (working copy) @@ -44,21 +44,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-analyzers-common - ${project.version} - +@lucene-analyzers-smartcn.internal.dependencies@ +@lucene-analyzers-smartcn.external.dependencies@ +@lucene-analyzers-smartcn.internal.test.dependencies@ +@lucene-analyzers-smartcn.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/analysis/stempel/pom.xml.template =================================================================== --- dev-tools/maven/lucene/analysis/stempel/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/analysis/stempel/pom.xml.template (working copy) @@ -44,21 +44,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-analyzers-common - ${project.version} - +@lucene-analyzers-stempel.internal.dependencies@ +@lucene-analyzers-stempel.external.dependencies@ +@lucene-analyzers-stempel.internal.test.dependencies@ +@lucene-analyzers-stempel.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/analysis/uima/pom.xml.template =================================================================== --- dev-tools/maven/lucene/analysis/uima/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/analysis/uima/pom.xml.template (working copy) @@ -48,33 +48,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-analyzers-common - ${project.version} - - - org.apache.uima - Tagger - - - org.apache.uima - WhitespaceTokenizer - - - org.apache.uima - uimaj-core - +@lucene-analyzers-uima.internal.dependencies@ +@lucene-analyzers-uima.external.dependencies@ +@lucene-analyzers-uima.internal.test.dependencies@ +@lucene-analyzers-uima.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/benchmark/pom.xml.template =================================================================== --- dev-tools/maven/lucene/benchmark/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/benchmark/pom.xml.template (working copy) @@ -44,64 +44,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-analyzers-common - ${project.version} - - - ${project.groupId} - lucene-highlighter - ${project.version} - - - ${project.groupId} - lucene-memory - ${project.version} - - - ${project.groupId} - lucene-queryparser - ${project.version} - - - ${project.groupId} - lucene-facet - ${project.version} - - - com.ibm.icu - icu4j - - - net.sourceforge.nekohtml - nekohtml - 1.9.17 - - - org.apache.commons - commons-compress - - - org.tukaani - xz - - - - - xerces - xercesImpl - +@lucene-benchmark.internal.dependencies@ +@lucene-benchmark.external.dependencies@ +@lucene-benchmark.internal.test.dependencies@ +@lucene-benchmark.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/classification/pom.xml.template =================================================================== --- dev-tools/maven/lucene/classification/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/classification/pom.xml.template (working copy) @@ -44,27 +44,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-queries - ${project.version} - - - ${project.groupId} - lucene-analyzers-common - ${project.version} - test - +@lucene-classification.internal.dependencies@ +@lucene-classification.external.dependencies@ +@lucene-classification.internal.test.dependencies@ +@lucene-classification.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/codecs/src/java/pom.xml.template =================================================================== --- dev-tools/maven/lucene/codecs/src/java/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/codecs/src/java/pom.xml.template (working copy) @@ -44,11 +44,8 @@ ${vc-browse-base-url}/${module-directory} - - ${project.groupId} - lucene-core - ${project.version} - +@lucene-codecs.internal.dependencies@ +@lucene-codecs.external.dependencies@ ${module-path} Index: dev-tools/maven/lucene/codecs/src/test/pom.xml.template =================================================================== --- dev-tools/maven/lucene/codecs/src/test/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/codecs/src/test/pom.xml.template (working copy) @@ -40,15 +40,15 @@ org.apache.lucene lucene-test-framework - ${project.version} test org.apache.lucene lucene-codecs - ${project.version} test +@lucene-codecs.internal.test.dependencies@ +@lucene-codecs.external.test.dependencies@ Index: dev-tools/maven/lucene/core/src/test/pom.xml.template =================================================================== --- dev-tools/maven/lucene/core/src/test/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/core/src/test/pom.xml.template (working copy) @@ -40,25 +40,15 @@ org.apache.lucene lucene-test-framework - ${project.version} test org.apache.lucene lucene-core - ${project.version} test - - junit - junit - test - - - org.apache.ant - ant - test - +@lucene-core.internal.test.dependencies@ +@lucene-core.external.test.dependencies@ Index: dev-tools/maven/lucene/demo/pom.xml.template =================================================================== --- dev-tools/maven/lucene/demo/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/demo/pom.xml.template (working copy) @@ -44,36 +44,14 @@ - ${project.groupId} + lucene.apache.org lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-analyzers-common - ${project.version} - - - ${project.groupId} - lucene-facet - ${project.version} - - - ${project.groupId} - lucene-queryparser - ${project.version} - - - javax.servlet - servlet-api - provided - +@lucene-demo.internal.dependencies@ +@lucene-demo.external.dependencies@ +@lucene-demo.internal.test.dependencies@ +@lucene-demo.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/expressions/pom.xml.template =================================================================== --- dev-tools/maven/lucene/expressions/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/expressions/pom.xml.template (working copy) @@ -41,33 +41,14 @@ - ${project.groupId} + lucene.apache.org lucene-test-framework - ${project.version} test - - org.antlr - antlr-runtime - - - org.ow2.asm - asm - - - org.ow2.asm - asm-commons - - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-queries - ${project.version} - +@lucene-expressions.internal.dependencies@ +@lucene-expressions.external.dependencies@ +@lucene-expressions.internal.test.dependencies@ +@lucene-expressions.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/facet/pom.xml.template =================================================================== --- dev-tools/maven/lucene/facet/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/facet/pom.xml.template (working copy) @@ -46,21 +46,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-analyzers-common - ${project.version} - +@lucene-facet.internal.dependencies@ +@lucene-facet.external.dependencies@ +@lucene-facet.internal.test.dependencies@ +@lucene-facet.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/grouping/pom.xml.template =================================================================== --- dev-tools/maven/lucene/grouping/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/grouping/pom.xml.template (working copy) @@ -44,21 +44,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-queries - ${project.version} - +@lucene-grouping.internal.dependencies@ +@lucene-grouping.external.dependencies@ +@lucene-grouping.internal.test.dependencies@ +@lucene-grouping.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/highlighter/pom.xml.template =================================================================== --- dev-tools/maven/lucene/highlighter/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/highlighter/pom.xml.template (working copy) @@ -46,26 +46,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-memory - ${project.version} - - - ${project.groupId} - lucene-queries - ${project.version} - +@lucene-highlighter.internal.dependencies@ +@lucene-highlighter.external.dependencies@ +@lucene-highlighter.internal.test.dependencies@ +@lucene-highlighter.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/join/pom.xml.template =================================================================== --- dev-tools/maven/lucene/join/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/join/pom.xml.template (working copy) @@ -44,21 +44,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-grouping - ${project.version} - +@lucene-join.internal.dependencies@ +@lucene-join.external.dependencies@ +@lucene-join.internal.test.dependencies@ +@lucene-join.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/memory/pom.xml.template =================================================================== --- dev-tools/maven/lucene/memory/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/memory/pom.xml.template (working copy) @@ -46,22 +46,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-queryparser - ${project.version} - test - +@lucene-memory.internal.dependencies@ +@lucene-memory.external.dependencies@ +@lucene-memory.internal.test.dependencies@ +@lucene-memory.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/misc/pom.xml.template =================================================================== --- dev-tools/maven/lucene/misc/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/misc/pom.xml.template (working copy) @@ -44,16 +44,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} - test + test - - ${project.groupId} - lucene-core - ${project.version} - +@lucene-misc.internal.dependencies@ +@lucene-misc.external.dependencies@ +@lucene-misc.internal.test.dependencies@ +@lucene-misc.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/queries/pom.xml.template =================================================================== --- dev-tools/maven/lucene/queries/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/queries/pom.xml.template (working copy) @@ -44,16 +44,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - +@lucene-queries.internal.dependencies@ +@lucene-queries.external.dependencies@ +@lucene-queries.internal.test.dependencies@ +@lucene-queries.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/queryparser/pom.xml.template =================================================================== --- dev-tools/maven/lucene/queryparser/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/queryparser/pom.xml.template (working copy) @@ -44,26 +44,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-queries - ${project.version} - - - ${project.groupId} - lucene-sandbox - ${project.version} - +@lucene-queryparser.internal.dependencies@ +@lucene-queryparser.external.dependencies@ +@lucene-queryparser.internal.test.dependencies@ +@lucene-queryparser.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/replicator/pom.xml.template =================================================================== --- dev-tools/maven/lucene/replicator/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/replicator/pom.xml.template (working copy) @@ -44,43 +44,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-facet - ${project.version} - - - org.apache.httpcomponents - httpclient - - - org.eclipse.jetty - jetty-server - - - org.eclipse.jetty - jetty-servlet - - - org.eclipse.jetty - jetty-security - - - - - org.eclipse.jetty - jetty-util - +@lucene-replicator.internal.dependencies@ +@lucene-replicator.external.dependencies@ +@lucene-replicator.internal.test.dependencies@ +@lucene-replicator.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/sandbox/pom.xml.template =================================================================== --- dev-tools/maven/lucene/sandbox/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/sandbox/pom.xml.template (working copy) @@ -44,20 +44,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - jakarta-regexp - jakarta-regexp - +@lucene-sandbox.internal.dependencies@ +@lucene-sandbox.external.dependencies@ +@lucene-sandbox.internal.test.dependencies@ +@lucene-sandbox.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/spatial/pom.xml.template =================================================================== --- dev-tools/maven/lucene/spatial/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/spatial/pom.xml.template (working copy) @@ -41,25 +41,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - com.spatial4j - spatial4j - - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-queries - ${project.version} - +@lucene-spatial.internal.dependencies@ +@lucene-spatial.external.dependencies@ +@lucene-spatial.internal.test.dependencies@ +@lucene-spatial.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/suggest/pom.xml.template =================================================================== --- dev-tools/maven/lucene/suggest/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/suggest/pom.xml.template (working copy) @@ -44,36 +44,14 @@ - ${project.groupId} + org.apache.lucene lucene-test-framework - ${project.version} test - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-analyzers-common - ${project.version} - - - ${project.groupId} - lucene-misc - ${project.version} - - - ${project.groupId} - lucene-expressions - ${project.version} - - - ${project.groupId} - lucene-queries - ${project.version} - +@lucene-suggest.internal.dependencies@ +@lucene-suggest.external.dependencies@ +@lucene-suggest.internal.test.dependencies@ +@lucene-suggest.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/lucene/test-framework/pom.xml.template =================================================================== --- dev-tools/maven/lucene/test-framework/pom.xml.template (revision 1535303) +++ dev-tools/maven/lucene/test-framework/pom.xml.template (working copy) @@ -42,24 +42,10 @@ ${vc-browse-base-url}/${module-directory} - - ${project.groupId} - lucene-core - ${project.version} - - - ${project.groupId} - lucene-codecs - ${project.version} - - - junit - junit - - - com.carrotsearch.randomizedtesting - randomizedtesting-runner - +@lucene-test-framework.internal.dependencies@ +@lucene-test-framework.external.dependencies@ +@lucene-test-framework.internal.test.dependencies@ +@lucene-test-framework.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/pom.xml.template =================================================================== --- dev-tools/maven/pom.xml.template (revision 1535303) +++ dev-tools/maven/pom.xml.template (working copy) @@ -45,13 +45,6 @@ yyyy-MM-dd HH:mm:ss 1.7 8.1.10.v20130312 - 1.6.6 - 1.2.16 - 1.4 - 4.2.6 - 2.1 - 2.1.1 - 2.0.5-alpha 1 @@ -142,417 +135,7 @@ - - com.ibm.icu - icu4j - 49.1 - - - com.google.guava - guava - 14.0.1 - - - commons-codec - commons-codec - 1.7 - - - commons-cli - commons-cli - 1.2 - - - commons-digester - commons-digester - 1.7 - - - xml-apis - xml-apis - - - - - commons-fileupload - commons-fileupload - 1.2.1 - - - commons-io - commons-io - ${commons-io.version} - - - joda-time - joda-time - 2.2 - - - org.apache.httpcomponents - httpclient - ${httpcomponents.version} - - - org.apache.httpcomponents - httpmime - ${httpcomponents.version} - - - commons-logging - commons-logging - - - - - org.noggit - noggit - 0.5 - - - com.googlecode.concurrentlinkedhashmap - concurrentlinkedhashmap-lru - 1.2 - - - com.sun.jersey - jersey-core - 1.16 - - - commons-lang - commons-lang - 2.6 - - - commons-logging - commons-logging - 1.1.1 - - - hsqldb - hsqldb - 1.8.0.10 - - - jakarta-regexp - jakarta-regexp - 1.4 - - - javax.activation - activation - 1.1 - - - javax.mail - mail - 1.4.1 - - - jline - jline - 0.9.1 - - - junit - junit - 4.10 - - - org.hamcrest - hamcrest-core - - - - - org.antlr - antlr-runtime - 3.5 - - - - antlr - antlr - - - org.antlr - stringtemplate - - - - - org.ow2.asm - asm - 4.1 - - - org.ow2.asm - asm-commons - 4.1 - - - org.ow2.asm - asm-tree - - - - - org.apache.ant - ant - 1.8.2 - - - org.apache.ant - ant-launcher - - - - - org.apache.commons - commons-compress - 1.4.1 - - - net.arnx - jsonic - 1.2.7 - - - com.cybozu.labs - langdetect - 1.1-20120112 - - - org.apache.derby - derby - 10.9.1.0 - - - 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-common - ${hadoop.version} - tests - - - org.apache.hadoop - hadoop-hdfs - ${hadoop.version} - - - org.apache.hadoop - hadoop-hdfs - ${hadoop.version} - tests - - - org.apache.tika - tika-core - ${tika.version} - - - org.apache.tika - tika-parsers - ${tika.version} - - - com.adobe.xmp - xmpcore - - - commons-logging - commons-logging - - - org.apache.geronimo.specs - geronimo-stax-api_1.0_spec - - - org.gagravarr - vorbis-java-core - - - org.ow2.asm - asm-debug-all - - - org.aspectj - aspectjrt - - - - - 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.zookeeper - zookeeper - 3.4.5 - - - org.carrot2 - carrot2-mini - 3.8.0 - - - org.carrot2 - morfologik-polish - 1.7.1 - - - org.codehaus.woodstox - wstx-asl - 3.2.7 - - - org.easymock - easymock - 3.0 - test - - - org.eclipse.jetty - jetty-server - ${jetty.version} - - - org.eclipse.jetty - jetty-servlet - ${jetty.version} - - - org.eclipse.jetty - jetty-util - ${jetty.version} - - - org.eclipse.jetty - jetty-webapp - ${jetty.version} - - - org.mortbay.jetty - jetty - 6.1.26 - - - org.mortbay.jetty - jetty-util - 6.1.26 - - - org.restlet.jee - org.restlet - ${restlet.version} - - - org.restlet.jee - org.restlet.ext.servlet - ${restlet.version} - - - org.slf4j - jcl-over-slf4j - ${slf4j.version} - - - org.slf4j - jul-to-slf4j - ${slf4j.version} - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-log4j12 - ${slf4j.version} - - - log4j - log4j - ${log4j.version} - - - org.eclipse.jetty.orbit - javax.servlet - 3.0.0.v201112011016 - - - javax.servlet - servlet-api - 2.4 - - - com.spatial4j - spatial4j - 0.3 - - - xerces - xercesImpl - 2.9.1 - - - xml-apis - xml-apis - - - - - com.carrotsearch.randomizedtesting - randomizedtesting-runner - 2.0.10 - +@lucene.solr.dependency.management@ Index: dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template =================================================================== --- dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (revision 1535303) +++ dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (working copy) @@ -48,31 +48,17 @@ org.apache.lucene lucene-test-framework - ${project.version} test - ${project.groupId} - solr-core - ${project.version} - - - ${project.groupId} + org.apache.solr solr-test-framework - ${project.version} test - - org.apache.lucene - lucene-analyzers-icu - ${project.version} - - - - javax.servlet - servlet-api - test - +@solr-analysis-extras.internal.dependencies@ +@solr-analysis-extras.external.dependencies@ +@solr-analysis-extras.internal.test.dependencies@ +@solr-analysis-extras.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/solr/contrib/clustering/pom.xml.template =================================================================== --- dev-tools/maven/solr/contrib/clustering/pom.xml.template (revision 1535303) +++ dev-tools/maven/solr/contrib/clustering/pom.xml.template (working copy) @@ -48,42 +48,17 @@ org.apache.lucene lucene-test-framework - ${project.version} test - ${project.groupId} - solr-core - ${project.version} - - - ${project.groupId} + org.apache.solr solr-test-framework - ${project.version} test - - org.carrot2 - carrot2-mini - - - jfree - jcommon - - - org.apache.commons - commons-math - - - org.uncommons.maths - uncommons-maths - - - xpp3 - xpp3 - - - +@solr-clustering.internal.dependencies@ +@solr-clustering.external.dependencies@ +@solr-clustering.internal.test.dependencies@ +@solr-clustering.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template =================================================================== --- dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template (revision 1535303) +++ dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template (working copy) @@ -48,35 +48,17 @@ org.apache.lucene lucene-test-framework - ${project.version} test - ${project.groupId} - solr-core - ${project.version} - - - ${project.groupId} + org.apache.solr solr-test-framework - ${project.version} test - - org.easymock - easymock - test - - - hsqldb - hsqldb - test - - - org.apache.derby - derby - test - +@solr-dataimporthandler.internal.dependencies@ +@solr-dataimporthandler.external.dependencies@ +@solr-dataimporthandler.internal.test.dependencies@ +@solr-dataimporthandler.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template =================================================================== --- dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template (revision 1535303) +++ dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template (working copy) @@ -48,44 +48,24 @@ org.apache.lucene lucene-test-framework - ${project.version} test - ${project.groupId} - solr-core - ${project.version} - - - ${project.groupId} + org.apache.solr solr-test-framework - ${project.version} test - ${project.groupId} + org.apache.solr solr-dataimporthandler ${project.version} - - - ${project.groupId} - solr-dataimporthandler - ${project.version} test-jar test - - javax.activation - activation - - - javax.mail - mail - - - org.apache.tika - tika-parsers - +@solr-dataimporthandler-extras.internal.dependencies@ +@solr-dataimporthandler-extras.external.dependencies@ +@solr-dataimporthandler-extras.internal.test.dependencies@ +@solr-dataimporthandler-extras.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/solr/contrib/extraction/pom.xml.template =================================================================== --- dev-tools/maven/solr/contrib/extraction/pom.xml.template (revision 1535303) +++ dev-tools/maven/solr/contrib/extraction/pom.xml.template (working copy) @@ -51,38 +51,17 @@ org.apache.lucene lucene-test-framework - ${project.version} test - ${project.groupId} - solr-core - ${project.version} - - - ${project.groupId} + org.apache.solr solr-test-framework - ${project.version} test - - com.ibm.icu - icu4j - - - org.apache.tika - tika-parsers - - - xerces - xercesImpl - - - - javax.servlet - servlet-api - test - +@solr-extraction.internal.dependencies@ +@solr-extraction.external.dependencies@ +@solr-extraction.internal.test.dependencies@ +@solr-extraction.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/solr/contrib/langid/pom.xml.template =================================================================== --- dev-tools/maven/solr/contrib/langid/pom.xml.template (revision 1535303) +++ dev-tools/maven/solr/contrib/langid/pom.xml.template (working copy) @@ -52,38 +52,17 @@ org.apache.lucene lucene-test-framework - ${project.version} test - ${project.groupId} - solr-core - ${project.version} - - - ${project.groupId} + org.apache.solr solr-test-framework - ${project.version} test - - net.arnx - jsonic - - - com.cybozu.labs - langdetect - - - org.apache.tika - tika-parsers - - - - javax.servlet - servlet-api - test - +@solr-langid.internal.dependencies@ +@solr-langid.external.dependencies@ +@solr-langid.internal.test.dependencies@ +@solr-langid.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/solr/contrib/uima/pom.xml.template =================================================================== --- dev-tools/maven/solr/contrib/uima/pom.xml.template (revision 1535303) +++ dev-tools/maven/solr/contrib/uima/pom.xml.template (working copy) @@ -48,61 +48,17 @@ org.apache.lucene lucene-test-framework - ${project.version} test - org.apache.lucene - lucene-analyzers-uima - ${project.version} - - - ${project.groupId} - solr-core - ${project.version} - - - ${project.groupId} + org.apache.solr solr-test-framework - ${project.version} test - - commons-lang - commons-lang - - - org.apache.uima - AlchemyAPIAnnotator - - - commons-digester - commons-digester - - - - - org.apache.uima - OpenCalaisAnnotator - - - org.apache.uima - Tagger - - - org.apache.uima - WhitespaceTokenizer - - - org.apache.uima - uimaj-core - - - - javax.servlet - servlet-api - test - +@solr-uima.internal.dependencies@ +@solr-uima.external.dependencies@ +@solr-uima.internal.test.dependencies@ +@solr-uima.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/solr/contrib/velocity/pom.xml.template =================================================================== --- dev-tools/maven/solr/contrib/velocity/pom.xml.template (revision 1535303) +++ dev-tools/maven/solr/contrib/velocity/pom.xml.template (working copy) @@ -48,82 +48,17 @@ org.apache.lucene lucene-test-framework - ${project.version} test - ${project.groupId} - solr-core - ${project.version} - - - ${project.groupId} + org.apache.solr solr-test-framework - ${project.version} test - - org.apache.velocity - velocity - - - oro - oro - - - - - org.apache.velocity - velocity-tools - - - commons-chain - commons-chain - - - commons-digester - commons-digester - - - commons-logging - commons-logging - - - commons-validator - commons-validator - - - dom4j - dom4j - - - oro - oro - - - sslext - sslext - - - org.apache.struts - struts-core - - - org.apache.struts - struts-taglib - - - org.apache.struts - struts-tiles - - - - - - javax.servlet - servlet-api - test - +@solr-velocity.internal.dependencies@ +@solr-velocity.external.dependencies@ +@solr-velocity.internal.test.dependencies@ +@solr-velocity.external.test.dependencies@ ${module-path}/src/java Index: dev-tools/maven/solr/core/src/java/pom.xml.template =================================================================== --- dev-tools/maven/solr/core/src/java/pom.xml.template (revision 1535303) +++ dev-tools/maven/solr/core/src/java/pom.xml.template (working copy) @@ -42,340 +42,8 @@ ${vc-browse-base-url}/${module-directory} - - ${project.groupId} - solr-solrj - ${project.version} - - - org.apache.lucene - lucene-core - ${project.version} - - - org.apache.lucene - lucene-codecs - ${project.version} - - - org.apache.lucene - lucene-analyzers-common - ${project.version} - - - org.apache.lucene - lucene-analyzers-kuromoji - ${project.version} - - - org.apache.lucene - lucene-analyzers-morfologik - ${project.version} - true - - - org.apache.lucene - lucene-analyzers-phonetic - ${project.version} - - - org.apache.lucene - lucene-highlighter - ${project.version} - - - org.apache.lucene - lucene-memory - ${project.version} - - - org.apache.lucene - lucene-misc - ${project.version} - - - org.apache.lucene - lucene-join - ${project.version} - - - org.apache.lucene - lucene-queryparser - ${project.version} - - - org.apache.lucene - lucene-sandbox - - - - - org.apache.lucene - lucene-spatial - ${project.version} - - - org.apache.lucene - lucene-suggest - ${project.version} - - - org.apache.lucene - lucene-expressions - - - - - org.apache.lucene - lucene-grouping - ${project.version} - - - org.apache.lucene - lucene-queries - ${project.version} - - - com.googlecode.concurrentlinkedhashmap - concurrentlinkedhashmap-lru - - - commons-codec - commons-codec - - - commons-cli - commons-cli - - - commons-fileupload - commons-fileupload - - - joda-time - joda-time - - - org.apache.hadoop - hadoop-annotations - - - org.apache.hadoop - hadoop-auth - - - org.apache.hadoop - hadoop-common - - - javax.servlet - servlet-api - - - javax.servlet.jsp - jsp-api - - - org.apache.commons - commons-math - - - xmlenc - xmlenc - - - commons-configuration - commons-configuration - - - commons-httpclient - commons-httpclient - - - commons-net - commons-net - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-json - - - com.sun.jersey - jersey-server - - - org.mortbay.jetty - jetty - - - org.mortbay.jetty - jetty-util - - - tomcat - jasper-compiler - - - tomcat - jasper-runtime - - - commons-el - commons-el - - - commons-logging - commons-logging - - - net.java.dev.jets3t - jets3t - - - commons-digester - commons-digester - - - commons-beanutils - commons-beanutils-core - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - - org.apache.avro - avro - - - net.sf.kosmosfs - kfs - - - com.jcraft - jsch - - - - - org.apache.hadoop - hadoop-hdfs - - - javax.servlet - servlet-api - - - javax.servlet.jsp - jsp-api - - - com.sun.jersey - jersey-core - - - com.sun.jersey - jersey-server - - - commons-logging - commons-logging - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - - org.mortbay.jetty - jetty - - - org.mortbay.jetty - jetty-util - - - tomcat - jasper-runtime - - - xmlenc - xmlenc - - - commons-daemon - commons-daemon - - - - - org.restlet.jee - org.restlet - ${restlet.version} - - - org.restlet.jee - org.restlet.ext.servlet - ${restlet.version} - - - commons-io - commons-io - - - commons-lang - commons-lang - - - com.google.guava - guava - - - org.eclipse.jetty - jetty-server - true - - - org.eclipse.jetty - jetty-util - true - - - org.eclipse.jetty - jetty-webapp - true - - - javax.servlet - servlet-api - - provided - - - org.apache.httpcomponents - httpclient - - - commons-logging - commons-logging - - - - - org.apache.httpcomponents - httpmime - +@solr-core.internal.dependencies@ +@solr-core.external.dependencies@ ${module-path} Index: dev-tools/maven/solr/core/src/test/pom.xml.template =================================================================== --- dev-tools/maven/solr/core/src/test/pom.xml.template (revision 1535303) +++ dev-tools/maven/solr/core/src/test/pom.xml.template (working copy) @@ -42,168 +42,20 @@ org.apache.lucene lucene-test-framework - ${project.version} test - ${project.groupId} + org.apache.solr solr-test-framework - ${project.version} test - org.easymock - easymock + org.apache.solr + solr-core test - - org.apache.hadoop - hadoop-common - tests - test - - - javax.servlet - servlet-api - - - org.apache.commons - commons-math - - - xmlenc - xmlenc - - - commons-httpclient - commons-httpclient - - - commons-net - commons-net - - - com.sun.jersey - jersey-json - - - com.sun.jersey - jersey-server - - - tomcat - jasper-compiler - - - tomcat - jasper-runtime - - - commons-el - commons-el - - - commons-logging - commons-logging - - - net.java.dev.jets3t - jets3t - - - commons-digester - commons-digester - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - - org.apache.avro - avro - - - net.sf.kosmosfs - kfs - - - com.jcraft - jsch - - - commons-beanutils - commons-beanutils-core - - - - - org.apache.hadoop - hadoop-hdfs - tests - test - - - javax.servlet - servlet-api - - - com.sun.jersey - jersey-server - - - commons-logging - commons-logging - - - org.codehaus.jackson - jackson-core-asl - - - org.codehaus.jackson - jackson-mapper-asl - - - tomcat - jasper-runtime - - - xmlenc - xmlenc - - - commons-daemon - commons-daemon - - - - - - - org.mortbay.jetty - jetty - test - - - org.mortbay.jetty - servlet-api - - - - - org.mortbay.jetty - jetty-util - test - - - dom4j - dom4j - 1.6.1 - test - +@solr-core.internal.test.dependencies@ +@solr-core.external.test.dependencies@ Index: dev-tools/maven/solr/solrj/src/java/pom.xml.template =================================================================== --- dev-tools/maven/solr/solrj/src/java/pom.xml.template (revision 1535303) +++ dev-tools/maven/solr/solrj/src/java/pom.xml.template (working copy) @@ -42,76 +42,8 @@ ${vc-browse-base-url}/${module-directory} - - org.apache.zookeeper - zookeeper - - - javax.jms - jms - - - com.sun.jmx - jmxri - - - com.sun.jdmk - jmxtools - - - log4j - log4j - - - org.jboss.netty - netty - - - org.slf4j - slf4j-log4j12 - - - jline - jline - - - - - commons-io - commons-io - - - org.noggit - noggit - - - org.apache.httpcomponents - httpclient - - - - commons-logging - commons-logging - - - - - org.apache.httpcomponents - httpmime - - - - - org.codehaus.woodstox - wstx-asl - runtime - - - stax - stax-api - - - +@solr-solrj.internal.dependencies@ +@solr-solrj.external.dependencies@ ${module-path} Index: dev-tools/maven/solr/solrj/src/test/pom.xml.template =================================================================== --- dev-tools/maven/solr/solrj/src/test/pom.xml.template (revision 1535303) +++ dev-tools/maven/solr/solrj/src/test/pom.xml.template (working copy) @@ -42,15 +42,20 @@ org.apache.lucene lucene-test-framework - ${project.version} test - ${project.groupId} + org.apache.solr solr-test-framework - ${project.version} test + + org.apache.solr + solr-solrj + test + +@solr-solrj.internal.test.dependencies@ +@solr-solrj.external.test.dependencies@ Index: dev-tools/maven/solr/test-framework/pom.xml.template =================================================================== --- dev-tools/maven/solr/test-framework/pom.xml.template (revision 1535303) +++ dev-tools/maven/solr/test-framework/pom.xml.template (working copy) @@ -47,44 +47,11 @@ org.apache.lucene lucene-test-framework - ${project.version} - - ${project.groupId} - solr-core - ${project.version} - - - javax.servlet - servlet-api - - provided - - - junit - junit - - - org.eclipse.jetty - jetty-servlet - - - org.eclipse.jetty - jetty-util - - - - - org.eclipse.jetty - jetty-server - runtime - - - org.eclipse.jetty - jetty-webapp - runtime - +@solr-test-framework.internal.dependencies@ +@solr-test-framework.external.dependencies@ +@solr-test-framework.internal.test.dependencies@ +@solr-test-framework.external.test.dependencies@ ${module-path}/src/java Index: lucene/analysis/build.xml =================================================================== --- lucene/analysis/build.xml (revision 1535303) +++ lucene/analysis/build.xml (working copy) @@ -141,5 +141,9 @@ + + + + Index: lucene/analysis/uima/build.xml =================================================================== --- lucene/analysis/uima/build.xml (revision 1535303) +++ lucene/analysis/uima/build.xml (working copy) @@ -34,10 +34,14 @@ - + + + + + Index: lucene/build.xml =================================================================== --- lucene/build.xml (revision 1535303) +++ lucene/build.xml (working copy) @@ -174,6 +174,31 @@ + + + + + + + + + + + + + + + + + + + + + @@ -631,4 +656,11 @@ + + + + + + + Index: lucene/common-build.xml =================================================================== --- lucene/common-build.xml (revision 1535303) +++ lucene/common-build.xml (working copy) @@ -1470,10 +1470,28 @@ + + + + + + + + + + + + + +${ant.project.name}.internal.dependencies=${classpath.list} +${ant.project.name}.internal.test.dependencies=${test.classpath.list} + + + - + Index: lucene/test-framework/build.xml =================================================================== --- lucene/test-framework/build.xml (revision 1535303) +++ lucene/test-framework/build.xml (working copy) @@ -31,6 +31,8 @@ + + Index: lucene/tools/custom-tasks.xml =================================================================== --- lucene/tools/custom-tasks.xml (revision 1535303) +++ lucene/tools/custom-tasks.xml (working copy) @@ -109,4 +109,34 @@ + + + + + + + + + Get maven dependencies called under: @{dir} + + + + + + + + + + + + + + + Index: lucene/tools/src/java/lucene-solr.antlib.xml =================================================================== --- lucene/tools/src/java/lucene-solr.antlib.xml (revision 1535303) +++ lucene/tools/src/java/lucene-solr.antlib.xml (working copy) @@ -21,4 +21,7 @@ + Index: lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java =================================================================== --- lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java (revision 0) +++ lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java (working copy) @@ -0,0 +1,632 @@ +package org.apache.lucene.dependencies; + +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import org.apache.tools.ant.BuildException; +import org.apache.tools.ant.Project; +import org.apache.tools.ant.Task; +import org.apache.tools.ant.types.Resource; +import org.apache.tools.ant.types.ResourceCollection; +import org.apache.tools.ant.types.resources.FileResource; +import org.apache.tools.ant.types.resources.Resources; +import org.xml.sax.Attributes; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; +import org.xml.sax.XMLReader; +import org.xml.sax.helpers.DefaultHandler; +import org.xml.sax.helpers.XMLReaderFactory; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.OutputStreamWriter; +import java.io.Reader; +import java.io.UnsupportedEncodingException; +import java.io.Writer; +import java.nio.charset.Charset; +import java.nio.charset.CharsetDecoder; +import java.nio.charset.CodingErrorAction; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.Stack; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import javax.xml.parsers.ParserConfigurationException; + +/** + * An Ant task to verify that the '/org/name' keys in ivy-versions.properties + * are sorted lexically and are neither duplicates nor orphans, and that all + * dependencies in all ivy.xml files use rev="${/org/name}" format. + */ +public class GetMavenDependenciesTask extends Task { + private static final String IVY_USER_DIR_PROPERTY_KEY = "ivy.default.ivy.user.dir"; + private static final Pattern PROPERTY_PREFIX_FROM_IVY_XML_FILE_PATTERN = Pattern.compile + ("[/\\\\](lucene|solr)[/\\\\](?:(?:contrib|(analysis))[/\\\\])?([^/\\\\]+)[/\\\\]ivy\\.xml"); + private static final Pattern COORDINATE_KEY_PATTERN = Pattern.compile("/([^/]+)/([^/]+)"); + private static final Pattern INTERNAL_DEPENDENCY_COORDINATE_KEY_PATTERN + = Pattern.compile("(.*?)\\.internal(\\.test)?\\.dependencies"); + // lucene/build/core/classes/java + private static final Pattern COMPILATION_OUTPUT_DIRECTORY_PATTERN + = Pattern.compile("(lucene|solr)/build/(?:contrib/)?(.*)/classes/(?:java|test)"); + // lucene/build/analysis/common/lucene-analyzers-common-5.0-SNAPSHOT.jar + private static final Pattern JAR_PATTERN + = Pattern.compile(".*(lucene|solr)([^/]*?)-(?:\\d\\.)+\\d(?:-SNAPSHOT)?\\.jar"); + private static final String UNWANTED_INTERNAL_DEPENDENCIES + = "/(?:test-)?lib/|test-framework/classes/java|/test-files|/resources"; + private static final String DEPENDENCY_MANAGEMENT_PROPERTY = "lucene.solr.dependency.management"; + private static final Properties allProperties = new Properties(); + private static final Set skipArtifactTypes = new HashSet(); + private static final Set modulesWithSeparateCompileAndTestPOMs = new HashSet(); + private static final Set optionalExternalDependencies = new HashSet(); + static { + // Add artifact types here that should not be maven dependencies + skipArtifactTypes.addAll(Arrays.asList(".tar.gz")); + + // Add modules here that have split compile and test POMs + // - they need compile-scope deps to also be test-scope deps. + modulesWithSeparateCompileAndTestPOMs.addAll + (Arrays.asList("lucene-core", "lucene-codecs", "solr-core", "solr-solrj")); + + // Add external dependencies here that should be optional (i.e., not invoke Maven's transitive dep mechanism). + // Format is "groupId:artifactId" + optionalExternalDependencies.addAll(Arrays.asList + ("org.slf4j:jcl-over-slf4j", "org.slf4j:jul-to-slf4j", "org.slf4j:slf4j-api", "org.slf4j:slf4j-log4j12")); + } + + private SortedMap> internalCompileScopeDependencies = new TreeMap>(); + private Map> externalDependencies = new HashMap>(); + private Set skippedArtifacts = new HashSet(); + private File ivyCacheDir; + + + /** + * All ivy.xml files to get external dependencies from. + */ + private Resources ivyXmlResources = new Resources(); + + /** + * Centralized Ivy versions properties file + */ + private File centralizedVersionsFile; + + /** + * Internal dependency properties file, generated by task -append-internal-dependency-properties. + */ + private File internalDependencyPropertiesFile; + + /** + * Where all properties are written, to be used to filter POM templates when copying them. + */ + private File mavenDependenciesFiltersFile; + + /** + * A logging level associated with verbose logging. + */ + private int verboseLevel = Project.MSG_VERBOSE; + + /** + * Adds a set of ivy.xml resources to check. + */ + public void add(ResourceCollection rc) { + ivyXmlResources.add(rc); + } + + public void setVerbose(boolean verbose) { + verboseLevel = (verbose ? Project.MSG_INFO : Project.MSG_VERBOSE); + } + + public void setCentralizedVersionsFile(File file) { + centralizedVersionsFile = file; + } + + public void setInternalDependencyPropertiesFile(File file) { + internalDependencyPropertiesFile = file; + } + + public void setMavenDependenciesFiltersFile(File file) { + mavenDependenciesFiltersFile = file; + } + + /** + * Write out a filter file to be used when copying POMs. + */ + @Override + public void execute() throws BuildException { + String ivyUserDirName = getProject().getUserProperty(IVY_USER_DIR_PROPERTY_KEY); + if (null == ivyUserDirName) { + ivyUserDirName = getProject().getProperty(IVY_USER_DIR_PROPERTY_KEY); + if (null == ivyUserDirName) { + ivyUserDirName = System.getProperty("user.home") + "/.ivy2"; + } + } + File ivyUserDir = new File(ivyUserDirName); + if ( ! ivyUserDir.exists()) { + throw new BuildException("Ivy user dir does not exist: '" + ivyUserDir.getPath() + "'"); + } + ivyCacheDir = new File(ivyUserDir, "cache"); + if ( ! ivyCacheDir.exists()) { + throw new BuildException("Ivy cache dir does not exist: '" + ivyCacheDir.getPath() + "'"); + } + + setInternalDependencyProperties(); // side-effect: all modules' internal deps are recorded + setExternalDependencyProperties(); // side-effect: all modules' external deps are recorded + setGrandparentDependencyManagementProperty(); // uses deps recorded in above two methods + Writer writer = null; + try { + FileOutputStream outputStream = new FileOutputStream(mavenDependenciesFiltersFile); + writer = new OutputStreamWriter(outputStream, "ISO-8859-1"); + allProperties.store(writer, null); + } catch (FileNotFoundException e) { + throw new BuildException("Can't find file: '" + mavenDependenciesFiltersFile.getPath() + "'", e); + } catch (UnsupportedEncodingException e) { + throw new BuildException(e); + } catch (IOException e) { + throw new BuildException("Exception writing out '" + mavenDependenciesFiltersFile.getPath() + "'", e); + } finally { + if (null != writer) { + try { + writer.close(); + } catch (IOException e) { + // ignore + } + } + } + } + + /** + * Collects external dependencies from each ivy.xml file and sets + * external dependency properties to be inserted into modules' POMs. + */ + private void setExternalDependencyProperties() { + @SuppressWarnings("unchecked") + Iterator iter = (Iterator)ivyXmlResources.iterator(); + while (iter.hasNext()) { + final Resource resource = iter.next(); + if ( ! resource.isExists()) { + throw new BuildException("Resource does not exist: " + resource.getName()); + } + if ( ! (resource instanceof FileResource)) { + throw new BuildException("Only filesystem resources are supported: " + + resource.getName() + ", was: " + resource.getClass().getName()); + } + + File ivyXmlFile = ((FileResource)resource).getFile(); + try { + collectExternalDependenciesFromIvyXmlFile(ivyXmlFile); + } catch (Exception e) { + throw new BuildException("Exception reading file " + ivyXmlFile.getPath(), e); + } + } + } + + /** + * Sets the property to be inserted into the grandparent POM's + * <dependencyManagement> section. + */ + private void setGrandparentDependencyManagementProperty() { + StringBuilder builder = new StringBuilder(); + appendInternalDependencies(builder); + appendExternalDependencies(builder); + builder.setLength(builder.length() - 1); // drop trailing newline + allProperties.setProperty(DEPENDENCY_MANAGEMENT_PROPERTY, builder.toString()); + } + + private void appendInternalDependencies(StringBuilder builder) { + for (String artifactId : internalCompileScopeDependencies.keySet()) { + List exclusions = new ArrayList(); + exclusions.addAll(internalCompileScopeDependencies.get(artifactId)); + exclusions.addAll(externalDependencies.get(artifactId)); + String groupId = "org.apache." + artifactId.substring(0, artifactId.indexOf('-')); + appendDependencyXml(builder, groupId, artifactId, " ", "${project.version}", false, false, exclusions); + } + } + + private void appendExternalDependencies(StringBuilder builder) { + Properties versions = loadPropertiesFile(centralizedVersionsFile); + SortedSet sortedEntries = new TreeSet(new Comparator() { + @Override public int compare(Map.Entry o1, Map.Entry o2) { + return ((String)o1.getKey()).compareTo((String)o2.getKey()); + } + }); + sortedEntries.addAll(versions.entrySet()); + for (Map.Entry entry : sortedEntries) { + String key = (String)entry.getKey(); + Matcher matcher = COORDINATE_KEY_PATTERN.matcher(key); + if (matcher.lookingAt()) { + String groupId = matcher.group(1); + String artifactId = matcher.group(2); + if ( ! skippedArtifacts.contains(groupId + ':' + artifactId)) { + String version = (String)entry.getValue(); + List exclusions = getTransitiveDependenciesFromIvyMetadata(groupId, artifactId, version); + appendDependencyXml(builder, groupId, artifactId, " ", version, false, false, exclusions); + } + } + } + } + + private List getTransitiveDependenciesFromIvyMetadata(String groupId, String artifactId, String version) { + SortedSet dependencies = new TreeSet(); + XMLReader xmlReader = null; + // E.g. ~/.ivy2/cache/xerces/xercesImpl/ivy-2.9.1.xml + File ivyXmlFile = new File(new File(new File(ivyCacheDir, groupId), artifactId), "ivy-" + version + ".xml"); + if ( ! ivyXmlFile.exists()) { + throw new BuildException("File not found: " + ivyXmlFile.getPath()); + } + try { + xmlReader = XMLReaderFactory.createXMLReader(); + DependencyCollector dependencyCollector = new DependencyCollector(ivyXmlFile, true); + xmlReader.setContentHandler(dependencyCollector); + xmlReader.setErrorHandler(dependencyCollector); + // To work around a bug in XERCES (XERCESJ-1257), we assume the XML is always UTF8, so we simply provide reader. + CharsetDecoder decoder = Charset.forName("UTF-8").newDecoder() + .onMalformedInput(CodingErrorAction.REPORT) + .onUnmappableCharacter(CodingErrorAction.REPORT); + InputStream stream = new FileInputStream(ivyXmlFile); + xmlReader.parse(new InputSource(new BufferedReader(new InputStreamReader(stream, decoder)))); + dependencies.addAll(dependencyCollector.dependencies); + } catch (Exception e) { + throw new BuildException("Exception reading file " + ivyXmlFile.getPath(), e); + } + return Arrays.asList(dependencies.toArray(new String[dependencies.size()])); + } + + /** + * Sets the internal dependencies (test) properties to be inserted + * into modules' POMs. + */ + private void setInternalDependencyProperties() { + Properties internalDependencies = loadPropertiesFile(internalDependencyPropertiesFile); + Map> testScopeDependencies = new HashMap>(); + Map testScopePropertyKeys = new HashMap(); + for (Map.Entry entry : internalDependencies.entrySet()) { + String newPropertyKey = (String)entry.getKey(); + StringBuilder newPropertyValue = new StringBuilder(); + String value = (String)entry.getValue(); + Matcher matcher = INTERNAL_DEPENDENCY_COORDINATE_KEY_PATTERN.matcher(newPropertyKey); + if ( ! matcher.matches()) { + throw new BuildException("Malformed internal dependency property key: '" + newPropertyKey + "'"); + } + String origModule = matcher.group(1); + String module = origModule; + boolean isTest = null != matcher.group(2); + if ( ! newPropertyKey.startsWith("solr-")) { // lucene modules names don't have "lucene-" prepended + newPropertyKey = "lucene-" + newPropertyKey; + module = "lucene-" + module; + } + if (module.equals("solr-cell")) { + module = "solr-extraction"; + newPropertyKey = module + newPropertyKey.substring("solr-cell".length()); + } + module = module.replace("lucene-analysis-", "lucene-analyzers-"); + if (isTest) { + testScopePropertyKeys.put(module, newPropertyKey); + } + if (null == value || value.isEmpty()) { + allProperties.setProperty(newPropertyKey, ""); + Map> scopedDependencies + = isTest ? testScopeDependencies : internalCompileScopeDependencies; + scopedDependencies.put(module, new TreeSet()); + } else { + // Lucene analysis modules' build dirs don't include hyphens, but Solr contribs' build dirs do + String origModuleDir = origModule.replace("analyzers-", "analysis/"); + Pattern unwantedInternalDependencies = Pattern.compile + ("(?:lucene/build/|solr/build/(?:contrib/)?)" + origModuleDir + "|" + UNWANTED_INTERNAL_DEPENDENCIES); + SortedSet sortedDeps = new TreeSet(); + for (String dependency : value.split(",")) { + matcher = unwantedInternalDependencies.matcher(dependency); + if (matcher.find()) { + continue; // skip external (/(test-)lib/), and non-jar and unwanted (self) internal deps + } + StringBuilder artifactId = new StringBuilder(); + String groupId = "org.apache."; + matcher = COMPILATION_OUTPUT_DIRECTORY_PATTERN.matcher(dependency); + if (matcher.matches()) { + // Pattern.compile("(lucene|solr)/build/(.*)/classes/java"); + groupId += matcher.group(1); + String artifact = matcher.group(2); + artifact = artifact.replace('/', '-'); + artifact = artifact.replace("analysis-", "analyzers-"); + if ("lucene".equals(matcher.group(1))) { + artifactId.append("lucene-"); + } + artifactId.append(artifact); + } else { + matcher = JAR_PATTERN.matcher(dependency); + if (matcher.matches()) { + // Pattern.compile(".*(lucene|solr)([^/]*?)-(?:\\d\\.)+\\d(?:-SNAPSHOT)?\\.jar)") + groupId += matcher.group(1); + artifactId.append(matcher.group(1)); + artifactId.append(matcher.group(2)); + } else { + throw new BuildException + ("Malformed internal dependency from '" + newPropertyKey + "': '" + dependency + "'"); + } + } + String coordinate = groupId + ':' + artifactId.toString(); + sortedDeps.add(coordinate); + } + if (isTest) { // Don't set test-scope properties until all compile-scope deps have been seen + testScopeDependencies.put(module, sortedDeps); + } else { + internalCompileScopeDependencies.put(module, sortedDeps); + for (String dependency : sortedDeps) { + int splitPos = dependency.indexOf(':'); + String groupId = dependency.substring(0, splitPos); + String artifactId = dependency.substring(splitPos + 1); + appendDependencyXml(newPropertyValue, groupId, artifactId, " ", null, false, false, null); + } + if (newPropertyValue.length() > 0) { + newPropertyValue.setLength(newPropertyValue.length() - 1); // drop trailing newline + } + allProperties.setProperty(newPropertyKey, newPropertyValue.toString()); + } + } + } + // Now that all compile-scope dependencies have been seen, include only those test-scope + // dependencies that are not also compile-scope dependencies. + for (Map.Entry> entry : testScopeDependencies.entrySet()) { + String module = entry.getKey(); + SortedSet testDeps = entry.getValue(); + SortedSet compileDeps = internalCompileScopeDependencies.get(module); + if (null == compileDeps) { + throw new BuildException("Can't find compile scope dependencies for module " + module); + } + StringBuilder newPropertyValue = new StringBuilder(); + for (String dependency : testDeps) { + // modules with separate compile-scope and test-scope POMs need their compile-scope deps + // included in their test-scope deps. + if (modulesWithSeparateCompileAndTestPOMs.contains(module) || ! compileDeps.contains(dependency)) { + int splitPos = dependency.indexOf(':'); + String groupId = dependency.substring(0, splitPos); + String artifactId = dependency.substring(splitPos + 1); + appendDependencyXml(newPropertyValue, groupId, artifactId, " ", null, true, false, null); + } + } + if (newPropertyValue.length() > 0) { + newPropertyValue.setLength(newPropertyValue.length() - 1); // drop trailing newline + } + allProperties.setProperty(testScopePropertyKeys.get(module), newPropertyValue.toString()); + } + } + + /** + * Collect external dependencies from the given ivy.xml file; + * return true on success, false on failure. + */ + private void collectExternalDependenciesFromIvyXmlFile(File ivyXmlFile) + throws ParserConfigurationException, SAXException, IOException { + String module = getModuleName(ivyXmlFile); + log("Collecting external dependencies from: " + ivyXmlFile.getPath(), verboseLevel); + XMLReader xmlReader = XMLReaderFactory.createXMLReader(); + DependencyCollector dependencyCollector = new DependencyCollector(ivyXmlFile, false); + xmlReader.setContentHandler(dependencyCollector); + xmlReader.setErrorHandler(dependencyCollector); + // To work around a bug in XERCES (XERCESJ-1257), we assume the XML is always UTF8, so we simply provide reader. + CharsetDecoder decoder = Charset.forName("UTF-8").newDecoder() + .onMalformedInput(CodingErrorAction.REPORT) + .onUnmappableCharacter(CodingErrorAction.REPORT); + InputStream stream = new FileInputStream(ivyXmlFile); + xmlReader.parse(new InputSource(new BufferedReader(new InputStreamReader(stream, decoder)))); + + StringBuilder builder = new StringBuilder(); + for (String dependency : dependencyCollector.dependencies) { + int splitPos = dependency.indexOf(':'); + String groupId = dependency.substring(0, splitPos); + String artifactId = dependency.substring(splitPos + 1); + appendDependencyXml(builder, groupId, artifactId, " ", null, false, + optionalExternalDependencies.contains(dependency), null); + } + if (builder.length() > 0) { + builder.setLength(builder.length() - 1); // drop trailing newline + } + allProperties.setProperty(module + ".external.dependencies", builder.toString()); + + builder.setLength(0); + for (String dependency : dependencyCollector.testDependencies) { + int splitPos = dependency.indexOf(':'); + String groupId = dependency.substring(0, splitPos); + String artifactId = dependency.substring(splitPos + 1); + appendDependencyXml(builder, groupId, artifactId, " ", null, true, false, null); + } + if (builder.length() > 0) { + builder.setLength(builder.length() - 1); // drop trailing newline + } + allProperties.setProperty(module + ".external.test.dependencies", builder.toString()); + + externalDependencies.put(module, dependencyCollector.dependencies); + } + + /** + * Extract module name from ivy.xml path. + */ + private String getModuleName(File ivyXmlFile) { + String path = ivyXmlFile.getAbsolutePath(); + Matcher matcher = PROPERTY_PREFIX_FROM_IVY_XML_FILE_PATTERN.matcher(path); + if ( ! matcher.find()) { + throw new BuildException("Can't get property prefix from ivy.xml path: " + path); + } + StringBuilder builder = new StringBuilder(); + builder.append(matcher.group(1)); + if (null != matcher.group(2)) { // "lucene/analysis/..." + builder.append("-analyzers"); + } + builder.append('-'); + builder.append(matcher.group(3)); + return builder.toString(); + } + + /** + * Parses the given properties file and returns the resulting Properties. + */ + private Properties loadPropertiesFile(File file) { + log("Loading centralized ivy versions from: " + file, verboseLevel); + final InputStream stream; + try { + stream = new FileInputStream(file); + } catch (FileNotFoundException e) { + throw new BuildException("Properties file does not exist: " + file.getPath()); + } + // Properties files are encoded as Latin-1 + final Reader reader = new InputStreamReader(stream, Charset.forName("ISO-8859-1")); + final Properties properties = new Properties(); + try { + properties.load(reader); + } catch (IOException e) { + throw new BuildException("Exception reading properties file " + file, e); + } finally { + try { + reader.close(); + } catch (IOException e) { + // do nothing + } + } + // Perform non-recursive Ant-like property value interpolation + for (Map.Entry entry : properties.entrySet()) { + String value = (String)entry.getValue(); + String key = (String)entry.getKey(); + if (value.startsWith("${") && value.endsWith("}")) { + String lookupKey = value.substring(2, value.length() - 1); + String interpolatedValue = properties.getProperty(lookupKey); + if (null != interpolatedValue) { + properties.setProperty(key, interpolatedValue); + } + } + } + return properties; + } + + /** + * Collect external dependencies from the given ivy.xml file, + * then set a property containing XML dependency snippets to be + * inserted into the corresponding module's POM(s) (more than one + * in case the module has separate compile and test POMs, e.g. + * lucene-codecs, solrj, etc.) + */ + private class DependencyCollector extends DefaultHandler { + private final File ivyXmlFile; + private final Stack tags = new Stack(); + private final SortedSet dependencies = new TreeSet(); + private final SortedSet testDependencies = new TreeSet(); + private final boolean ignoreOptionalAndProvidedDependencies; + + private String org; + private String name; + private String conf; + + public DependencyCollector(File ivyXmlFile, boolean ignoreOptionalAndProvidedDependencies) { + this.ivyXmlFile = ivyXmlFile; + this.ignoreOptionalAndProvidedDependencies = ignoreOptionalAndProvidedDependencies; + } + + @Override + public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { + if (localName.equals("dependency") && insideDependenciesTag()) { + org = attributes.getValue("org"); + if (null == org) { + throw new BuildException("MISSING 'org' attribute on in " + ivyXmlFile.getPath()); + } + name = attributes.getValue("name"); + if (null == name) { + throw new BuildException("MISSING 'name' attribute on in " + ivyXmlFile.getPath()); + } + conf = attributes.getValue("conf"); + if (null == conf) { + conf = ""; // default configuration - not test + } + } else if (localName.equals("artifact") && insideDependencyTag()) { + String type = attributes.getValue("type"); + if (null != type && skipArtifactTypes.contains(type)) { + skippedArtifacts.add(org + ':' + name); + org = null; + name = null; + conf = null; + } + } + tags.push(localName); + } + + @Override + public void endElement (String uri, String localName, String qName) throws SAXException { + tags.pop(); + if (localName.equals("dependency") && insideDependenciesTag() && null != org && null != name) { + if (ignoreOptionalAndProvidedDependencies + && (null == conf || ( ! conf.startsWith("optional->") && ! conf.startsWith("provided->")))) { + SortedSet deps = conf.contains("test") ? testDependencies : dependencies; + deps.add(org + ':' + name); + } + } + } + + private boolean insideDependenciesTag() { + return tags.size() == 2 && tags.get(0).equals("ivy-module") && tags.get(1).equals("dependencies"); + } + + private boolean insideDependencyTag() { + return tags.size() == 3 && tags.get(0).equals("ivy-module") + && tags.get(1).equals("dependencies") && tags.get(2).equals("dependency"); + } + } + + private void appendDependencyXml(StringBuilder builder, String groupId, String artifactId, + String indent, String version, boolean isTestDependency, + boolean isOptional, List exclusions) { + builder.append(indent).append("\n"); + builder.append(indent).append(" ").append(groupId).append("\n"); + builder.append(indent).append(" ").append(artifactId).append("\n"); + if (null != version) { + builder.append(indent).append(" ").append(version).append("\n"); + } + if (isTestDependency) { + builder.append(indent).append(" test\n"); + } + if (isOptional) { + builder.append(indent).append(" true\n"); + } + if (null != exclusions && ! exclusions.isEmpty()) { + builder.append(indent).append(" \n"); + for (String dependency : exclusions) { + int splitPos = dependency.indexOf(':'); + String excludedGroupId = dependency.substring(0, splitPos); + String excludedArtifactId = dependency.substring(splitPos + 1); + builder.append(indent).append(" \n"); + builder.append(indent).append(" ").append(excludedGroupId).append("\n"); + builder.append(indent).append(" ").append(excludedArtifactId).append("\n"); + builder.append(indent).append(" \n"); + } + builder.append(indent).append(" \n"); + } + builder.append(indent).append("\n"); + } +} Property changes on: lucene/tools/src/java/org/apache/lucene/dependencies/GetMavenDependenciesTask.java ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +Date Author Id Revision HeadURL \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Index: solr/build.xml =================================================================== --- solr/build.xml (revision 1535303) +++ solr/build.xml (working copy) @@ -743,4 +743,10 @@ + + + + + +