You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by sc...@apache.org on 2009/08/21 06:13:45 UTC
svn commit: r806415 - in /incubator/uima/sandbox/trunk/SandboxDistr:
annotator-package/pom.xml pom.xml
Author: schor
Date: Fri Aug 21 04:13:45 2009
New Revision: 806415
URL: http://svn.apache.org/viewvc?rev=806415&view=rev
Log:
[UIMA-1510] cannot use ${xxx} forms in pom versions - the ${xxx} substitutions are not done until after parent poms are figured out. Also, make doc building conditional on there being a build-documentation.xml file. Also, add and configure ant-contrib (supplies <if> etc. to ant).
Modified:
incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml
incubator/uima/sandbox/trunk/SandboxDistr/pom.xml
Modified: incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml?rev=806415&r1=806414&r2=806415&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/annotator-package/pom.xml Fri Aug 21 04:13:45 2009
@@ -24,13 +24,15 @@
<groupId>org.apache.uima</groupId>
<artifactId>SandboxAnnotatorPackage</artifactId>
<packaging>pom</packaging>
- <version>${uimaj-release-version}</version>
+ <!-- version cannot be a ${xxx} form for parent POMs -->
+ <version>2.3.0-incubating-SNAPSHOT</version>
<name>Apache UIMA Sandbox Annotator Add-Ons</name>
<url>http://incubator.apache.org/uima</url>
<description>Annotator components for the UIMA SDK</description>
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>SandboxDistr</artifactId>
+ <!-- version cannot be a ${xxx} form -->
<version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
<relativePath>..</relativePath>
</parent>
Modified: incubator/uima/sandbox/trunk/SandboxDistr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/uima/sandbox/trunk/SandboxDistr/pom.xml?rev=806415&r1=806414&r2=806415&view=diff
==============================================================================
--- incubator/uima/sandbox/trunk/SandboxDistr/pom.xml (original)
+++ incubator/uima/sandbox/trunk/SandboxDistr/pom.xml Fri Aug 21 04:13:45 2009
@@ -23,12 +23,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.uima</groupId>
<artifactId>SandboxDistr</artifactId>
+ <!-- version cannot be a ${xxx} form for Parent poms -->
+ <version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion --> <name>Apache UIMA Sandbox distribution build</name>
<packaging>pom</packaging>
- <version>${uimaj-release-version}</version>
- <name>Apache UIMA Sandbox distribution build</name>
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj</artifactId>
+ <!-- version cannot be a ${xxx} form -->
<version>2.3.0-incubating-SNAPSHOT</version> <!-- this comment is a flag for changeVersion -->
<relativePath>../uimaj</relativePath>
</parent>
@@ -50,6 +51,14 @@
<url>http://www.apache.org/</url>
</organization>
+ <dependencies>
+ <dependency>
+ <groupId>ant-contrib</groupId>
+ <artifactId>ant-contrib</artifactId>
+ <version>1.0b3</version>
+ </dependency>
+ </dependencies>
+
<build>
<pluginManagement>
<plugins>
@@ -59,7 +68,47 @@
<version>${uimaj-release-version}</version>
</plugin>
</plugins>
- </pluginManagement>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>maybe build documentation</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <!-- set up ant-contrib extensions -->
+ <typedef resource="net/sf/antcontrib/antlib.xml">
+ <classpath refid="maven.dependency.classpath"/>
+ </typedef>
+ <!--echo message="pom.xml: maven-antrun-plugin"></echo>
+ <tstamp>
+ <format locale="en" property="TODAY_UK"
+ pattern="d-MMM-yyyy"></format>
+ </tstamp>
+ <echo>pom.xml: timestamp ${TODAY_UK}</echo-->
+
+ <if>
+ <available file="build_documentation.xml"></available>
+ <then>
+ <ant antfile="build_documentation.xml"/>
+ </then>
+ <else>
+ <echo message="No build_documentation.xml - skipping"/>
+ </else>
+ </if>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+
</build>
<modules>