Author: schor
Date: Wed Oct 13 19:00:32 2010
New Revision: 1022240
URL: http://svn.apache.org/viewvc?rev=1022240&view=rev
Log:
[UIMA-1900]make parents ref the -SNAPSHOT versions, so releasing together
works. Add <modules> to upper level parent-poms that have other parent-poms as
direct children.
Modified:
uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml
uima/build/trunk/parent-poms/parent-pom-distr/pom.xml
uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml
uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml
uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml
uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml
Modified: uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml?rev=1022240&r1=1022239&r2=1022240&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-annotator/pom.xml Wed Oct 13
19:00:32 2010
@@ -36,7 +36,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-docbook</artifactId>
- <version>4</version>
+ <version>5-SNAPSHOT</version>
<relativePath>../parent-pom-docbook</relativePath>
</parent>
Modified: uima/build/trunk/parent-poms/parent-pom-distr/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-distr/pom.xml?rev=1022240&r1=1022239&r2=1022240&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-distr/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-distr/pom.xml Wed Oct 13 19:00:32
2010
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-top</artifactId>
- <version>5</version>
+ <version>6-SNAPSHOT</version>
<relativePath>../parent-pom-top</relativePath>
</parent>
Modified: uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml?rev=1022240&r1=1022239&r2=1022240&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml Wed Oct 13 19:00:32
2010
@@ -28,7 +28,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-top</artifactId>
- <version>5</version>
+ <version>6-SNAPSHOT</version>
<relativePath>../parent-pom-top</relativePath>
</parent>
@@ -40,6 +40,14 @@
<description>UIMA Parent Pom for Docbook documentation.</description>
<url>${uimaWebsiteUrl}</url>
+ <!-- direct descendants, only -->
+ <modules>
+ <module>../parent-pom-ibm-notice</module>
+ <module>../parent-pom-eclipse-plugins</module>
+ <module>../parent-pom-annotator</module>
+ <module>../parent-pom-single-project</module>
+ </modules>
+
<!-- Special inheritance note
even though the <scm> element that follows is exactly the
same as those in super poms, it cannot be inherited because
Modified:
uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml?rev=1022240&r1=1022239&r2=1022240&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml
(original)
+++ uima/build/trunk/parent-poms/parent-pom-eclipse-plugins-ibm-notice/pom.xml
Wed Oct 13 19:00:32 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-eclipse-plugins</artifactId>
- <version>4</version>
+ <version>5-SNAPSHOT</version>
<relativePath>../parent-pom-eclipse-plugins</relativePath>
</parent>
Modified: uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml?rev=1022240&r1=1022239&r2=1022240&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-eclipse-plugins/pom.xml Wed Oct 13
19:00:32 2010
@@ -29,7 +29,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-docbook</artifactId>
- <version>4</version>
+ <version>5-SNAPSHOT</version>
<relativePath>../parent-pom-docbook</relativePath>
</parent>
@@ -40,6 +40,11 @@
<description>Holds common, factored out settings for eclipse
plugins</description>
<url>${uimaWebsiteUrl}</url>
+ <!-- direct descendants, only -->
+ <modules>
+ <module>../parent-pom-eclipse-plugins-ibm-notice</module>
+ </modules>
+
<!-- Special inheritance note
even though the <scm> element that follows is exactly the
same as those in super poms, it cannot be inherited because
@@ -142,7 +147,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
- <version>2.4</version>
+ <!-- version set in parent-pom-top -->
<configuration>
<manifest>.ignore</manifest>
<pde>true</pde>
Modified: uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml?rev=1022240&r1=1022239&r2=1022240&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-ibm-notice/pom.xml Wed Oct 13
19:00:32 2010
@@ -26,7 +26,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-docbook</artifactId>
- <version>4</version>
+ <version>5-SNAPSHOT</version>
<relativePath>../parent-pom-docbook</relativePath>
</parent>
Modified: uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml
URL:
http://svn.apache.org/viewvc/uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml?rev=1022240&r1=1022239&r2=1022240&view=diff
==============================================================================
--- uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml (original)
+++ uima/build/trunk/parent-poms/parent-pom-single-project/pom.xml Wed Oct 13
19:00:32 2010
@@ -51,7 +51,7 @@
<parent>
<groupId>org.apache.uima</groupId>
<artifactId>parent-pom-docbook</artifactId>
- <version>4</version>
+ <version>5-SNAPSHOT</version>
<relativePath>../parent-pom-docbook</relativePath>
</parent>
