lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sar...@apache.org
Subject svn commit: r1062936 - in /lucene/dev/trunk: ./ dev-tools/maven/ dev-tools/maven/solr/contrib/ dev-tools/maven/solr/contrib/uima/ lucene/ modules/ solr/ solr/contrib/uima/
Date Mon, 24 Jan 2011 19:33:15 GMT
Author: sarowe
Date: Mon Jan 24 19:33:14 2011
New Revision: 1062936

URL: http://svn.apache.org/viewvc?rev=1062936&view=rev
Log:
added support for maven artifact generation of the new Solr UIMA contrib; the top-level get-maven-poms
target now forces copying of all of the source pom.xml files, even if the source is not newer
than the target files, so that version changes will always take effect when specified through
the -Dversion ant cmdline option

Added:
    lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/
    lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template
Removed:
    lucene/dev/trunk/solr/contrib/uima/solr-uima-pom.xml.template
Modified:
    lucene/dev/trunk/build.xml
    lucene/dev/trunk/dev-tools/maven/pom.xml.template
    lucene/dev/trunk/dev-tools/maven/solr/contrib/pom.xml.template
    lucene/dev/trunk/lucene/build.xml
    lucene/dev/trunk/modules/build.xml
    lucene/dev/trunk/solr/build.xml

Modified: lucene/dev/trunk/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/build.xml?rev=1062936&r1=1062935&r2=1062936&view=diff
==============================================================================
--- lucene/dev/trunk/build.xml (original)
+++ lucene/dev/trunk/build.xml Mon Jan 24 19:33:14 2011
@@ -41,7 +41,7 @@
   <property name="version" value="4.0-SNAPSHOT"/>
   <target name="get-maven-poms" 
           description="Copy Maven POMs from dev-tools/maven/ to their target locations">
-    <copy todir=".">
+    <copy todir="." overwrite="true">
       <fileset dir="${basedir}/dev-tools/maven"/>
       <filterset begintoken="@" endtoken="@">
         <filter token="version" value="${version}"/>

Modified: lucene/dev/trunk/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?rev=1062936&r1=1062935&r2=1062936&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Mon Jan 24 19:33:14 2011
@@ -41,6 +41,10 @@
     <base.specification.version>4.0.0</base.specification.version>
     <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
     <java.compat.version>1.5</java.compat.version>
+    <jetty.version>6.1.26</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>
@@ -246,12 +250,37 @@
       <dependency>
         <groupId>org.apache.tika</groupId>
         <artifactId>tika-core</artifactId>
-        <version>0.8</version>
+        <version>${tika.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.tika</groupId>
         <artifactId>tika-parsers</artifactId>
-        <version>0.8</version>
+        <version>${tika.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.solr</groupId>
+        <artifactId>uima-alchemy-annotator</artifactId>
+        <version>${uima.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.solr</groupId>
+        <artifactId>uima-OpenCalaisAnnotator</artifactId>
+        <version>${uima.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.solr</groupId>
+        <artifactId>uima-Tagger</artifactId>
+        <version>${uima.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.solr</groupId>
+        <artifactId>uima-WhitespaceTokenizer</artifactId>
+        <version>${uima.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.solr</groupId>
+        <artifactId>uima-uimaj-core</artifactId>
+        <version>${uima.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.velocity</groupId>
@@ -286,12 +315,12 @@
       <dependency>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty</artifactId>
-        <version>6.1.26</version>
+        <version>${jetty.version}</version>
       </dependency>
       <dependency>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jetty-util</artifactId>
-        <version>6.1.26</version>
+        <version>${jetty.version}</version>
       </dependency>
       <dependency>
         <groupId>org.mortbay.jetty</groupId>
@@ -301,7 +330,7 @@
       <dependency>
         <groupId>org.mortbay.jetty</groupId>
         <artifactId>jsp-2.1-jetty</artifactId>
-        <version>6.1.26</version>
+        <version>${jetty.version}</version>
       </dependency>
       <dependency>
         <groupId>org.mortbay.jetty</groupId>
@@ -311,24 +340,29 @@
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>jcl-over-slf4j</artifactId>
-        <version>1.5.5</version>
+        <version>${slf4j.version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>log4j-over-slf4j</artifactId>
-        <version>1.5.5</version>
+        <version>${slf4j.version}</version>
       </dependency>
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.5.5</version>
+        <version>${slf4j.version}</version>
       </dependency> 
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-jdk14</artifactId>
-        <version>1.5.5</version>
+        <version>${slf4j.version}</version>
       </dependency> 
       <dependency>
+        <groupId>org.slf4j</groupId>
+        <artifactId>slf4j-simple</artifactId>
+        <version>${slf4j.version}</version>
+      </dependency>
+      <dependency>
         <groupId>xerces</groupId>
         <artifactId>xercesImpl</artifactId>
         <version>2.10.0</version>
@@ -480,7 +514,7 @@
         <plugin>
           <groupId>org.mortbay.jetty</groupId>
           <artifactId>maven-jetty-plugin</artifactId>
-          <version>6.1.26</version>
+          <version>${jetty.version}</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.gmaven</groupId>
@@ -681,6 +715,76 @@
                   <file>solr/lib/apache-solr-noggit-r944541.jar</file>
                 </configuration>  
               </execution>
+              <execution>
+                <id>install-solr-uima-alchemy-annotator</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>
+                  <packaging>jar</packaging>
+                  <file>solr/contrib/uima/lib/uima-an-alchemy.jar</file>
+                </configuration>  
+              </execution>
+              <execution>
+                <id>install-solr-uima-OpenCalaisAnnotator</id>
+                <phase>install</phase>
+                <goals>
+                  <goal>install-file</goal>
+                </goals>
+                <configuration>
+                  <groupId>org.apache.solr</groupId>
+                  <artifactId>uima-OpenCalaisAnnotator</artifactId>
+                  <version>${uima.version}</version>
+                  <packaging>jar</packaging>
+                  <file>solr/contrib/uima/lib/uima-an-calais.jar</file>
+                </configuration>  
+              </execution>
+              <execution>
+                <id>install-solr-uima-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>
+                  <packaging>jar</packaging>
+                  <file>solr/contrib/uima/lib/uima-an-tagger.jar</file>
+                </configuration>  
+              </execution>
+              <execution>
+                <id>install-solr-uima-WhitespaceTokenizer</id>
+                <phase>install</phase>
+                <goals>
+                  <goal>install-file</goal>
+                </goals>
+                <configuration>
+                  <groupId>org.apache.solr</groupId>
+                  <artifactId>uima-WhitespaceTokenizer</artifactId>
+                  <version>${uima.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>
+                <phase>install</phase>
+                <goals>
+                  <goal>install-file</goal>
+                </goals>
+                <configuration>
+                  <groupId>org.apache.solr</groupId>
+                  <artifactId>uima-uimaj-core</artifactId>
+                  <version>${uima.version}</version>
+                  <packaging>jar</packaging>
+                  <file>solr/contrib/uima/lib/uima-core.jar</file>
+                </configuration>  
+              </execution>
             </executions>
           </plugin>
         </plugins>

Modified: lucene/dev/trunk/dev-tools/maven/solr/contrib/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/pom.xml.template?rev=1062936&r1=1062935&r2=1062936&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/pom.xml.template Mon Jan 24 19:33:14 2011
@@ -35,6 +35,7 @@
     <module>clustering</module>
     <module>dataimporthandler</module>
     <module>extraction</module>
+    <module>uima</module>
   </modules>
   <build>
     <directory>../build/solr-contrib-aggregator</directory>

Added: lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1062936&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template (added)
+++ lucene/dev/trunk/dev-tools/maven/solr/contrib/uima/pom.xml.template Mon Jan 24 19:33:14
2011
@@ -0,0 +1,128 @@
+<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.
+  -->
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.solr</groupId>
+    <artifactId>solr-parent</artifactId>
+    <version>@version@</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+  <groupId>org.apache.solr</groupId>
+  <artifactId>solr-uima</artifactId>
+  <packaging>jar</packaging>
+  <name>Apache Solr - UIMA integration</name>
+  <description>Apache Solr - UIMA integration</description>
+  <properties>
+    <module-directory>solr/contrib/uima</module-directory>
+    <build-directory>build</build-directory>
+    <tests.luceneMatchVersion>4.0</tests.luceneMatchVersion>
+  </properties>
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>solr-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>solr-core</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>solr-solrj</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.lucene</groupId>
+      <artifactId>lucene-core</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.solr</groupId>
+      <artifactId>uima-alchemy-annotator</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.solr</groupId>
+      <artifactId>uima-OpenCalaisAnnotator</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.solr</groupId>
+      <artifactId>uima-Tagger</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.solr</groupId>
+      <artifactId>uima-WhitespaceTokenizer</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.solr</groupId>
+      <artifactId>uima-uimaj-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <directory>${build-directory}</directory>
+    <outputDirectory>${build-directory}/classes</outputDirectory>
+    <testOutputDirectory>${build-directory}/test-classes</testOutputDirectory>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+      </testResource>
+    </testResources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemPropertyVariables>
+            <java.util.logging.config.file>../../../../testlogging.properties</java.util.logging.config.file>
+          </systemPropertyVariables>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Modified: lucene/dev/trunk/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/build.xml?rev=1062936&r1=1062935&r2=1062936&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/build.xml (original)
+++ lucene/dev/trunk/lucene/build.xml Mon Jan 24 19:33:14 2011
@@ -391,7 +391,7 @@
 
   <target name="generate-maven-artifacts" depends="maven.ant.tasks-check, package, jar-src,
javadocs">
     <sequential>
-	  <ant target="get-maven-poms" inheritAll="false" dir=".."/>
+	  <ant target="get-maven-poms" dir=".."/>
  
       <m2-deploy pom.xml="../pom.xml"/> <!-- Lucene/Solr grandparent POM -->
       <m2-deploy pom.xml="pom.xml"/>    <!-- Lucene parent POM -->

Modified: lucene/dev/trunk/modules/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/build.xml?rev=1062936&r1=1062935&r2=1062936&view=diff
==============================================================================
--- lucene/dev/trunk/modules/build.xml (original)
+++ lucene/dev/trunk/modules/build.xml Mon Jan 24 19:33:14 2011
@@ -56,7 +56,7 @@
 
   <target name="generate-maven-artifacts" description="Generate Maven Artifacts for Modules">
     <sequential>
-      <ant target="get-maven-poms" inheritAll="false" dir=".."/>
+      <ant target="get-maven-poms" dir=".."/>
       <subant target="dist-maven" inheritall="false" failonerror="true">
         <fileset dir="analysis" includes="build.xml" />
         <fileset dir="benchmark" includes="build.xml" />

Modified: lucene/dev/trunk/solr/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/build.xml?rev=1062936&r1=1062935&r2=1062936&view=diff
==============================================================================
--- lucene/dev/trunk/solr/build.xml (original)
+++ lucene/dev/trunk/solr/build.xml Mon Jan 24 19:33:14 2011
@@ -846,7 +846,7 @@
 
   <target name="generate-maven-artifacts" depends="maven.ant.tasks-check, create-package">
     <sequential>
-	  <ant target="get-maven-poms" inheritAll="false" dir=".."/>
+	  <ant target="get-maven-poms" dir=".."/>
 
       <!--
 
@@ -912,7 +912,7 @@
         </artifact-attachments>
       </m2-deploy>
 
-      <m2-deploy pom.xml="contrib/extraction/solr-uima-pom.xml.template"
+      <m2-deploy pom.xml="contrib/uima/pom.xml"
                  jar.file="${dist}/apache-solr-uima-${version}.jar">
         <artifact-attachments>
           <attach file="${dist}/apache-solr-uima-src-${version}.jar" classifier="sources"/>



Mime
View raw message