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/09/08 17:01:32 UTC
svn commit: r1166730 - in /lucene/dev/branches/branch_3x: ./
dev-tools/eclipse/ dev-tools/maven/ dev-tools/maven/solr/contrib/uima/
lucene/ lucene/backwards/ lucene/backwards/src/test-framework/
lucene/backwards/src/test/ solr/ solr/contrib/uima/ solr/...
Author: sarowe
Date: Thu Sep 8 15:01:31 2011
New Revision: 1166730
URL: http://svn.apache.org/viewvc?rev=1166730&view=rev
Log:
SOLR-2746: Upgraded UIMA dependencies in solr/contrib/uima/lib/ from *-2.3.1-SNAPSHOT.jar to *-2.3.1.jar
Added:
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/uima-an-alchemy-2.3.1.jar
- copied unchanged from r1166702, lucene/dev/trunk/solr/contrib/uima/lib/uima-an-alchemy-2.3.1.jar
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/uima-an-calais-2.3.1.jar
- copied unchanged from r1166702, lucene/dev/trunk/solr/contrib/uima/lib/uima-an-calais-2.3.1.jar
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/uima-an-tagger-2.3.1.jar
- copied unchanged from r1166702, lucene/dev/trunk/solr/contrib/uima/lib/uima-an-tagger-2.3.1.jar
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/uima-an-wst-2.3.1.jar
- copied unchanged from r1166702, lucene/dev/trunk/solr/contrib/uima/lib/uima-an-wst-2.3.1.jar
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
lucene/dev/branches/branch_3x/dev-tools/maven/pom.xml.template
lucene/dev/branches/branch_3x/dev-tools/maven/solr/contrib/uima/pom.xml.template
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test-framework/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/contrib/uima/CHANGES.txt
lucene/dev/branches/branch_3x/solr/contrib/uima/build.xml
lucene/dev/branches/branch_3x/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
lucene/dev/branches/branch_3x/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
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/uima-an-alchemy-2.3.1-SNAPSHOT-r1062868.jar
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/uima-an-calais-2.3.1-SNAPSHOT-r1062868.jar
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/uima-an-tagger-2.3.1-SNAPSHOT-r1062868.jar
lucene/dev/branches/branch_3x/solr/contrib/uima/lib/uima-an-wst-2.3.1-SNAPSHOT-r1076132.jar
Modified: lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath?rev=1166730&r1=1166729&r2=1166730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/branch_3x/dev-tools/eclipse/dot.classpath Thu Sep 8 15:01:31 2011
@@ -141,10 +141,10 @@
<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-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/uima-an-alchemy-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-calais-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-tagger-2.3.1.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/uima/lib/uima-an-wst-2.3.1.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"/>
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=1166730&r1=1166729&r2=1166730&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 Thu Sep 8 15:01:31 2011
@@ -240,24 +240,24 @@
<version>${tika.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-uima-an-alchemy</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>AlchemyAPIAnnotator</artifactId>
+ <version>2.3.1</version>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-uima-an-calais</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>OpenCalaisAnnotator</artifactId>
+ <version>2.3.1</version>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-uima-an-tagger</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>Tagger</artifactId>
+ <version>2.3.1</version>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-uima-an-wst</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>WhitespaceTokenizer</artifactId>
+ <version>2.3.1</version>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
@@ -693,62 +693,6 @@
</configuration>
</execution>
<execution>
- <id>install-solr-uima-an-alchemy</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-uima-an-alchemy</artifactId>
- <version>${project.version}</version>
- <packaging>jar</packaging>
- <file>solr/contrib/uima/lib/uima-an-alchemy-2.3.1-SNAPSHOT-r1062868.jar</file>
- </configuration>
- </execution>
- <execution>
- <id>install-solr-uima-an-calais</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-uima-an-calais</artifactId>
- <version>${project.version}</version>
- <packaging>jar</packaging>
- <file>solr/contrib/uima/lib/uima-an-calais-2.3.1-SNAPSHOT-r1062868.jar</file>
- </configuration>
- </execution>
- <execution>
- <id>install-solr-uima-an-tagger</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-uima-an-tagger</artifactId>
- <version>${project.version}</version>
- <packaging>jar</packaging>
- <file>solr/contrib/uima/lib/uima-an-tagger-2.3.1-SNAPSHOT-r1062868.jar</file>
- </configuration>
- </execution>
- <execution>
- <id>install-solr-uima-an-wst</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-uima-an-wst</artifactId>
- <version>${project.version}</version>
- <packaging>jar</packaging>
- <file>solr/contrib/uima/lib/uima-an-wst-2.3.1-SNAPSHOT-r1076132.jar</file>
- </configuration>
- </execution>
- <execution>
<id>install-jetty</id>
<phase>install</phase>
<goals>
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=1166730&r1=1166729&r2=1166730&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 Thu Sep 8 15:01:31 2011
@@ -72,20 +72,20 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-uima-an-alchemy</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>AlchemyAPIAnnotator</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-uima-an-calais</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>OpenCalaisAnnotator</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-uima-an-wst</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>Tagger</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.solr</groupId>
- <artifactId>solr-uima-an-tagger</artifactId>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>WhitespaceTokenizer</artifactId>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
Modified: lucene/dev/branches/branch_3x/solr/contrib/uima/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/uima/CHANGES.txt?rev=1166730&r1=1166729&r2=1166730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/uima/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/uima/CHANGES.txt Thu Sep 8 15:01:31 2011
@@ -12,16 +12,19 @@ Such fields could be language, concepts,
UIMA Dependency
---------------
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
+OpenCalaisAnnotator v2.3.1
+HMMTagger v2.3.1
+AlchemyAPIAnnotator v2.3.1
+WhitespaceTokenizer v2.3.1
$Id$
================== 3.5.0 ==================
-(No Changes)
+Other Changes
+----------------------
+
+* SOLR-2746: Upgraded dependencies from *-2.3.1-SNAPSHOT.jar to *-2.3.1.jar.
================== 3.4.0 ==================
Modified: lucene/dev/branches/branch_3x/solr/contrib/uima/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/contrib/uima/build.xml?rev=1166730&r1=1166729&r2=1166730&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/contrib/uima/build.xml (original)
+++ lucene/dev/branches/branch_3x/solr/contrib/uima/build.xml Thu Sep 8 15:01:31 2011
@@ -25,20 +25,4 @@
<import file="../contrib-build.xml"/>
- <dirname file="${ant.file}" property="antfile.dir"/>
-
- <target name="dist-maven" depends="contrib-build.dist-maven">
- <m2-deploy-with-pom-template pom.xml="${antfile.dir}/lib/solr-uima-an-alchemy-pom.xml.template"
- jar.file="${antfile.dir}/lib/uima-an-alchemy-2.3.1-SNAPSHOT-r1062868.jar" />
-
- <m2-deploy-with-pom-template pom.xml="${antfile.dir}/lib/solr-uima-an-calais-pom.xml.template"
- jar.file="${antfile.dir}/lib/uima-an-calais-2.3.1-SNAPSHOT-r1062868.jar" />
-
- <m2-deploy-with-pom-template pom.xml="${antfile.dir}/lib/solr-uima-an-tagger-pom.xml.template"
- jar.file="${antfile.dir}/lib/uima-an-tagger-2.3.1-SNAPSHOT-r1062868.jar" />
-
- <m2-deploy-with-pom-template pom.xml="${antfile.dir}/lib/solr-uima-an-wst-pom.xml.template"
- jar.file="${antfile.dir}/lib/uima-an-wst-2.3.1-SNAPSHOT-r1076132.jar" />
-
- </target>
</project>