Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-2427: Upgraded uima-core 2.3.1-SNAPSHOT jar to released uimaj-core 2.3.1; no longer publishing a Solr-specific uima-core Maven artifact; renamed UIMA jars to include their versions. 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1081880 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Steven Rowe 2011-03-15 17:46:17 +00:00
parent 987a9ef84c
commit 0d76f4e1ec
16 changed files with 29 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dev-tools/eclipse/dot.classpath
View File

@ -154,11 +154,11 @@
<classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-parsers-0.8.jar"/> <classpathentry kind="lib" path="solr/contrib/extraction/lib/tika-parsers-0.8.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/xmlbeans-2.3.0.jar"/> <classpathentry kind="lib" path="solr/contrib/extraction/lib/xmlbeans-2.3.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/uima/lib/commons-digester-2.0.jar"/> <classpathentry kind="lib" path="solr/contrib/uima/lib/commons-digester-2.0.jar"/>
<classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-alchemy.jar"/> <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-alchemy-2.3.1-SNAPSHOT-r1062868.jar"/>
<classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-calais.jar"/> <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-calais-2.3.1-SNAPSHOT-r1062868.jar"/>
<classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-tagger.jar"/> <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-tagger-2.3.1-SNAPSHOT-r1062868.jar"/>
<classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-wst.jar"/> <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-wst-2.3.1-SNAPSHOT-r1076132.jar"/>
<classpathentry kind="lib" path="solr/contrib/uima/lib/uima-core.jar"/> <classpathentry kind="lib" path="solr/contrib/uima/lib/uimaj-core-2.3.1.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

28
dev-tools/maven/pom.xml.template
View File

@ -278,9 +278,9 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.solr</groupId> <groupId>org.apache.uima</groupId>
<artifactId>solr-uima-core</artifactId> <artifactId>uimaj-core</artifactId>
<version>${project.version}</version> <version>2.3.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.velocity</groupId> <groupId>org.apache.velocity</groupId>
@ -708,7 +708,7 @@
<artifactId>solr-uima-an-alchemy</artifactId> <artifactId>solr-uima-an-alchemy</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<file>solr/contrib/uima/lib/uima-an-alchemy.jar</file> <file>solr/contrib/uima/lib/uima-an-alchemy-2.3.1-SNAPSHOT-r1062868.jar</file>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
@ -722,7 +722,7 @@
<artifactId>solr-uima-an-calais</artifactId> <artifactId>solr-uima-an-calais</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<file>solr/contrib/uima/lib/uima-an-calais.jar</file> <file>solr/contrib/uima/lib/uima-an-calais-2.3.1-SNAPSHOT-r1062868.jar</file>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
@ -736,7 +736,7 @@
<artifactId>solr-uima-an-tagger</artifactId> <artifactId>solr-uima-an-tagger</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<file>solr/contrib/uima/lib/uima-an-tagger.jar</file> <file>solr/contrib/uima/lib/uima-an-tagger-2.3.1-SNAPSHOT-r1062868.jar</file>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
@ -750,21 +750,7 @@
<artifactId>solr-uima-an-wst</artifactId> <artifactId>solr-uima-an-wst</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<file>solr/contrib/uima/lib/uima-an-wst.jar</file> <file>solr/contrib/uima/lib/uima-an-wst-2.3.1-SNAPSHOT-r1076132.jar</file>
</configuration>
</execution>
<execution>
<id>install-solr-uima-core</id>
<phase>install</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<groupId>org.apache.solr</groupId>
<artifactId>solr-uima-core</artifactId>
<version>${project.version}</version>
<packaging>jar</packaging>
<file>solr/contrib/uima/lib/uima-core.jar</file>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>

4
dev-tools/maven/solr/contrib/uima/pom.xml.template
View File

@ -91,8 +91,8 @@
<artifactId>solr-uima-an-wst</artifactId> <artifactId>solr-uima-an-wst</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.solr</groupId> <groupId>org.apache.uima</groupId>
<artifactId>solr-uima-core</artifactId> <artifactId>uimaj-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>

12
solr/build.xml
View File

@ -962,7 +962,6 @@
<sign-maven-dependency-artifacts artifact.id="solr-uima-an-calais" 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-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-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-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-analysis-extras" gpg.passphrase="${gpg.passphrase}"/>
<sign-maven-artifacts artifact.id="solr-cell" gpg.passphrase="${gpg.passphrase}"/> <sign-maven-artifacts artifact.id="solr-cell" gpg.passphrase="${gpg.passphrase}"/>
@ -1007,20 +1006,17 @@
jar.file="lib/apache-solr-noggit-r944541.jar" /> 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" <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" /> jar.file="contrib/uima/lib/uima-an-alchemy-2.3.1-SNAPSHOT-r1062868.jar" />
<m2-deploy-with-pom-template pom.xml="contrib/uima/lib/solr-uima-an-calais-pom.xml.template" <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" /> jar.file="contrib/uima/lib/uima-an-calais-2.3.1-SNAPSHOT-r1062868.jar" />
<m2-deploy-with-pom-template pom.xml="contrib/uima/lib/solr-uima-an-tagger-pom.xml.template" <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" /> jar.file="contrib/uima/lib/uima-an-tagger-2.3.1-SNAPSHOT-r1062868.jar" />
<m2-deploy-with-pom-template pom.xml="contrib/uima/lib/solr-uima-an-wst-pom.xml.template" <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" /> jar.file="contrib/uima/lib/uima-an-wst-2.3.1-SNAPSHOT-r1076132.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 ========== --> <!-- ========== SOLR ARTIFACTS ========== -->
<m2-deploy pom.xml="contrib/dataimporthandler/src/pom.xml" <m2-deploy pom.xml="contrib/dataimporthandler/src/pom.xml"

7
solr/contrib/uima/CHANGES.txt
View File

@ -11,7 +11,10 @@ Such fields could be language, concepts, keywords, sentences, named entities, et
UIMA Dependency UIMA Dependency
--------------- ---------------
uima-core, OpenCalaisAnnotator, WhitespaceTokenizer, HMMTagger, AlchemyAPIAnnotator uimaj-core v2.3.1
Current Version: 2.3.1-SNAPSHOT rev. 999276 OpenCalaisAnnotator v2.3.1-SNAPSHOT rev. 1062868
HMMTagger v2.3.1-SNAPSHOT rev. 1062868
AlchemyAPIAnnotator v2.3.1-SNAPSHOT rev. 1062868
WhitespaceTokenizer v2.3.1-SNAPSHOT rev. 1076132
$Id$ $Id$

2
solr/contrib/uima/lib/solr-uima-an-alchemy-pom.xml.template
View File

@ -31,6 +31,6 @@
<artifactId>solr-uima-an-alchemy</artifactId> <artifactId>solr-uima-an-alchemy</artifactId>
<name>Solr Specific UIMA Alchemy Annotator</name> <name>Solr Specific UIMA Alchemy Annotator</name>
<version>@version@</version> <version>@version@</version>
<description>Solr Specific UIMA Alchemy Annotator v2.3.1-SNAPSHOT</description> <description>Solr Specific UIMA Alchemy Annotator v2.3.1-SNAPSHOT-r1062868</description>
<packaging>jar</packaging> <packaging>jar</packaging>
</project> </project>

2
solr/contrib/uima/lib/solr-uima-an-calais-pom.xml.template
View File

@ -31,6 +31,6 @@
<artifactId>solr-uima-an-calais</artifactId> <artifactId>solr-uima-an-calais</artifactId>
<name>Solr Specific UIMA Open Calais Annotator</name> <name>Solr Specific UIMA Open Calais Annotator</name>
<version>@version@</version> <version>@version@</version>
<description>Solr Specific UIMA Open Calais Annotator v2.3.1-SNAPSHOT</description> <description>Solr Specific UIMA Open Calais Annotator v2.3.1-SNAPSHOT-r1062868</description>
<packaging>jar</packaging> <packaging>jar</packaging>
</project> </project>

2
solr/contrib/uima/lib/solr-uima-an-tagger-pom.xml.template
View File

@ -31,6 +31,6 @@
<artifactId>solr-uima-an-tagger</artifactId> <artifactId>solr-uima-an-tagger</artifactId>
<name>Solr Specific UIMA HMM Tagger</name> <name>Solr Specific UIMA HMM Tagger</name>
<version>@version@</version> <version>@version@</version>
<description>Solr Specific UIMA HMM Tagger v2.3.1-SNAPSHOT</description> <description>Solr Specific UIMA HMM Tagger v2.3.1-SNAPSHOT-r1062868</description>
<packaging>jar</packaging> <packaging>jar</packaging>
</project> </project>

2
solr/contrib/uima/lib/solr-uima-an-wst-pom.xml.template
View File

@ -31,6 +31,6 @@
<artifactId>solr-uima-an-wst</artifactId> <artifactId>solr-uima-an-wst</artifactId>
<name>Solr Specific UIMA Whitespace Tokenizer</name> <name>Solr Specific UIMA Whitespace Tokenizer</name>
<version>@version@</version> <version>@version@</version>
<description>Solr Specific UIMA Whitespace Tokenizer v2.3.1-SNAPSHOT</description> <description>Solr Specific UIMA Whitespace Tokenizer v2.3.1-SNAPSHOT-r1076132</description>
<packaging>jar</packaging> <packaging>jar</packaging>
</project> </project>

36
solr/contrib/uima/lib/solr-uima-core-pom.xml.template
View File

@ -1,36 +0,0 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<!--
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.
-->
<parent>
<groupId>org.apache.solr</groupId>
<artifactId>solr-parent</artifactId>
<version>@version@</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.solr</groupId>
<artifactId>solr-uima-core</artifactId>
<name>Solr Specific UIMA Core</name>
<version>@version@</version>
<description>Solr Specific UIMA Core v2.3.1-SNAPSHOT</description>
<packaging>jar</packaging>
</project>

0
solr/contrib/uima/lib/uima-an-alchemy.jar → solr/contrib/uima/lib/uima-an-alchemy-2.3.1-SNAPSHOT-r1062868.jar
View File

0
solr/contrib/uima/lib/uima-an-calais.jar → solr/contrib/uima/lib/uima-an-calais-2.3.1-SNAPSHOT-r1062868.jar
View File

0
solr/contrib/uima/lib/uima-an-tagger.jar → solr/contrib/uima/lib/uima-an-tagger-2.3.1-SNAPSHOT-r1062868.jar
View File

0
solr/contrib/uima/lib/uima-an-wst.jar → solr/contrib/uima/lib/uima-an-wst-2.3.1-SNAPSHOT-r1076132.jar
View File

2
solr/contrib/uima/lib/uima-core.jar
View File

@ -1,2 +0,0 @@
AnyObjectId[72991424bdfe4776f66feab7ff4e8564f12d2659] was removed in git history.
Apache SVN contains full history.

2
solr/contrib/uima/lib/uimaj-core-2.3.1.jar Normal file
View File

@ -0,0 +1,2 @@
AnyObjectId[e876a9749eed73ec2c95b83cf534d7a373130569] was removed in git history.
Apache SVN contains full history.