Author: schor
Date: Wed Oct 13 19:04:44 2010
New Revision: 1022241
URL: http://svn.apache.org/viewvc?rev=1022241&view=rev
Log:
[UIMA-1900] [UIMA-1901] add <modules> for direct children. Upgrade maven
plugins to current (non-beta) levels: maven-assembly-plugin to 2.2,
maven-compiler-plugin to 2.3.1, maven-javadoc-plugin to 2.7, maven-jar-plugin
to 2.3.1, maven antrun plugin to 1.6, maven-bundle-plugin to 2.1.0,
maven-release-plugin to 2.1, maven-resources-plugin to 2.4.3, and
maven-source-plugin to 2.1.2. Tested uimaj, uima-as, and add-ons (sandbox) -
all build ok.
Modified:
uima/build/trunk/parent-poms/parent-pom-top/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-top/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-top/pom.xml?rev=1022241&r1=1022240&r2=1022241&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-top/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-top/pom.xml Wed Oct 13 19:04:44 2010
@@ -120,6 +120,12 @@
<maven>3.0-beta-1</maven>
</prerequisites>
+ <!-- direct descendants, only -->
+ <modules>
+ <module>../parent-pom-docbook</module>
+ <module>../parent-pom-distr</module>
+ </modules>
+
<scm>
<connection>
scm:svn:http://svn.apache.org/repos/asf/uima/build/trunk/parent-poms/parent-pom-top
@@ -266,6 +272,7 @@
warning message to use install instead -->
<plugin>
<artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2</version>
<executions>
<execution>
<id>default-cli</id>
@@ -288,6 +295,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -304,6 +312,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.7</version>
<configuration>
<source>5</source> <!-- needed to do Enums -->
<encoding>UTF-8</encoding>
@@ -376,6 +385,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
+ <version>2.3.1</version>
<configuration>
<archive>
<manifestEntries>
@@ -399,6 +409,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
+ <version>1.6</version>
<dependencies>
<dependency>
<groupId>org.apache.ant</groupId>
@@ -440,7 +451,7 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<!-- version 2.0.0 fails -->
- <version>2.0.1</version>
+ <version>2.1.0</version>
<extensions>true</extensions>
<executions>
<execution>
@@ -469,14 +480,24 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
<configuration>
<useReleaseProfile>false</useReleaseProfile>
<goals>deploy</goals>
<arguments>-Papache-release</arguments>
</configuration>
</plugin>
-
+
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.4.3</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ <version>2.1.2</version>
+ </plugin>
</plugins>
</pluginManagement>
