svn commit: r937285 - in /uima/uimaj/branches/mavenAlign: PearPackagingMavenPlugin/ PearPackagingMavenPlugin/docbook/PearPackagingMavenPluginUserGuide/ aggregate-pom-uimaj-eclipse-plugins/ aggregate-p
Author: schor
Date: Fri Apr 23 13:23:16 2010
New Revision: 937285
URL: http://svn.apache.org/viewvc?rev=937285view=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=937285r1=937284r2=937285view=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 @@
codelt;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 codedesc/${artifactId}.xml/code.
+ project root. A good default
to use is codedesc/${project.artifactId}.xml/code.
/para
/listitem
listitem
para
codelt;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=937285r1=937284r2=937285view=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 @@
artifactIdPearPackagingMavenPlugin/artifactId
version2.3.1-SNAPSHOT/version
packagingmaven-plugin/packaging
- nameUIMA Maven Plugin ${artifactId}/name
+ nameUIMA Maven Plugin ${project.artifactId}/name
descriptionThis is a maven plugin that produces a
svn commit: r937287 - in /uima/site/trunk/uima-website: docs/doc-uima-pears.html docs/maven-design.html xdocs/maven-design.xml
Author: schor
Date: Fri Apr 23 13:31:28 2010
New Revision: 937287
URL: http://svn.apache.org/viewvc?rev=937287view=rev
Log:
[UIMA-1756] requirement to use project.xxx, in maven 3
Modified:
uima/site/trunk/uima-website/docs/doc-uima-pears.html
uima/site/trunk/uima-website/docs/maven-design.html
uima/site/trunk/uima-website/xdocs/maven-design.xml
Modified: uima/site/trunk/uima-website/docs/doc-uima-pears.html
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/doc-uima-pears.html?rev=937287r1=937286r2=937287view=diff
==
--- uima/site/trunk/uima-website/docs/doc-uima-pears.html (original)
+++ uima/site/trunk/uima-website/docs/doc-uima-pears.html Fri Apr 23 13:31:28
2010
@@ -361,8 +361,8 @@
lt;phasegt;packagelt;/phasegt;
lt;configurationgt;
lt;classpathgt;$main_root/lib/sample.jarlt;/classpathgt;
-
lt;mainComponentDescgt;desc/${artifactId}.xmllt;/mainComponentDescgt;
- lt;componentIdgt;${artifactId}lt;/componentIdgt;
+
lt;mainComponentDescgt;desc/${project.artifactId}.xmllt;/mainComponentDescgt;
+ lt;componentIdgt;${project.artifactId}lt;/componentIdgt;
lt;datapathgt;$main_root/resourceslt;/datapathgt;
lt;/configurationgt;
lt;goalsgt;
Modified: uima/site/trunk/uima-website/docs/maven-design.html
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/docs/maven-design.html?rev=937287r1=937286r2=937287view=diff
==
--- uima/site/trunk/uima-website/docs/maven-design.html (original)
+++ uima/site/trunk/uima-website/docs/maven-design.html Fri Apr 23 13:31:28 2010
@@ -214,6 +214,13 @@ and aggregation POMs do not do common fa
parent. Doing this is a recommended best practice./li
/ul
/p
+pMaven 3 has more
requirements on POMs
+pA transition to Maven 3 is occuring in 2010. The Eclipse plugin,
m2eclipse, embeds
+ Maven 3 already./p
+ul
+ liProperty names have to include their path from project, etc. For
instance, you cannot use
+${version}, you have to use ${project.version}./li
+/ul/p
/blockquote
/p
/td/tr
Modified: uima/site/trunk/uima-website/xdocs/maven-design.xml
URL:
http://svn.apache.org/viewvc/uima/site/trunk/uima-website/xdocs/maven-design.xml?rev=937287r1=937286r2=937287view=diff
==
--- uima/site/trunk/uima-website/xdocs/maven-design.xml (original)
+++ uima/site/trunk/uima-website/xdocs/maven-design.xml Fri Apr 23 13:31:28 2010
@@ -73,6 +73,13 @@ and aggregation POMs do not do common fa
parent. Doing this is a recommended best practice./li
/ul
/p
+ pMaven 3 has more requirements on POMs
+pA transition to Maven 3 is occuring in 2010. The Eclipse plugin,
m2eclipse, embeds
+ Maven 3 already./p
+ul
+ liProperty names have to include their path from project, etc. For
instance, you cannot use
+${version}, you have to use ${project.version}./li
+/ul/p
/section
/body
/document
\ No newline at end of file
