Author: schor Date: Tue Jul 6 17:50:04 2010 New Revision: 960961 URL: http://svn.apache.org/viewvc?rev=960961&view=rev Log: [UIMA-1829] depend on current snapshot levels, also fix relative path for some to include extra parent-poms dir. Also make order of sub elements in <parent> standard - groupId before artifactId
Modified: 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-single-project/pom.xml uima/build/trunk/uima-assembly-single-project/pom.xml uima/build/trunk/uima-build-helper-maven-plugin/pom.xml uima/build/trunk/uima-docbook-resource-bundle/pom.xml uima/build/trunk/uima-jar-resource-bundle/pom.xml 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=960961&r1=960960&r2=960961&view=diff ============================================================================== --- uima/build/trunk/parent-poms/parent-pom-distr/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-distr/pom.xml Tue Jul 6 17:50:04 2010 @@ -27,7 +27,7 @@ <parent> <groupId>org.apache.uima</groupId> <artifactId>parent-pom-top</artifactId> - <version>2</version> + <version>4-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=960961&r1=960960&r2=960961&view=diff ============================================================================== --- uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml (original) +++ uima/build/trunk/parent-poms/parent-pom-docbook/pom.xml Tue Jul 6 17:50:04 2010 @@ -28,7 +28,7 @@ <parent> <groupId>org.apache.uima</groupId> <artifactId>parent-pom-top</artifactId> - <version>2</version> + <version>4-SNAPSHOT</version> <relativePath>../parent-pom-top</relativePath> </parent> @@ -129,7 +129,7 @@ <plugin> <groupId>org.apache.uima</groupId> <artifactId>uima-build-helper-maven-plugin</artifactId> - <version>1-SNAPSHOT</version> + <version>2-SNAPSHOT</version> <executions> <execution> <id>set buildYear and buildMonth</id> @@ -179,7 +179,7 @@ <artifactItem> <groupId>org.apache.uima</groupId> <artifactId>uima-docbook-resource-bundle</artifactId> - <version>1-SNAPSHOT</version> + <version>2-SNAPSHOT</version> <excludes>META-INF/**</excludes> <outputDirectory>${project.build.directory}</outputDirectory> </artifactItem> @@ -202,7 +202,7 @@ <artifactItem> <groupId>org.apache.uima</groupId> <artifactId>uima-docbook-resource-bundle</artifactId> - <version>1-SNAPSHOT</version> + <version>2-SNAPSHOT</version> <excludes>META-INF/**</excludes> <outputDirectory>${dolRepo}</outputDirectory> </artifactItem> 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=960961&r1=960960&r2=960961&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 Tue Jul 6 17:50:04 2010 @@ -126,7 +126,7 @@ <dependency> <groupId>org.apache.uima</groupId> <artifactId>uima-assembly-single-project</artifactId> - <version>1-SNAPSHOT</version> + <version>2-SNAPSHOT</version> </dependency> </dependencies> </plugin> Modified: uima/build/trunk/uima-assembly-single-project/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-assembly-single-project/pom.xml?rev=960961&r1=960960&r2=960961&view=diff ============================================================================== --- uima/build/trunk/uima-assembly-single-project/pom.xml (original) +++ uima/build/trunk/uima-assembly-single-project/pom.xml Tue Jul 6 17:50:04 2010 @@ -52,8 +52,8 @@ <parent> <groupId>org.apache.uima</groupId> <artifactId>parent-pom-top</artifactId> - <version>2</version> - <relativePath>../parent-pom-top</relativePath> + <version>4-SNAPSHOT</version> + <relativePath>../parent-poms/parent-pom-top</relativePath> </parent> <artifactId>uima-assembly-single-project</artifactId> Modified: uima/build/trunk/uima-build-helper-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-build-helper-maven-plugin/pom.xml?rev=960961&r1=960960&r2=960961&view=diff ============================================================================== --- uima/build/trunk/uima-build-helper-maven-plugin/pom.xml (original) +++ uima/build/trunk/uima-build-helper-maven-plugin/pom.xml Tue Jul 6 17:50:04 2010 @@ -21,9 +21,10 @@ <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>parent-pom-top</artifactId> <groupId>org.apache.uima</groupId> - <version>2</version> + <artifactId>parent-pom-top</artifactId> + <version>4-SNAPSHOT</version> + <relativePath>../parent-poms/parent-pom-top</relativePath> </parent> <artifactId>uima-build-helper-maven-plugin</artifactId> Modified: uima/build/trunk/uima-docbook-resource-bundle/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-docbook-resource-bundle/pom.xml?rev=960961&r1=960960&r2=960961&view=diff ============================================================================== --- uima/build/trunk/uima-docbook-resource-bundle/pom.xml (original) +++ uima/build/trunk/uima-docbook-resource-bundle/pom.xml Tue Jul 6 17:50:04 2010 @@ -20,10 +20,10 @@ <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"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>parent-pom-top</artifactId> <groupId>org.apache.uima</groupId> - <version>2</version> - <relativePath>../parent-pom-top</relativePath> + <artifactId>parent-pom-top</artifactId> + <version>4-SNAPSHOT</version> + <relativePath>../parent-poms/parent-pom-top</relativePath> </parent> <artifactId>uima-docbook-resource-bundle</artifactId> Modified: uima/build/trunk/uima-jar-resource-bundle/pom.xml URL: http://svn.apache.org/viewvc/uima/build/trunk/uima-jar-resource-bundle/pom.xml?rev=960961&r1=960960&r2=960961&view=diff ============================================================================== --- uima/build/trunk/uima-jar-resource-bundle/pom.xml (original) +++ uima/build/trunk/uima-jar-resource-bundle/pom.xml Tue Jul 6 17:50:04 2010 @@ -20,10 +20,10 @@ <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"> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>parent-pom-top</artifactId> <groupId>org.apache.uima</groupId> - <version>2</version> - <relativePath>../parent-pom-top</relativePath> + <artifactId>parent-pom-top</artifactId> + <version>4-SNAPSHOT</version> + <relativePath>../parent-poms/parent-pom-top</relativePath> </parent> <artifactId>uima-jar-resource-bundle</artifactId>