Author: schor
Date: Fri Apr 23 13:23:16 2010
New Revision: 937285
URL: http://svn.apache.org/viewvc?rev=937285&view=rev
Log:
[UIMA-1756] m2eclipse runs using maven 3. Maven 3 has deprecated property
names that are missing their top-level names (e.g. ${version} is deprecated,
use ${project.version}. Change version and artifactId to include the project.
prefix.
Modified:
uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/docbook/PearPackagingMavenPluginUserGuide/PearPackagingMavenPluginUserGuide.xml
uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/pom.xml
uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj-eclipse-plugins/pom.xml
uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml
uima/uimaj/branches/mavenAlign/jVinci/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-adapter-soap/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-adapter-vinci/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-bootstrap/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-component-test-util/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-core/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-cpe/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/assembly/bin.xml
uima/uimaj/branches/mavenAlign/uimaj-document-annotation/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-ep-debug/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-ep-runtime/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-examples/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-internal-tools/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-test-util/pom.xml
uima/uimaj/branches/mavenAlign/uimaj-tools/pom.xml
Modified:
uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/docbook/PearPackagingMavenPluginUserGuide/PearPackagingMavenPluginUserGuide.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/docbook/PearPackagingMavenPluginUserGuide/PearPackagingMavenPluginUserGuide.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
---
uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/docbook/PearPackagingMavenPluginUserGuide/PearPackagingMavenPluginUserGuide.xml
(original)
+++
uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/docbook/PearPackagingMavenPluginUserGuide/PearPackagingMavenPluginUserGuide.xml
Fri Apr 23 13:23:16 2010
@@ -85,12 +85,12 @@
<mainComponentDesc>
<!-- PEAR file main component descriptor -->
- desc/${artifactId}.xml
+ desc/${project.artifactId}.xml
</mainComponentDesc>
<componentId>
<!-- PEAR file component ID -->
- ${artifactId}
+ ${project.artifactId}
</componentId>
<datapath>
@@ -138,14 +138,14 @@
<code><mainComponentDesc></code>
- This element specifies the
relative path to the main component descriptor
that should be used to run
the PEAR content. The path must be relative to the
- project root. A good default
to use is <code>desc/${artifactId}.xml</code>.
+ project root. A good default
to use is <code>desc/${project.artifactId}.xml</code>.
</para>
</listitem>
<listitem>
<para>
<code><componentID></code>
- This element specifies the
PEAR package component ID. A good default
- to use is
<code>${artifactId}</code>.
+ to use is
<code>${project.artifactId}</code>.
</para>
</listitem>
<listitem>
Modified: uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/PearPackagingMavenPlugin/pom.xml Fri Apr 23
13:23:16 2010
@@ -30,7 +30,7 @@
<artifactId>PearPackagingMavenPlugin</artifactId>
<version>2.3.1-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
- <name>UIMA Maven Plugin ${artifactId}</name>
+ <name>UIMA Maven Plugin ${project.artifactId}</name>
<description>This is a maven plugin that produces a pear
artifact.</description>
<url>${uimaWebsiteUrl}</url>
Modified:
uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj-eclipse-plugins/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj-eclipse-plugins/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj-eclipse-plugins/pom.xml
(original)
+++ uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj-eclipse-plugins/pom.xml
Fri Apr 23 13:23:16 2010
@@ -31,7 +31,7 @@
<artifactId>aggregate-pom-uimaj-eclipse-plugins</artifactId>
<packaging>pom</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Aggregate POM ${artifactId}</name>
+ <name>UIMA Aggregate POM ${project.artifactId}</name>
<description>The aggregate for building the Eclipse plugins
that are part of the base UIMA framework</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/aggregate-pom-uimaj/pom.xml Fri Apr 23
13:23:16 2010
@@ -31,7 +31,7 @@
<artifactId>aggregate-pom-uimaj</artifactId>
<packaging>pom</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Aggregate POM ${artifactId}: UIMA Base</name>
+ <name>UIMA Aggregate POM ${project.artifactId}: UIMA Base</name>
<description>The aggregate for the base UIMA framework build and
release</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/branches/mavenAlign/jVinci/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/jVinci/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/jVinci/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/jVinci/pom.xml Fri Apr 23 13:23:16 2010
@@ -31,7 +31,7 @@
<artifactId>jVinci</artifactId>
<packaging>jar</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Base: ${artifactId}: Vinci Transport Library</name>
+ <name>UIMA Base: ${project.artifactId}: Vinci Transport Library</name>
<description>This is a non-standard protocol for higher efficiency than
SOAP, used by the base UIMA Collection processing manager for supporting
networked deployment. See UIMA-AS as a more modern alternative supporting
Modified: uima/uimaj/branches/mavenAlign/uimaj-adapter-soap/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-adapter-soap/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-adapter-soap/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-adapter-soap/pom.xml Fri Apr 23
13:23:16 2010
@@ -31,7 +31,7 @@
<artifactId>uimaj-adapter-soap</artifactId>
<packaging>jar</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Base: ${artifactId}: SOAP Adapter</name>
+ <name>UIMA Base: ${project.artifactId}: SOAP Adapter</name>
<description>Provides the capability to connect to a remote
component, using the SOAP protocol</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/branches/mavenAlign/uimaj-adapter-vinci/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-adapter-vinci/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-adapter-vinci/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-adapter-vinci/pom.xml Fri Apr 23
13:23:16 2010
@@ -31,7 +31,7 @@
<artifactId>uimaj-adapter-vinci</artifactId>
<packaging>jar</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Base: ${artifactId}: Vinci Adapter</name>
+ <name>UIMA Base: ${project.artifactId}: Vinci Adapter</name>
<description>Provides the capability to connect to a remote analysis
engine, using the Vinci protocol</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/branches/mavenAlign/uimaj-bootstrap/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-bootstrap/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-bootstrap/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-bootstrap/pom.xml Fri Apr 23 13:23:16
2010
@@ -31,7 +31,7 @@
<artifactId>uimaj-bootstrap</artifactId>
<packaging>jar</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Base: ${artifactId}: Bootstrap launcher</name>
+ <name>UIMA Base: ${project.artifactId}: Bootstrap launcher</name>
<description>Configures a classpath from directories, and runs
a Java application using that</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/branches/mavenAlign/uimaj-component-test-util/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-component-test-util/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-component-test-util/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-component-test-util/pom.xml Fri Apr 23
13:23:16 2010
@@ -32,7 +32,7 @@
<artifactId>uimaj-component-test-util</artifactId>
<packaging>jar</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Base: ${artifactId}: for JUnit Tests</name>
+ <name>UIMA Base: ${project.artifactId}: for JUnit Tests</name>
<description>Supporting utilities used in various JUnit tests</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/branches/mavenAlign/uimaj-core/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-core/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-core/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-core/pom.xml Fri Apr 23 13:23:16 2010
@@ -31,7 +31,7 @@
<artifactId>uimaj-core</artifactId>
<packaging>jar</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Base: ${artifactId}</name>
+ <name>UIMA Base: ${project.artifactId}</name>
<description>The core implementation of the UIMA Java Framework</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/branches/mavenAlign/uimaj-cpe/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-cpe/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-cpe/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-cpe/pom.xml Fri Apr 23 13:23:16 2010
@@ -31,7 +31,7 @@
<artifactId>uimaj-cpe</artifactId>
<packaging>jar</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Base: ${artifactId}: Collection Processing Engine</name>
+ <name>UIMA Base: ${project.artifactId}: Collection Processing
Engine</name>
<description>The implementation of a simple scaleout capability, called
the Collection Processing Engine. New implementations may find
UIMA-AS a better scaleout mechanism.</description>
Modified: uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/assembly/bin.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/assembly/bin.xml
(original)
+++ uima/uimaj/branches/mavenAlign/uimaj-distr/src/main/assembly/bin.xml Fri
Apr 23 13:23:16 2010
@@ -39,7 +39,7 @@ under the License.
I need a separate dependency set for each module so that I can
specify the jar file name. If we didn't have this inconsistency
we could have a single dependencySet that included all modules
- and had an outputFileNameMapping of ${artifactId}.jar -->
+ and had an outputFileNameMapping of ${project.artifactId}.jar -->
<dependencySet>
<includes>
<include>org.apache.uima:uimaj-bootstrap</include>
Modified: uima/uimaj/branches/mavenAlign/uimaj-document-annotation/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-document-annotation/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-document-annotation/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-document-annotation/pom.xml Fri Apr 23
13:23:16 2010
@@ -31,7 +31,7 @@
<artifactId>uimaj-document-annotation</artifactId>
<packaging>jar</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Base: ${artifactId}: Type Definition</name>
+ <name>UIMA Base: ${project.artifactId}: Type Definition</name>
<description>A common, but not built-in, type in the type system,
specifying the language of a document</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-ep-cas-editor/pom.xml Fri Apr 23
13:23:16 2010
@@ -28,7 +28,7 @@
<artifactId>uimaj-ep-cas-editor</artifactId>
<version>2.3.1.SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>UIMA Eclipse: ${artifactId}</name>
+ <name>UIMA Eclipse: ${project.artifactId}</name>
<description>Allows editing the contents of a saved CAS</description>
<url>${uimaWebsiteUrl}</url>
@@ -153,7 +153,7 @@
</dependencies>
<build>
- <finalName>org.apache.uima.caseditor_${version}</finalName>
+
<finalName>org.apache.uima.caseditor_${project.version}</finalName>
<!--resources>
<resource>
<targetPath>icons</targetPath>
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=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-ep-configurator/pom.xml Fri Apr 23
13:23:16 2010
@@ -31,7 +31,7 @@
<artifactId>uimaj-ep-configurator</artifactId>
<version>2.3.1.SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>UIMA Eclipse: ${artifactId}: Descriptor Editor</name>
+ <name>UIMA Eclipse: ${project.artifactId}: Descriptor Editor</name>
<description>A frame-based editor for most of the UIMA XML
descriptors</description>
<url>${uimaWebsiteUrl}</url>
@@ -222,7 +222,7 @@
<build>
- <finalName>org.apache.uima.desceditor_${version}</finalName>
+ <finalName>org.apache.uima.desceditor_${project.version}</finalName>
<plugins>
Modified: uima/uimaj/branches/mavenAlign/uimaj-ep-debug/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-ep-debug/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-ep-debug/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-ep-debug/pom.xml Fri Apr 23 13:23:16
2010
@@ -31,7 +31,7 @@
<artifactId>uimaj-ep-debug</artifactId>
<version>2.3.1.SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>UIMA Eclipse: ${artifactId}</name>
+ <name>UIMA Eclipse: ${project.artifactId}</name>
<description>Adds structure knowledge for common
UIMA data structures to the Eclipse Debug displays</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/branches/mavenAlign/uimaj-ep-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-ep-runtime/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-ep-runtime/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-ep-runtime/pom.xml Fri Apr 23 13:23:16
2010
@@ -31,7 +31,7 @@
<artifactId>uimaj-ep-runtime</artifactId>
<version>2.3.1.SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>UIMA Eclipse: ${artifactId}</name>
+ <name>UIMA Eclipse: ${project.artifactId}</name>
<description>Provides the core UIMA Framework to other Eclipse
plugins for their use</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/branches/mavenAlign/uimaj-examples/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-examples/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-examples/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-examples/pom.xml Fri Apr 23 13:23:16
2010
@@ -31,7 +31,7 @@
<artifactId>uimaj-examples</artifactId>
<packaging>jar</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Base: ${artifactId}: SDK Examples</name>
+ <name>UIMA Base: ${project.artifactId}: SDK Examples</name>
<description>Examples and sample code</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/branches/mavenAlign/uimaj-internal-tools/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-internal-tools/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-internal-tools/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-internal-tools/pom.xml Fri Apr 23
13:23:16 2010
@@ -31,7 +31,7 @@
<artifactId>uimaj-internal-tools</artifactId>
<packaging>jar</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Base: ${artifactId}: internal Tools</name>
+ <name>UIMA Base: ${project.artifactId}: internal Tools</name>
<description>Internal tooling for developing UIMA,
not a part of normal distributions.</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/branches/mavenAlign/uimaj-test-util/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-test-util/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-test-util/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-test-util/pom.xml Fri Apr 23 13:23:16
2010
@@ -32,7 +32,7 @@
<artifactId>uimaj-test-util</artifactId>
<packaging>jar</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Base: ${artifactId}: JUnit utilities</name>
+ <name>UIMA Base: ${project.artifactId}: JUnit utilities</name>
<description>Utilities for testing UIMA</description>
<url>${uimaWebsiteUrl}</url>
Modified: uima/uimaj/branches/mavenAlign/uimaj-tools/pom.xml
URL:
http://svn.apache.org/viewvc/uima/uimaj/branches/mavenAlign/uimaj-tools/pom.xml?rev=937285&r1=937284&r2=937285&view=diff
==============================================================================
--- uima/uimaj/branches/mavenAlign/uimaj-tools/pom.xml (original)
+++ uima/uimaj/branches/mavenAlign/uimaj-tools/pom.xml Fri Apr 23 13:23:16 2010
@@ -31,7 +31,7 @@
<artifactId>uimaj-tools</artifactId>
<packaging>jar</packaging>
<version>2.3.1-SNAPSHOT</version>
- <name>UIMA Base: ${artifactId}: Tools</name>
+ <name>UIMA Base: ${project.artifactId}: Tools</name>
<description>Tooling supporting UIMA use</description>
<url>${uimaWebsiteUrl}</url>
