Author: schor
Date: Wed Apr 21 18:02:47 2010
New Revision: 936404
URL: http://svn.apache.org/viewvc?rev=936404&view=rev
Log:
[UIMA-1756] use new parent poms
Modified:
uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml
Modified: uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml?rev=936404&r1=936403&r2=936404&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml Wed Apr 21
18:02:47 2010
@@ -21,28 +21,45 @@
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>
- <!-- groupId omitted - inherited from parent -->
+
+ <parent>
+ <groupId>org.apache.uima</groupId>
+ <artifactId>parent-pom-uimaj-eclipse-plugins</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-configurator</artifactId>
+ <version>2.3.1-SNAPSHOT</version>
<packaging>bundle</packaging>
- <!-- version omitted - inherited from parent-->
+
<name>Apache UIMA Configurator Eclipse Plugin</name>
- <url>http://incubator.apache.org/uima</url>
- <licenses>
- <license>
- <name>The Apache Software License, Version 2.0</name>
- <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
- <distribution>repo</distribution>
- </license>
- </licenses>
+ <!-- Special inheritance note
+ even though the <scm> element that follows is exactly the
+ same as those in super poms, it cannot be inherited because
+ there is some special code that incorrectly computes the
+ connection elements from the chain of parent poms, if this is omitted.
+
+ Keeping this a bit factored allows cutting/pasting the <scm>
+ element, and just changing the following two properties -->
<scm>
- <url>http://svn.apache.org/viewvc/incubator/uima</url>
+ <connection>
+
scm:svn:http://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </connection>
+ <developerConnection>
+
scm:svn:https://svn.apache.org/repos/asf/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/uima/${uimaScmRoot}/trunk/${uimaScmProject}
+ </url>
</scm>
- <parent>
- <groupId>org.apache.uima</groupId>
- <artifactId>uimaj-eclipse-plugins</artifactId>
- <version>2.3.0.incubating</version> <!-- this comment is a flag for
changeVersion -->
- <relativePath>../uimaj/eclipse-plugin-superPom</relativePath>
- </parent>
+
+ <properties>
+ <uimaScmRoot>uimaj</uimaScmRoot>
+ <uimaScmProject>jvinci</uimaScmProject>
+ <uimaDependenciesVersion>2.3.0-incubating</uimaDependenciesVersion>
+ </properties>
+
<dependencies>
<!-- UIMA dependencies -->
<!-- depending on the ep-runtime doesn't work without manual intervention
because
@@ -62,14 +79,14 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-core</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>2.3.0-incubating</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-tools</artifactId>
- <version>${uimaj-release-version}</version>
+ <version>2.3.0-incubating</version>
<!-- must be provided to get pax:eclipse to work, but
must be compile to get eclipse:eclipse to include
them as Referenced Libraries -->
@@ -79,7 +96,7 @@
<dependency>
<groupId>org.apache.uima</groupId>
<artifactId>uimaj-ep-jcasgen</artifactId>
- <version>${uimaj-release-eclipse-version}</version>
+ <version>2.3.0.incubating</version>
<scope>provided</scope>
</dependency>
@@ -203,7 +220,7 @@
<build>
-
<finalName>org.apache.uima.desceditor_${uimaj-release-eclipse-version}</finalName>
+ <finalName>org.apache.uima.desceditor_2.3.1-SNAPSHOT</finalName>
<plugins>
@@ -211,7 +228,6 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<!-- version 1.4.0 to support _nouses instruction -->
- <version>1.4.0</version>
<extensions>true</extensions>
<configuration>
<manifestLocation>META-INF</manifestLocation>
