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/15 18:04:08 UTC
svn commit: r1081856 - in /lucene/dev/branches/lucene_solr_3_1:
dev-tools/eclipse/ dev-tools/maven/ dev-tools/maven/solr/contrib/uima/
solr/ solr/contrib/uima/ solr/contrib/uima/lib/
Author: sarowe
Date: Tue Mar 15 17:04:07 2011
New Revision: 1081856
URL: http://svn.apache.org/viewvc?rev=1081856&view=rev
Log:
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.
Added:
lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/uima-an-alchemy-2.3.1-SNAPSHOT-r1062868.jar
- copied unchanged from r1081819, lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/uima-an-alchemy.jar
lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/uima-an-calais-2.3.1-SNAPSHOT-r1062868.jar
- copied unchanged from r1081819, lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/uima-an-calais.jar
lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/uima-an-tagger-2.3.1-SNAPSHOT-r1062868.jar
- copied unchanged from r1081819, lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/uima-an-tagger.jar
lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/uima-an-wst-2.3.1-SNAPSHOT-r1076132.jar
- copied unchanged from r1081819, lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/uima-an-wst.jar
lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/uimaj-core-2.3.1.jar (with props)
Removed:
lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-core-pom.xml.template
lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/uima-an-alchemy.jar
lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/uima-an-calais.jar
lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/uima-an-tagger.jar
lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/uima-an-wst.jar
lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/uima-core.jar
Modified:
lucene/dev/branches/lucene_solr_3_1/dev-tools/eclipse/dot.classpath
lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/pom.xml.template
lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/solr/contrib/uima/pom.xml.template
lucene/dev/branches/lucene_solr_3_1/solr/build.xml
lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/CHANGES.txt
lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-alchemy-pom.xml.template
lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-calais-pom.xml.template
lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-tagger-pom.xml.template
lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-wst-pom.xml.template
Modified: lucene/dev/branches/lucene_solr_3_1/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/dev-tools/eclipse/dot.classpath?rev=1081856&r1=1081855&r2=1081856&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/lucene_solr_3_1/dev-tools/eclipse/dot.classpath Tue Mar 15 17:04:07 2011
@@ -151,11 +151,11 @@
<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/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-calais.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-tagger.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-wst.jar"/>
- <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-core.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-2.3.1-SNAPSHOT-r1062868.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-2.3.1-SNAPSHOT-r1076132.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="output" path="bin"/>
</classpath>
Modified: lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/pom.xml.template?rev=1081856&r1=1081855&r2=1081856&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/pom.xml.template Tue Mar 15 17:04:07 2011
@@ -277,9 +277,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-uima-core</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
+ <version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
@@ -751,7 +751,7 @@
<artifactId>solr-uima-an-alchemy</artifactId>
<version>${project.version}</version>
<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>
</execution>
<execution>
@@ -765,7 +765,7 @@
<artifactId>solr-uima-an-calais</artifactId>
<version>${project.version}</version>
<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>
</execution>
<execution>
@@ -779,7 +779,7 @@
<artifactId>solr-uima-an-tagger</artifactId>
<version>${project.version}</version>
<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>
</execution>
<execution>
@@ -793,21 +793,7 @@
<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-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>
+ <file>solr/contrib/uima/lib/uima-an-wst-2.3.1-SNAPSHOT-r1076132.jar</file>
</configuration>
</execution>
<execution>
Modified: lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1081856&r1=1081855&r2=1081856&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/branches/lucene_solr_3_1/dev-tools/maven/solr/contrib/uima/pom.xml.template Tue Mar 15 17:04:07 2011
@@ -91,8 +91,8 @@
<artifactId>solr-uima-an-tagger</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-uima-core</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>uimaj-core</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: lucene/dev/branches/lucene_solr_3_1/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/build.xml?rev=1081856&r1=1081855&r2=1081856&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/build.xml (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/build.xml Tue Mar 15 17:04:07 2011
@@ -958,7 +958,6 @@
<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-dependency-artifacts artifact.id="solr-carrot2-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}"/>
@@ -1004,20 +1003,17 @@
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" />
+ 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"
- 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"
- 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"
- 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" />
-
<m2-deploy-with-pom-template pom.xml="contrib/clustering/lib/solr-carrot2-core-pom.xml.template"
jar.file="contrib/clustering/lib/carrot2-core-3.4.2.jar" />
Modified: lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/CHANGES.txt?rev=1081856&r1=1081855&r2=1081856&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/CHANGES.txt Tue Mar 15 17:04:07 2011
@@ -11,7 +11,10 @@ Such fields could be language, concepts,
UIMA Dependency
---------------
-uima-core, OpenCalaisAnnotator, WhitespaceTokenizer, HMMTagger, AlchemyAPIAnnotator
-Current Version: 2.3.1-SNAPSHOT rev. 999276
+uimaj-core v2.3.1
+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$
Modified: lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-alchemy-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-alchemy-pom.xml.template?rev=1081856&r1=1081855&r2=1081856&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-alchemy-pom.xml.template (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-alchemy-pom.xml.template Tue Mar 15 17:04:07 2011
@@ -31,6 +31,6 @@
<artifactId>solr-uima-an-alchemy</artifactId>
<name>Solr Specific UIMA Alchemy Annotator</name>
<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>
</project>
Modified: lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-calais-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-calais-pom.xml.template?rev=1081856&r1=1081855&r2=1081856&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-calais-pom.xml.template (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-calais-pom.xml.template Tue Mar 15 17:04:07 2011
@@ -31,6 +31,6 @@
<artifactId>solr-uima-an-calais</artifactId>
<name>Solr Specific UIMA Open Calais Annotator</name>
<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>
</project>
Modified: lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-tagger-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-tagger-pom.xml.template?rev=1081856&r1=1081855&r2=1081856&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-tagger-pom.xml.template (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-tagger-pom.xml.template Tue Mar 15 17:04:07 2011
@@ -31,6 +31,6 @@
<artifactId>solr-uima-an-tagger</artifactId>
<name>Solr Specific UIMA HMM Tagger</name>
<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>
</project>
Modified: lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-wst-pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-wst-pom.xml.template?rev=1081856&r1=1081855&r2=1081856&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-wst-pom.xml.template (original)
+++ lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/solr-uima-an-wst-pom.xml.template Tue Mar 15 17:04:07 2011
@@ -31,6 +31,6 @@
<artifactId>solr-uima-an-wst</artifactId>
<name>Solr Specific UIMA Whitespace Tokenizer</name>
<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>
</project>
Added: lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/uimaj-core-2.3.1.jar
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_3_1/solr/contrib/uima/lib/uimaj-core-2.3.1.jar?rev=1081856&view=auto
==============================================================================
Binary file - no diff available.