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 2010/11/29 21:19:58 UTC
svn commit: r1040266 - in /uima/uima-as/trunk:
aggregate-uima-as-eclipse-plugins/ aggregate-uima-as/ uima-as-distr/
uima-as-docbooks/ uimaj-as-activemq/ uimaj-as-camel/ uimaj-as-core/
uimaj-as-jms/ uimaj-as-osgi-runtime/ uimaj-eclipse-feature-deployedi...
Author: schor
Date: Mon Nov 29 20:19:57 2010
New Revision: 1040266
URL: http://svn.apache.org/viewvc?rev=1040266&view=rev
Log:
[UIMA-1944] change parent pom to uima-as one. Add relativePath so it builds from empty state new checkout. Factor out common uimaScmRoot, and uimaDependencyVersion.
Modified:
uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml
uima/uima-as/trunk/aggregate-uima-as/pom.xml
uima/uima-as/trunk/uima-as-distr/ (props changed)
uima/uima-as/trunk/uima-as-docbooks/pom.xml
uima/uima-as/trunk/uimaj-as-activemq/pom.xml
uima/uima-as/trunk/uimaj-as-camel/pom.xml
uima/uima-as/trunk/uimaj-as-core/pom.xml
uima/uima-as/trunk/uimaj-as-jms/pom.xml
uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml
uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml
uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml
uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml
Modified: uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml?rev=1040266&r1=1040265&r2=1040266&view=diff
==============================================================================
--- uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml (original)
+++ uima/uima-as/trunk/aggregate-uima-as-eclipse-plugins/pom.xml Mon Nov 29 20:19:57 2010
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>parent-pom</artifactId>
- <version>1-SNAPSHOT</version>
- <relativePath/>
+ <artifactId>uima-as-parent</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>aggregate-uima-as-eclipse-plugins</artifactId>
@@ -58,9 +58,7 @@
</scm>
<properties>
- <uimaScmRoot>uima-as</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
- <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
</properties>
<modules>
Modified: uima/uima-as/trunk/aggregate-uima-as/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/aggregate-uima-as/pom.xml?rev=1040266&r1=1040265&r2=1040266&view=diff
==============================================================================
--- uima/uima-as/trunk/aggregate-uima-as/pom.xml (original)
+++ uima/uima-as/trunk/aggregate-uima-as/pom.xml Mon Nov 29 20:19:57 2010
@@ -25,9 +25,9 @@
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>parent-pom</artifactId>
- <version>1-SNAPSHOT</version>
- <relativePath/>
+ <artifactId>uima-as-parent</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>aggregate-uima-as</artifactId>
@@ -60,7 +60,6 @@
</scm>
<properties>
- <uimaScmRoot>uima-as</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
</properties>
Propchange: uima/uima-as/trunk/uima-as-distr/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Nov 29 20:19:57 2010
@@ -1,4 +1,5 @@
-target
-.classpath
-.project
-.settings
+target
+.classpath
+.project
+.settings
+issuesFixed
Modified: uima/uima-as/trunk/uima-as-docbooks/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uima-as-docbooks/pom.xml?rev=1040266&r1=1040265&r2=1040266&view=diff
==============================================================================
--- uima/uima-as/trunk/uima-as-docbooks/pom.xml (original)
+++ uima/uima-as/trunk/uima-as-docbooks/pom.xml Mon Nov 29 20:19:57 2010
@@ -25,9 +25,9 @@
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>parent-pom</artifactId>
- <version>1-SNAPSHOT</version>
- <relativePath/>
+ <artifactId>uima-as-parent</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uima-as-docbooks</artifactId>
@@ -57,7 +57,6 @@
</scm>
<properties>
- <uimaScmRoot>uima-as</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
<!-- next property is the name of the top file under src/docbook without trailing .xml -->
<bookNameRoot>uima_async_scaleout</bookNameRoot>
Modified: uima/uima-as/trunk/uimaj-as-activemq/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-activemq/pom.xml?rev=1040266&r1=1040265&r2=1040266&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-activemq/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-activemq/pom.xml Mon Nov 29 20:19:57 2010
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>parent-pom</artifactId>
- <version>1-SNAPSHOT</version>
- <relativePath/>
+ <artifactId>uima-as-parent</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-activemq</artifactId>
@@ -56,9 +56,7 @@
</scm>
<properties>
- <uimaScmRoot>uimaj</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
- <uimaDependencyVersion>2.3.1-SNAPSHOT</uimaDependencyVersion>
<postNoticeText>${ibmNoticeText}</postNoticeText>
</properties>
@@ -74,7 +72,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${project.version}</version>
+ <version>${uimajDependencyVersion}</version>
<scope>compile</scope>
</dependency>
@@ -295,7 +293,7 @@
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-examples</artifactId>
- <version>${project.version}</version>
+ <version>${uimajDependencyVersion}</version>
<scope>test</scope>
</dependency>
@@ -309,7 +307,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-test-util</artifactId>
- <version>${project.version}</version>
+ <version>${uimajDependencyVersion}</version>
<scope>test</scope>
</dependency>
Modified: uima/uima-as/trunk/uimaj-as-camel/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-camel/pom.xml?rev=1040266&r1=1040265&r2=1040266&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-camel/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-camel/pom.xml Mon Nov 29 20:19:57 2010
@@ -23,9 +23,9 @@
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>parent-pom</artifactId>
- <version>1-SNAPSHOT</version>
- <relativePath/>
+ <artifactId>uima-as-parent</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-camel</artifactId>
@@ -56,7 +56,6 @@
</scm>
<properties>
- <uimaScmRoot>uima-as</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
</properties>
@@ -71,7 +70,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${project.version}</version>
+ <version>${uimajDependencyVersion}</version>
<scope>provided</scope>
</dependency>
Modified: uima/uima-as/trunk/uimaj-as-core/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-core/pom.xml?rev=1040266&r1=1040265&r2=1040266&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-core/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-core/pom.xml Mon Nov 29 20:19:57 2010
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>parent-pom</artifactId>
- <version>1-SNAPSHOT</version>
- <relativePath/>
+ <artifactId>uima-as-parent</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<groupId>org.apache.uima</groupId>
@@ -56,7 +56,6 @@
</scm>
<properties>
- <uimaScmRoot>uima-as</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
<postNoticeText>${ibmNoticeText}</postNoticeText>
</properties>
@@ -72,7 +71,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${project.version}</version>
+ <version>${uimajDependencyVersion}</version>
<scope>compile</scope>
</dependency>
@@ -92,7 +91,6 @@
to insert the version from properties -->
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.4.3</version> <!-- 2.4.0 fails -->
<executions>
<execution>
<id>setVersions</id>
Modified: uima/uima-as/trunk/uimaj-as-jms/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-jms/pom.xml?rev=1040266&r1=1040265&r2=1040266&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-jms/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-jms/pom.xml Mon Nov 29 20:19:57 2010
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>parent-pom</artifactId>
- <version>1-SNAPSHOT</version>
- <relativePath/>
+ <artifactId>uima-as-parent</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-jms</artifactId>
@@ -55,7 +55,6 @@
</scm>
<properties>
- <uimaScmRoot>uima-as</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
<postNoticeText>${ibmNoticeText}</postNoticeText>
</properties>
@@ -64,7 +63,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${project.version}</version>
+ <version>${uimajDependencyVersion}</version>
<scope>compile</scope>
</dependency>
Modified: uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml?rev=1040266&r1=1040265&r2=1040266&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-as-osgi-runtime/pom.xml Mon Nov 29 20:19:57 2010
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>parent-pom</artifactId>
- <version>1-SNAPSHOT</version>
- <relativePath/>
+ <artifactId>uima-as-parent</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-as-osgi-runtime</artifactId>
@@ -57,7 +57,6 @@
</scm>
<properties>
- <uimaScmRoot>uima-as</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
</properties>
@@ -67,42 +66,42 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${project.version}</version>
+ <version>${uimajDependencyVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-cpe</artifactId>
- <version>${project.version}</version>
+ <version>${uimajDependencyVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
- <version>${project.version}</version>
+ <version>${uimajDependencyVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-examples</artifactId>
- <version>${project.version}</version>
+ <version>${uimajDependencyVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-adapter-vinci</artifactId>
- <version>${project.version}</version>
+ <version>${uimajDependencyVersion}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>jVinci</artifactId>
- <version>${project.version}</version>
+ <version>${uimajDependencyVersion}</version>
<scope>provided</scope>
</dependency>
Modified: uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml?rev=1040266&r1=1040265&r2=1040266&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-eclipse-feature-deployeditor/pom.xml Mon Nov 29 20:19:57 2010
@@ -23,9 +23,9 @@
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>parent-pom</artifactId>
- <version>1-SNAPSHOT</version>
- <relativePath/>
+ <artifactId>uima-as-parent</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-eclipse-feature-deployeditor</artifactId>
@@ -56,7 +56,6 @@
</scm>
<properties>
- <uimaScmRoot>uima-as</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
</properties>
Modified: uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml?rev=1040266&r1=1040265&r2=1040266&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-ep-deployeditor/pom.xml Mon Nov 29 20:19:57 2010
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>parent-pom</artifactId>
- <version>1-SNAPSHOT</version>
- <relativePath/>
+ <artifactId>uima-as-parent</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-ep-deployeditor</artifactId>
@@ -57,7 +57,6 @@
</scm>
<properties>
- <uimaScmRoot>uima-as</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
<postNoticeText>${ibmNoticeText}</postNoticeText>
</properties>
@@ -67,21 +66,21 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-configurator</artifactId>
- <version>${project.version}</version>
+ <version>${uimajDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${project.version}</version>
+ <version>${uimajDependencyVersion}</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
- <version>${project.version}</version>
+ <version>${uimajDependencyVersion}</version>
<scope>compile</scope>
</dependency>
Modified: uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml
URL: http://svn.apache.org/viewvc/uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml?rev=1040266&r1=1040265&r2=1040266&view=diff
==============================================================================
--- uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml (original)
+++ uima/uima-as/trunk/uimaj-ep-runtime-deployeditor/pom.xml Mon Nov 29 20:19:57 2010
@@ -24,9 +24,9 @@
<parent>
<groupId>org.apache.uima</groupId>
- <artifactId>parent-pom</artifactId>
- <version>1-SNAPSHOT</version>
- <relativePath/>
+ <artifactId>uima-as-parent</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
+ <relativePath>../uima-as-parent/pom.xml</relativePath>
</parent>
<artifactId>uimaj-ep-runtime-deployeditor</artifactId>
@@ -57,7 +57,6 @@
</scm>
<properties>
- <uimaScmRoot>uima-as</uimaScmRoot>
<uimaScmProject>${project.artifactId}</uimaScmProject>
<postNoticeText>${ibmNoticeText}</postNoticeText>
</properties>
@@ -66,7 +65,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-runtime</artifactId>
- <version>${project.version}</version>
+ <version>${uimajDependencyVersion}</version>
<!-- don't use provided scope here, because then
eclipse:eclipse is set up to ref the uimaj-ep-runtime
project directly, and it has no content