From e67e22d0d48d622b9534727c9c76879b135bd1d4 Mon Sep 17 00:00:00 2001 From: brett Date: Sun, 13 Jun 2004 05:26:16 +0000 Subject: [PATCH] use executing version of maven to build and execute git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115471 13f79535-47bb-0310-9956-ffa450edef68 --- artifact/project.properties | 3 +++ artifact/xdocs/changes.xml | 1 + changelog/project.properties | 3 +++ changelog/xdocs/changes.xml | 1 + linkcheck/project.properties | 3 +++ linkcheck/project.xml | 2 +- linkcheck/xdocs/changes.xml | 3 +++ multiproject/project.properties | 3 +++ multiproject/xdocs/changes.xml | 1 + pom/project.properties | 3 +++ pom/project.xml | 3 +-- pom/xdocs/changes.xml | 5 ++++- release/project.properties | 2 ++ release/project.xml | 1 - release/xdocs/changes.xml | 1 + xdoc/project.properties | 5 ++++- xdoc/xdocs/changes.xml | 1 + 17 files changed, 35 insertions(+), 6 deletions(-) diff --git a/artifact/project.properties b/artifact/project.properties index d66f96c3..70b2868a 100644 --- a/artifact/project.properties +++ b/artifact/project.properties @@ -17,3 +17,6 @@ # ------------------------------------------------------------------- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- + +maven.jar.override = on +maven.jar.maven = ${maven.home}/lib/maven.jar diff --git a/artifact/xdocs/changes.xml b/artifact/xdocs/changes.xml index 5f1b7264..927e468f 100644 --- a/artifact/xdocs/changes.xml +++ b/artifact/xdocs/changes.xml @@ -26,6 +26,7 @@ + Build and run against the installed version of Maven Replace Apache Jakarta Maven by Apache Maven in Manifest diff --git a/changelog/project.properties b/changelog/project.properties index 1110ca15..6a32f7ec 100644 --- a/changelog/project.properties +++ b/changelog/project.properties @@ -18,3 +18,6 @@ # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- maven.junit.fork=true + +maven.jar.override = on +maven.jar.maven = ${maven.home}/lib/maven.jar diff --git a/changelog/xdocs/changes.xml b/changelog/xdocs/changes.xml index c295296c..57c47900 100644 --- a/changelog/xdocs/changes.xml +++ b/changelog/xdocs/changes.xml @@ -27,6 +27,7 @@ + Build and run plugin against the installed version of Maven Fix date format with clearcase. Allow empty passwords in create-cvspass diff --git a/linkcheck/project.properties b/linkcheck/project.properties index 26a38936..4833d7d2 100644 --- a/linkcheck/project.properties +++ b/linkcheck/project.properties @@ -18,3 +18,6 @@ # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- maven.junit.fork=yes + +maven.jar.override = on +maven.jar.maven = ${maven.home}/lib/maven.jar diff --git a/linkcheck/project.xml b/linkcheck/project.xml index b77556bc..2d1c5498 100644 --- a/linkcheck/project.xml +++ b/linkcheck/project.xml @@ -23,7 +23,7 @@ 3 maven-linkcheck-plugin Maven LinkCheck Plug-in - 1.3 + 1.3.1-SNAPSHOT Check xdoc links. Requires Maven 1.0 RC2. Check xdoc links http://maven.apache.org/reference/plugins/linkcheck/ diff --git a/linkcheck/xdocs/changes.xml b/linkcheck/xdocs/changes.xml index 53a00060..f67705a1 100644 --- a/linkcheck/xdocs/changes.xml +++ b/linkcheck/xdocs/changes.xml @@ -25,6 +25,9 @@ Vincent Massol + + Build and run plugin against the installed version of Maven + Now supports failing the build on error if you set the new maven.linkcheck.failonerrorproperty to diff --git a/multiproject/project.properties b/multiproject/project.properties index d66f96c3..70b2868a 100644 --- a/multiproject/project.properties +++ b/multiproject/project.properties @@ -17,3 +17,6 @@ # ------------------------------------------------------------------- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- + +maven.jar.override = on +maven.jar.maven = ${maven.home}/lib/maven.jar diff --git a/multiproject/xdocs/changes.xml b/multiproject/xdocs/changes.xml index 4c6d87b9..b8bdb0d4 100644 --- a/multiproject/xdocs/changes.xml +++ b/multiproject/xdocs/changes.xml @@ -26,6 +26,7 @@ + Build and run plugin against the installed version of Maven Make sure source directory exists as some circumstances cause it not to diff --git a/pom/project.properties b/pom/project.properties index d66f96c3..70b2868a 100644 --- a/pom/project.properties +++ b/pom/project.properties @@ -17,3 +17,6 @@ # ------------------------------------------------------------------- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- + +maven.jar.override = on +maven.jar.maven = ${maven.home}/lib/maven.jar diff --git a/pom/project.xml b/pom/project.xml index 2eedf1dc..b0814cd1 100644 --- a/pom/project.xml +++ b/pom/project.xml @@ -23,7 +23,7 @@ 3 maven-pom-plugin Maven POM Plugin - 1.4 + 1.4.1-SNAPSHOT Check Project Object Model http://maven.apache.org/reference/plugins/pom/ @@ -88,7 +88,6 @@ 1.0.b2 - maven.jar maven maven 1.0-rc2 diff --git a/pom/xdocs/changes.xml b/pom/xdocs/changes.xml index 05cff57d..9a5c35d8 100644 --- a/pom/xdocs/changes.xml +++ b/pom/xdocs/changes.xml @@ -24,7 +24,10 @@ - + + Build and run plugin against the installed version of Maven + + remove empty pom:update goal diff --git a/release/project.properties b/release/project.properties index efb9e11d..4833d7d2 100644 --- a/release/project.properties +++ b/release/project.properties @@ -19,3 +19,5 @@ # ------------------------------------------------------------------- maven.junit.fork=yes +maven.jar.override = on +maven.jar.maven = ${maven.home}/lib/maven.jar diff --git a/release/project.xml b/release/project.xml index f31c3a00..b8aaa6ae 100644 --- a/release/project.xml +++ b/release/project.xml @@ -48,7 +48,6 @@ - maven.jar maven maven 1.0-rc2 diff --git a/release/xdocs/changes.xml b/release/xdocs/changes.xml index bd061ae6..699b0181 100644 --- a/release/xdocs/changes.xml +++ b/release/xdocs/changes.xml @@ -26,6 +26,7 @@ + Build and run plugin against the installed version of Maven Code cleanup - remove unused imports diff --git a/xdoc/project.properties b/xdoc/project.properties index 22100b79..4833d7d2 100644 --- a/xdoc/project.properties +++ b/xdoc/project.properties @@ -17,4 +17,7 @@ # ------------------------------------------------------------------- # P R O J E C T P R O P E R T I E S # ------------------------------------------------------------------- -maven.junit.fork=yes \ No newline at end of file +maven.junit.fork=yes + +maven.jar.override = on +maven.jar.maven = ${maven.home}/lib/maven.jar diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml index f6300748..95ab48c9 100644 --- a/xdoc/xdocs/changes.xml +++ b/xdoc/xdocs/changes.xml @@ -27,6 +27,7 @@ Correct ampersand handling in hrefs. + Build and run plugin against the installed version of Maven Fix bad target in links generated in reports overview page.