From b5f0b1375812e1ee20e3e5b33d7962fd5ad09cd8 Mon Sep 17 00:00:00 2001 From: brett Date: Tue, 6 Jul 2004 12:37:18 +0000 Subject: [PATCH] update a bunch of plugin dependency usages git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@115672 13f79535-47bb-0310-9956-ffa450edef68 --- abbot/plugin.jelly | 1 + artifact/plugin.jelly | 3 +-- artifact/xdocs/changes.xml | 1 + aspectj/plugin.jelly | 1 + clover/plugin.jelly | 1 + ear/plugin.jelly | 4 +++- ear/project.xml | 2 +- ear/xdocs/changes.xml | 3 +++ eclipse/plugin.jelly | 1 + idea/plugin.jelly | 4 ++-- java/plugin.jelly | 1 + java/xdocs/changes.xml | 1 + javadoc/plugin.jelly | 1 + multiproject/plugin.jelly | 1 + multiproject/project.xml | 2 +- multiproject/xdocs/changes.xml | 3 +++ rar/plugin.jelly | 4 +++- rar/xdocs/changes.xml | 1 + test/plugin.jelly | 1 + test/project.xml | 2 +- test/xdocs/changes.xml | 3 +++ war/plugin.jelly | 4 +++- war/xdocs/changes.xml | 1 + 23 files changed, 36 insertions(+), 10 deletions(-) diff --git a/abbot/plugin.jelly b/abbot/plugin.jelly index 1a56977b..2b004571 100644 --- a/abbot/plugin.jelly +++ b/abbot/plugin.jelly @@ -359,6 +359,7 @@ + DEPRECATED: the use of dependency-handle is deprecated. Please use maven:get/set to modify properties of the abbot plugin diff --git a/artifact/plugin.jelly b/artifact/plugin.jelly index 0397ecf4..f62673fa 100644 --- a/artifact/plugin.jelly +++ b/artifact/plugin.jelly @@ -214,8 +214,7 @@ - DEPRECATED: you do not need to use artifact:load for plugin dependencies. Instead, use the - xmlns:artifact="artifact" notation + DEPRECATED: you do not need to use artifact:load for plugin dependencies. diff --git a/artifact/xdocs/changes.xml b/artifact/xdocs/changes.xml index 323e3724..4752c7f5 100644 --- a/artifact/xdocs/changes.xml +++ b/artifact/xdocs/changes.xml @@ -26,6 +26,7 @@ + Deprecated the artifact:load hook goal Allow use of distributionSite POM attribute in artifact method Update dependencies on commons-* diff --git a/aspectj/plugin.jelly b/aspectj/plugin.jelly index 8751a198..bc1e8059 100644 --- a/aspectj/plugin.jelly +++ b/aspectj/plugin.jelly @@ -211,6 +211,7 @@ + diff --git a/clover/plugin.jelly b/clover/plugin.jelly index 656ea0d1..ec617fe1 100644 --- a/clover/plugin.jelly +++ b/clover/plugin.jelly @@ -34,6 +34,7 @@ --> + diff --git a/ear/plugin.jelly b/ear/plugin.jelly index 0b2a744d..8e17ac4f 100644 --- a/ear/plugin.jelly +++ b/ear/plugin.jelly @@ -257,7 +257,9 @@ - + + DEPRECATED: do not use ear:load, there is no need + diff --git a/ear/project.xml b/ear/project.xml index 1ea1bacb..05473e61 100644 --- a/ear/project.xml +++ b/ear/project.xml @@ -23,7 +23,7 @@ 3 maven-ear-plugin Maven EAR Plugin - 1.5 + 1.6-SNAPSHOT Ear Plugin for Maven Ear Plugin for Maven http://maven.apache.org/reference/plugins/ear/ diff --git a/ear/xdocs/changes.xml b/ear/xdocs/changes.xml index 2b3050a8..fc2ec69e 100644 --- a/ear/xdocs/changes.xml +++ b/ear/xdocs/changes.xml @@ -24,6 +24,9 @@ Nathan Coast + + Deprecated the ear:load hook goal + Ignore generated file in plugin test. Check to make sure maven.ear.src exists before using it. diff --git a/eclipse/plugin.jelly b/eclipse/plugin.jelly index c8758db3..e8578847 100644 --- a/eclipse/plugin.jelly +++ b/eclipse/plugin.jelly @@ -25,6 +25,7 @@ xmlns:cactus="cactus" xmlns:util="jelly:util"> + diff --git a/idea/plugin.jelly b/idea/plugin.jelly index c06c11b5..b612c1dd 100644 --- a/idea/plugin.jelly +++ b/idea/plugin.jelly @@ -24,6 +24,7 @@ xmlns:util="jelly:util" xmlns:maven="jelly:maven"> + @@ -67,8 +68,7 @@ - + diff --git a/java/plugin.jelly b/java/plugin.jelly index 9aec2e84..aaefbe1c 100644 --- a/java/plugin.jelly +++ b/java/plugin.jelly @@ -153,6 +153,7 @@ + DEPRECATED: the use of dependency-handle is deprecated. Please use maven:get/set to modify properties of the java plugin diff --git a/java/xdocs/changes.xml b/java/xdocs/changes.xml index 0423d6a9..f2d60a45 100644 --- a/java/xdocs/changes.xml +++ b/java/xdocs/changes.xml @@ -26,6 +26,7 @@ + Deprecate dependency handle Use assert taglib for tests diff --git a/javadoc/plugin.jelly b/javadoc/plugin.jelly index aa971ded..2c8e1e93 100644 --- a/javadoc/plugin.jelly +++ b/javadoc/plugin.jelly @@ -33,6 +33,7 @@ + diff --git a/multiproject/plugin.jelly b/multiproject/plugin.jelly index 78bbc110..1f9d6993 100644 --- a/multiproject/plugin.jelly +++ b/multiproject/plugin.jelly @@ -30,6 +30,7 @@ + DEPRECATED: the use of dependency-handle is deprecated. Please use maven:get/set to modify properties of the multiproject plugin diff --git a/multiproject/project.xml b/multiproject/project.xml index a8f865ad..5659fda3 100644 --- a/multiproject/project.xml +++ b/multiproject/project.xml @@ -22,7 +22,7 @@ ../plugin-parent/project.xml maven-multiproject-plugin Maven Multi-Project Plug-in - 1.3.1 + 1.4-SNAPSHOT A plugin to handle the building of multiple projects within maven. Requires Maven 1.0 RC3 Multi-Project Plugin for Maven http://maven.apache.org/reference/plugins/multiproject/ diff --git a/multiproject/xdocs/changes.xml b/multiproject/xdocs/changes.xml index 0a64296e..bdeb3fde 100644 --- a/multiproject/xdocs/changes.xml +++ b/multiproject/xdocs/changes.xml @@ -25,6 +25,9 @@ Vincent Massol + + Deprecate dependency handle + 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/rar/plugin.jelly b/rar/plugin.jelly index 3659b8f5..be57cfca 100644 --- a/rar/plugin.jelly +++ b/rar/plugin.jelly @@ -187,7 +187,9 @@ - + + DEPRECATED: rar:load is deprecated. Please use maven:get to obtain variables + diff --git a/rar/xdocs/changes.xml b/rar/xdocs/changes.xml index 38dc5a73..a8a82fac 100644 --- a/rar/xdocs/changes.xml +++ b/rar/xdocs/changes.xml @@ -25,6 +25,7 @@ + Deprecate rar:load hook goal Add xdocs/changes.xml Move versions element to correct location in POM Make plugin.jelly ascii for CVS diff --git a/test/plugin.jelly b/test/plugin.jelly index f31b8d8d..7b212ab6 100644 --- a/test/plugin.jelly +++ b/test/plugin.jelly @@ -421,6 +421,7 @@ + DEPRECATED: the use of dependency-handle is deprecated. Please use maven:get/set to modify properties of the test plugin diff --git a/test/project.xml b/test/project.xml index 14519cf5..d348d839 100644 --- a/test/project.xml +++ b/test/project.xml @@ -23,7 +23,7 @@ 3 maven-test-plugin Maven Test Plug-in - 1.6.2 + 1.7-SNAPSHOT Run JUnit tests. Requires Maven 1.0 RC2. Run JUnit tests http://maven.apache.org/reference/plugins/test/ diff --git a/test/xdocs/changes.xml b/test/xdocs/changes.xml index 1b5b4ba6..529ca680 100644 --- a/test/xdocs/changes.xml +++ b/test/xdocs/changes.xml @@ -24,6 +24,9 @@ dIon Gillard + + Deprecate dependency handle + honour source modifications for test compilation handle JVM args correctly in test:match diff --git a/war/plugin.jelly b/war/plugin.jelly index d8976cd9..a79b9d61 100644 --- a/war/plugin.jelly +++ b/war/plugin.jelly @@ -264,7 +264,9 @@ - + + DEPRECATED: war:load is deprecated, please use maven:get tags + diff --git a/war/xdocs/changes.xml b/war/xdocs/changes.xml index 9aadafb5..92989123 100644 --- a/war/xdocs/changes.xml +++ b/war/xdocs/changes.xml @@ -25,6 +25,7 @@ + Deprecated war:load hook goal Allow use of maven.war.manifest to specify the manifest file location.