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 2011/03/11 07:32:43 UTC
svn commit: r1080461 - in /lucene/dev/branches/branch_3x: ./
dev-tools/maven/ dev-tools/maven/lucene/contrib/benchmark/
dev-tools/maven/lucene/contrib/icu/
dev-tools/maven/solr/contrib/dataimporthandler/src/extras/
dev-tools/maven/solr/contrib/extracti...
Author: sarowe
Date: Fri Mar 11 06:32:42 2011
New Revision: 1080461
URL: http://svn.apache.org/viewvc?rev=1080461&view=rev
Log:
LUCENE-2957: generate-maven-artifacts target should include all non-Mavenized Lucene & Solr dependencies
Added:
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/lib/lucene-xercesImpl-pom.xml.template
- copied unchanged from r1080443, lucene/dev/trunk/modules/benchmark/lib/lucene-xercesImpl-pom.xml.template
lucene/dev/branches/branch_3x/lucene/contrib/icu/lib/lucene-icu4j-pom.xml.template
- copied unchanged from r1080443, lucene/dev/trunk/modules/analysis/icu/lib/lucene-icu4j-pom.xml.template
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/solr-uima-an-alchemy-pom.xml.template
- copied unchanged from r1080443, lucene/dev/trunk/solr/contrib/uima/lib/solr-uima-an-alchemy-pom.xml.template
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/solr-uima-an-calais-pom.xml.template
- copied unchanged from r1080443, lucene/dev/trunk/solr/contrib/uima/lib/solr-uima-an-calais-pom.xml.template
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/solr-uima-an-tagger-pom.xml.template
- copied unchanged from r1080443, lucene/dev/trunk/solr/contrib/uima/lib/solr-uima-an-tagger-pom.xml.template
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/solr-uima-an-wst-pom.xml.template
- copied unchanged from r1080443, lucene/dev/trunk/solr/contrib/uima/lib/solr-uima-an-wst-pom.xml.template
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/solr-uima-core-pom.xml.template
- copied unchanged from r1080443, lucene/dev/trunk/solr/contrib/uima/lib/solr-uima-core-pom.xml.template
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/benchmark/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/icu/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/extraction/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/uima/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/webapp/pom.xml.template
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/common-build.xml
lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml
lucene/dev/branches/branch_3x/lucene/contrib/icu/build.xml
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/build.xml
lucene/dev/branches/branch_3x/solr/lib/apache-solr-noggit-pom.xml.template
lucene/dev/branches/branch_3x/solr/lib/solr-commons-csv-pom.xml.template
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/benchmark/pom.xml.template?rev=1080461&r1=1080460&r2=1080461&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/benchmark/pom.xml.template Fri Mar 11 06:32:42 2011
@@ -84,8 +84,8 @@
<artifactId>commons-logging</artifactId>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/icu/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/icu/pom.xml.template?rev=1080461&r1=1080460&r2=1080461&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/icu/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/lucene/contrib/icu/pom.xml.template Fri Mar 11 06:32:42 2011
@@ -71,8 +71,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-icu4j</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template?rev=1080461&r1=1080460&r2=1080461&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template Fri Mar 11 06:32:42 2011
@@ -44,7 +44,6 @@
<patched.jetty.version>6.1.26-patched-JETTY-1340</patched.jetty.version>
<slf4j.version>1.5.5</slf4j.version>
<tika.version>0.8</tika.version>
- <uima.version>${project.version}</uima.version>
</properties>
<issueManagement>
<system>JIRA</system>
@@ -128,9 +127,9 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>4.6</version>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-icu4j</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.sleepycat</groupId>
@@ -259,28 +258,28 @@
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-alchemy-annotator</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-an-alchemy</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-OpenCalaisAnnotator</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-an-calais</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-Tagger</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-an-tagger</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-WhitespaceTokenizer</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-an-wst</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-uimaj-core</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -363,9 +362,9 @@
<version>${slf4j.version}</version>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1-patched-XERCESJ-1257</version>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-xercesImpl</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -620,9 +619,9 @@
<goal>install-file</goal>
</goals>
<configuration>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
- <version>4.6</version>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-icu4j</artifactId>
+ <version>${project.version}</version>
<packaging>jar</packaging>
<file>lucene/contrib/icu/lib/icu4j-4_6.jar</file>
</configuration>
@@ -634,9 +633,9 @@
<goal>install-file</goal>
</goals>
<configuration>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- <version>2.9.1-patched-XERCESJ-1257</version>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-xercesImpl</artifactId>
+ <version>${project.version}</version>
<packaging>jar</packaging>
<file>lucene/contrib/benchmark/lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar</file>
</configuration>
@@ -717,71 +716,71 @@
</configuration>
</execution>
<execution>
- <id>install-solr-uima-alchemy-annotator</id>
+ <id>install-solr-uima-an-alchemy</id>
<phase>install</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-alchemy-annotator</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-an-alchemy</artifactId>
+ <version>${project.version}</version>
<packaging>jar</packaging>
<file>solr/contrib/uima/lib/uima-an-alchemy.jar</file>
</configuration>
</execution>
<execution>
- <id>install-solr-uima-OpenCalaisAnnotator</id>
+ <id>install-solr-uima-an-calais</id>
<phase>install</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-OpenCalaisAnnotator</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-an-calais</artifactId>
+ <version>${project.version}</version>
<packaging>jar</packaging>
<file>solr/contrib/uima/lib/uima-an-calais.jar</file>
</configuration>
</execution>
<execution>
- <id>install-solr-uima-Tagger</id>
+ <id>install-solr-uima-an-tagger</id>
<phase>install</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-Tagger</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-an-tagger</artifactId>
+ <version>${project.version}</version>
<packaging>jar</packaging>
<file>solr/contrib/uima/lib/uima-an-tagger.jar</file>
</configuration>
</execution>
<execution>
- <id>install-solr-uima-WhitespaceTokenizer</id>
+ <id>install-solr-uima-an-wst</id>
<phase>install</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-WhitespaceTokenizer</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-an-wst</artifactId>
+ <version>${project.version}</version>
<packaging>jar</packaging>
<file>solr/contrib/uima/lib/uima-an-wst.jar</file>
</configuration>
</execution>
<execution>
- <id>install-solr-uima-uimaj-core</id>
+ <id>install-solr-uima-core</id>
<phase>install</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-uimaj-core</artifactId>
- <version>${uima.version}</version>
+ <artifactId>solr-uima-core</artifactId>
+ <version>${project.version}</version>
<packaging>jar</packaging>
<file>solr/contrib/uima/lib/uima-core.jar</file>
</configuration>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template?rev=1080461&r1=1080460&r2=1080461&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/dataimporthandler/src/extras/pom.xml.template Fri Mar 11 06:32:42 2011
@@ -94,8 +94,8 @@
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1080461&r1=1080460&r2=1080461&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/extraction/pom.xml.template Fri Mar 11 06:32:42 2011
@@ -70,8 +70,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.ibm.icu</groupId>
- <artifactId>icu4j</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-icu4j</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
@@ -83,8 +83,8 @@
<artifactId>tika-parsers</artifactId>
</dependency>
<dependency>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1080461&r1=1080460&r2=1080461&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/uima/pom.xml.template Fri Mar 11 06:32:42 2011
@@ -76,23 +76,23 @@
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-alchemy-annotator</artifactId>
+ <artifactId>solr-uima-an-alchemy</artifactId>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-OpenCalaisAnnotator</artifactId>
+ <artifactId>solr-uima-an-calais</artifactId>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-WhitespaceTokenizer</artifactId>
+ <artifactId>solr-uima-an-wst</artifactId>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-Tagger</artifactId>
+ <artifactId>solr-uima-an-tagger</artifactId>
</dependency>
<dependency>
<groupId>org.apache.solr</groupId>
- <artifactId>uima-uimaj-core</artifactId>
+ <artifactId>solr-uima-core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml.template?rev=1080461&r1=1080460&r2=1080461&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/pom.xml.template Fri Mar 11 06:32:42 2011
@@ -127,10 +127,12 @@
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
+ <optional>true</optional> <!-- Only used for tests and one command-line utility: JettySolrRunner -->
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty-util</artifactId>
+ <optional>true</optional> <!-- Only used for tests and one command-line utility: JettySolrRunner -->
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
Modified: lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/webapp/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/webapp/pom.xml.template?rev=1080461&r1=1080460&r2=1080461&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/webapp/pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/dev-tools/maven/solr/src/webapp/pom.xml.template Fri Mar 11 06:32:42 2011
@@ -94,14 +94,6 @@
<artifactId>struts-tiles</artifactId>
</exclusion>
<exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</exclusion>
Modified: lucene/dev/branches/branch_3x/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/common-build.xml?rev=1080461&r1=1080460&r2=1080461&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/common-build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/common-build.xml Fri Mar 11 06:32:42 2011
@@ -27,6 +27,7 @@
<property name="dev-tools.dir" value="${common.dir}/../dev-tools"/>
<property name="prettify.dir" value="${dev-tools.dir}/prettify"/>
+ <property name="maven.build.dir" value="${common.dir}/build/maven"/>
<!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it -->
@@ -330,7 +331,27 @@
<pom refid="maven.project"/>
</artifact:deploy>
</sequential>
- </macrodef>
+ </macrodef>
+
+ <macrodef name="m2-deploy-with-pom-template" description="Builds a Maven artifact given a POM template">
+ <attribute name="pom.xml"/>
+ <attribute name="jar.file"/>
+ <sequential>
+ <copy file="@{pom.xml}" tofile="${maven.build.dir}/@{pom.xml}">
+ <filterset begintoken="@" endtoken="@">
+ <filter token="version" value="${version}"/>
+ </filterset>
+ </copy>
+ <artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
+ <artifact:pom id="maven.project" file="${maven.build.dir}/@{pom.xml}" />
+ <artifact:deploy file="@{jar.file}">
+ <remoteRepository url="${m2.repository.url}">
+ <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}"/>
+ </remoteRepository>
+ <pom refid="maven.project"/>
+ </artifact:deploy>
+ </sequential>
+ </macrodef>
<macrodef name="build-manifest" description="Builds a manifest file">
<attribute name="title" default="Lucene Search Engine: ${ant.project.name}" />
Modified: lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml?rev=1080461&r1=1080460&r2=1080461&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/benchmark/build.xml Fri Mar 11 06:32:42 2011
@@ -260,4 +260,8 @@
/>
</target>
+ <target name="dist-maven" depends="contrib-build.dist-maven">
+ <m2-deploy-with-pom-template pom.xml="lib/lucene-xercesImpl-pom.xml.template"
+ jar.file="lib/xercesImpl-2.9.1-patched-XERCESJ-1257.jar" />
+ </target>
</project>
Modified: lucene/dev/branches/branch_3x/lucene/contrib/icu/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/icu/build.xml?rev=1080461&r1=1080460&r2=1080461&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/icu/build.xml (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/icu/build.xml Fri Mar 11 06:32:42 2011
@@ -105,4 +105,9 @@ are part of the ICU4C package. See http:
<classpath refid="classpath"/>
</compile>
</target>
+
+ <target name="dist-maven" depends="contrib-build.dist-maven">
+ <m2-deploy-with-pom-template pom.xml="lib/lucene-icu4j-pom.xml.template"
+ jar.file="lib/icu4j-4_6.jar" />
+ </target>
</project>
Modified: lucene/dev/branches/branch_3x/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/build.xml?rev=1080461&r1=1080460&r2=1080461&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/build.xml Fri Mar 11 06:32:42 2011
@@ -948,6 +948,11 @@
<!-- Maven artifacts -->
<sign-maven-dependency-artifacts artifact.id="solr-commons-csv" gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-dependency-artifacts artifact.id="solr-noggit" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-maven-dependency-artifacts artifact.id="solr-uima-an-alchemy" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-maven-dependency-artifacts artifact.id="solr-uima-an-calais" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-maven-dependency-artifacts artifact.id="solr-uima-an-tagger" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-maven-dependency-artifacts artifact.id="solr-uima-an-wst" gpg.passphrase="${gpg.passphrase}"/>
+ <sign-maven-dependency-artifacts artifact.id="solr-uima-core" gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-war-artifacts artifact.id="solr" gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-artifacts artifact.id="solr-analysis-extras" gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-artifacts artifact.id="solr-cell" gpg.passphrase="${gpg.passphrase}"/>
@@ -983,14 +988,29 @@
<m2-deploy pom.xml="pom.xml"/>
- <!-- ========== SOLR SPECIFIC COMMONS CSV ========== -->
+ <!-- ========== SOLR SPECIFIC NON-MAVENIZED DEPENDENCIES ========== -->
<m2-deploy-with-pom-template pom.xml="lib/solr-commons-csv-pom.xml.template"
jar.file="lib/commons-csv-1.0-SNAPSHOT-r966014.jar" />
- <!-- ========== SOLR ARTIFACTS ========== -->
-
<m2-deploy-with-pom-template pom.xml="lib/apache-solr-noggit-pom.xml.template"
jar.file="lib/apache-solr-noggit-r944541.jar" />
+
+ <m2-deploy-with-pom-template pom.xml="contrib/uima/lib/solr-uima-an-alchemy-pom.xml.template"
+ jar.file="contrib/uima/lib/uima-an-alchemy.jar" />
+
+ <m2-deploy-with-pom-template pom.xml="contrib/uima/lib/solr-uima-an-calais-pom.xml.template"
+ jar.file="contrib/uima/lib/uima-an-calais.jar" />
+
+ <m2-deploy-with-pom-template pom.xml="contrib/uima/lib/solr-uima-an-tagger-pom.xml.template"
+ jar.file="contrib/uima/lib/uima-an-tagger.jar" />
+
+ <m2-deploy-with-pom-template pom.xml="contrib/uima/lib/solr-uima-an-wst-pom.xml.template"
+ jar.file="contrib/uima/lib/uima-an-wst.jar" />
+
+ <m2-deploy-with-pom-template pom.xml="contrib/uima/lib/solr-uima-core-pom.xml.template"
+ jar.file="contrib/uima/lib/uima-core.jar" />
+
+ <!-- ========== SOLR ARTIFACTS ========== -->
<m2-deploy pom.xml="contrib/dataimporthandler/src/pom.xml"
jar.file="${dist}/apache-solr-dataimporthandler-${version}.jar">
Modified: lucene/dev/branches/branch_3x/solr/lib/apache-solr-noggit-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/apache-solr-noggit-pom.xml.template?rev=1080461&r1=1080460&r2=1080461&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/apache-solr-noggit-pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/solr/lib/apache-solr-noggit-pom.xml.template Fri Mar 11 06:32:42 2011
@@ -31,6 +31,6 @@
<artifactId>solr-noggit</artifactId>
<name>Solr Specific Noggit</name>
<version>@version@</version>
- <description>Solr Specific Noggit</description>
+ <description>Solr Specific Noggit r944541</description>
<packaging>jar</packaging>
</project>
Modified: lucene/dev/branches/branch_3x/solr/lib/solr-commons-csv-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/lib/solr-commons-csv-pom.xml.template?rev=1080461&r1=1080460&r2=1080461&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/lib/solr-commons-csv-pom.xml.template (original)
+++ lucene/dev/branches/branch_3x/solr/lib/solr-commons-csv-pom.xml.template Fri Mar 11 06:32:42 2011
@@ -31,6 +31,6 @@
<artifactId>solr-commons-csv</artifactId>
<name>Solr Specific Commons CSV</name>
<version>@version@</version>
- <description>Solr Specific Commons CSV</description>
+ <description>Solr Specific Commons CSV v1.0-SNAPSHOT-r966014</description>
<packaging>jar</packaging>
</project>