From 8cb683d4ef54aa10e12f3c6d9fc49aab99d4bb94 Mon Sep 17 00:00:00 2001 From: aheritier Date: Thu, 13 Oct 2005 23:17:23 +0000 Subject: [PATCH] MAVEN-1712 : Update dependencies to match ones in maven 1.1 core and to unify them between plugins. git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@320941 13f79535-47bb-0310-9956-ffa450edef68 --- abbot/project.xml | 24 +++--- abbot/xdocs/changes.xml | 13 ++- announcement/project.xml | 12 ++- announcement/xdocs/changes.xml | 8 +- ant/project.xml | 5 +- ant/xdocs/changes.xml | 7 ++ antlr/project.xml | 3 + artifact/project.xml | 40 +++++++-- artifact/xdocs/changes.xml | 10 +++ changelog/project.xml | 31 ++++--- changelog/xdocs/changes.xml | 10 +++ changes/project.xml | 16 ++-- changes/xdocs/changes.xml | 6 ++ cruisecontrol/project.xml | 5 +- cruisecontrol/src/plugin-test/project.xml | 11 +-- cruisecontrol/xdocs/changes.xml | 7 ++ dashboard/src/plugin-test/common/project.xml | 4 +- .../project.xml | 14 ++-- developer-activity/project.xml | 7 +- developer-activity/xdocs/changes.xml | 7 ++ dist/project.xml | 13 ++- dist/xdocs/changes.xml | 6 ++ ear/project.xml | 12 ++- .../bundlePropertiesTest/maven.xml | 2 +- .../bundlePropertiesTest/project.xml | 2 +- ear/src/plugin-test/simpleTest/maven.xml | 4 +- ear/src/plugin-test/simpleTest/project.xml | 4 +- ear/xdocs/changes.xml | 8 ++ .../plugin-test/justresourcestest/project.xml | 37 ++++----- eclipse/src/plugin-test/maintest/project.xml | 81 +++++++++---------- ejb/project.xml | 13 ++- ejb/xdocs/changes.xml | 6 ++ faq/project.xml | 21 +++-- faq/xdocs/changes.xml | 8 ++ file-activity/project.xml | 7 +- file-activity/xdocs/changes.xml | 7 ++ .../template-resources/project.xml | 2 +- .../struts/template-resources/project.xml | 2 +- .../template-resources/project.xml | 4 +- genapp/xdocs/changes.xml | 2 +- hibernate/project.xml | 44 +++++++--- .../codeGenerationTest/project.xml | 18 ++--- .../src/plugin-test/simpleTest/project.xml | 18 ++--- hibernate/xdocs/changes.xml | 11 +++ html2xdoc/project.xml | 19 ++--- html2xdoc/xdocs/changes.xml | 10 +++ j2ee/plugin.jelly | 2 +- j2ee/project.xml | 10 ++- j2ee/xdocs/changes.xml | 7 ++ jalopy/project.xml | 9 ++- jalopy/xdocs/changes.xml | 10 ++- jar/project.xml | 3 +- jar/xdocs/changes.xml | 5 ++ javacc/project.xml | 9 ++- javacc/xdocs/changes.xml | 7 ++ javadoc/project.xml | 8 +- jbuilder/project.xml | 5 +- jbuilder/xdocs/changes.xml | 9 ++- jcoverage/project.xml | 23 +++--- jcoverage/xdocs/changes.xml | 10 ++- jdepend/project.xml | 21 ++--- jdepend/xdocs/changes.xml | 8 ++ jdiff/project.xml | 2 +- jellydoc/plugin.jelly | 4 +- jellydoc/project.xml | 26 +++--- jellydoc/xdocs/changes.xml | 10 +++ jetty/project.xml | 8 +- jetty/xdocs/changes.xml | 5 ++ jira/project.xml | 14 +++- jira/xdocs/changes.xml | 5 ++ junit-report/project.xml | 5 +- junit-report/xdocs/changes.xml | 7 +- jxr/project.xml | 14 +++- jxr/xdocs/changes.xml | 8 ++ linkcheck/project.xml | 48 +++++++++-- linkcheck/xdocs/changes.xml | 11 +++ multiproject/project.xml | 13 +-- multiproject/xdocs/changes.xml | 7 ++ pdf/plugin.jelly | 8 +- pdf/project.xml | 15 ++-- pdf/xdocs/changes.xml | 6 ++ plugin-parent/project.properties | 36 ++++++++- plugin/project.xml | 24 ++++-- plugin/src/plugin-test/project.xml | 6 +- plugin/xdocs/changes.xml | 8 ++ pom/project.xml | 9 ++- pom/xdocs/changes.xml | 8 +- project.xml | 18 +---- rar/project.xml | 5 +- rar/xdocs/changes.xml | 7 +- release/project.xml | 25 +++--- release/xdocs/changes.xml | 10 +++ repository/project.xml | 12 ++- repository/xdocs/changes.xml | 8 +- scm/project.xml | 7 +- simian/project.xml | 13 ++- simian/xdocs/changes.xml | 6 ++ site/project.xml | 5 +- site/xdocs/changes.xml | 2 +- tasklist/project.xml | 5 +- tasklist/xdocs/changes.xml | 7 ++ test/plugin.jelly | 20 ++--- test/project.xml | 19 ++--- test/xdocs/changes.xml | 8 +- xdoc/project.xml | 22 ++++- xdoc/xdocs/changes.xml | 6 ++ 106 files changed, 886 insertions(+), 373 deletions(-) diff --git a/abbot/project.xml b/abbot/project.xml index 938f891a..9c1ecb8b 100644 --- a/abbot/project.xml +++ b/abbot/project.xml @@ -1,5 +1,4 @@ - - ../plugin-parent/project.xml 3 @@ -83,14 +81,13 @@ jdom jdom - b10 + 1.0 true true - mrj MRJToolkitStubs @@ -118,8 +115,8 @@ xerces - xerces - 2.4.0 + xercesImpl + 2.6.2 true true @@ -128,7 +125,7 @@ xerces xmlParserAPIs - 2.2.1 + 2.6.2 true true @@ -137,24 +134,29 @@ ant ant - 1.5.3-1 + 1.6.5 true + Overriden by the release of this library bundled in the core of maven and already loaded in the root classloader. ant - ant-optional - 1.5.3-1 + ant-junit + 1.6.5 true + Overriden by the release of this library bundled in the core of maven and already loaded in the root classloader. commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/xml/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/abbot/xdocs/changes.xml b/abbot/xdocs/changes.xml index ce110e2a..512f2544 100644 --- a/abbot/xdocs/changes.xml +++ b/abbot/xdocs/changes.xml @@ -1,12 +1,21 @@ - Changes Vincent Massol - + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • ant v1.5.3-1 -> v1.6.5
    • +
  • ant-junit (ant-optional) v1.5.3-1 -> v1.6.5
    • +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
  • jdom v b10 -> v1.0
    • +
  • xercesImpl v 2.4.0 -> v2.6.2
    • +
  • xmlParserAPIs v 2.2.1 -> v2.6.2
    • +
+ Removed the need to set up a JAVAWS_HOME property. This is now automatically inferred from ${java.home} and defaults diff --git a/announcement/project.xml b/announcement/project.xml index 0cbd1bc4..bb2c4908 100644 --- a/announcement/project.xml +++ b/announcement/project.xml @@ -1,5 +1,4 @@ - - ../plugin-parent/project.xml 3 @@ -102,17 +100,23 @@ commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/xml/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-lang 2.0 http://jakarta.apache.org/commons/lang/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-net - 1.2.1 + 1.4.0 http://jakarta.apache.org/commons/net/ diff --git a/announcement/xdocs/changes.xml b/announcement/xdocs/changes.xml index 65a377b1..d555932e 100644 --- a/announcement/xdocs/changes.xml +++ b/announcement/xdocs/changes.xml @@ -24,7 +24,13 @@ Vincent Massol - + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-net v1.2.1 -> v1.4.0
    • +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
+ Support new format of <action> element in changes.xml. CR-LF generated do not match the platform. Xml entities transformed in wrong direction. diff --git a/ant/project.xml b/ant/project.xml index a6b186bb..f42293ec 100644 --- a/ant/project.xml +++ b/ant/project.xml @@ -92,7 +92,10 @@ commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/ant/xdocs/changes.xml b/ant/xdocs/changes.xml index 542ff177..9e13f277 100644 --- a/ant/xdocs/changes.xml +++ b/ant/xdocs/changes.xml @@ -25,6 +25,13 @@ Arnaud Heritier + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
+ + Ant script looks for dependencies in several remote repositories. Add License file to jar META-INF. diff --git a/antlr/project.xml b/antlr/project.xml index 5fb87238..7a737da6 100644 --- a/antlr/project.xml +++ b/antlr/project.xml @@ -89,6 +89,9 @@ commons-lang commons-lang 2.0 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + antlr diff --git a/artifact/project.xml b/artifact/project.xml index 1253cbc3..35277d50 100644 --- a/artifact/project.xml +++ b/artifact/project.xml @@ -1,5 +1,4 @@ - @@ -180,13 +200,19 @@ commons-jexl commons-jexl - 1.0-beta-1 + 1.0 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + forehead forehead 1.0-beta-5 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/artifact/xdocs/changes.xml b/artifact/xdocs/changes.xml index 5e6c37dd..f922c266 100644 --- a/artifact/xdocs/changes.xml +++ b/artifact/xdocs/changes.xml @@ -25,6 +25,16 @@ + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-collections v3.1 -> v3.0
    • +
  • commons-httpclient v2.0 -> v2.0.2
    • +
  • commons-jelly v1.0-beta-4 -> v1.0
    • +
  • commons-jexl v1.0-beta-1 -> v1.0
    • +
  • commons-net v1.1.0 -> v1.4.0
    • +
  • plexus-utils v1.0-alpha-3 -> v1.0.3
    • +
+ Correct handling of directory without a leading / When rewriting POM, versions of dependencies overrided are resolved. New tag artifact:rewritePOM to Rewrite a full model. Inheritence,expression, and versions of dependencies overrided are resolved. diff --git a/changelog/project.xml b/changelog/project.xml index 1e2637c9..63d1d889 100644 --- a/changelog/project.xml +++ b/changelog/project.xml @@ -1,5 +1,4 @@ - maven maven-model - 3.0.0 + 3.0.1 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + xerces - xerces - 2.4.0 + xercesImpl + 2.6.2 - xml-apis - xml-apis - 1.0.b2 + xerces + xmlParserAPIs + 2.6.2 diff --git a/changelog/xdocs/changes.xml b/changelog/xdocs/changes.xml index e6431bfe..517e3e70 100644 --- a/changelog/xdocs/changes.xml +++ b/changelog/xdocs/changes.xml @@ -25,6 +25,16 @@ + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • ant v1.5.3-1 -> v1.6.5
    • +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
  • maven v1.0 -> v1.0.2
    • +
  • maven-model v3.0.0 -> v3.0.1
    • +
  • xercesImpl v 2.4.0 -> v2.6.2
    • +
  • xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2
    • +
+ Incorrect parsing of SVN log files when username contains spaces. diff --git a/changes/project.xml b/changes/project.xml index bca38bbf..9d6ae457 100644 --- a/changes/project.xml +++ b/changes/project.xml @@ -1,5 +1,4 @@ - - ../plugin-parent/project.xml 3 @@ -98,18 +96,24 @@ dom4j dom4j - 1.4-dev-8 + 1.4 http://www.dom4j.org/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-io commons-io 1.0 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + - xml-apis - xml-apis - 1.0.b2 + xerces + xmlParserAPIs + 2.6.2 http://xml.apache.org/xerces2-j/ diff --git a/changes/xdocs/changes.xml b/changes/xdocs/changes.xml index 89d0c2c2..27ca050a 100644 --- a/changes/xdocs/changes.xml +++ b/changes/xdocs/changes.xml @@ -25,6 +25,12 @@ + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • dom4j v1.4-dev-8 -> v1.4
    • +
  • xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2
    • +
+ Validate changes.xml. Add multiple due-to/due-to-email support. Add multiple issue support. diff --git a/cruisecontrol/project.xml b/cruisecontrol/project.xml index ae636301..4f69b758 100644 --- a/cruisecontrol/project.xml +++ b/cruisecontrol/project.xml @@ -109,8 +109,11 @@ commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/xml/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-jelly diff --git a/cruisecontrol/src/plugin-test/project.xml b/cruisecontrol/src/plugin-test/project.xml index 0980fec9..a0c901c3 100644 --- a/cruisecontrol/src/plugin-test/project.xml +++ b/cruisecontrol/src/plugin-test/project.xml @@ -16,8 +16,6 @@ * limitations under the License. */ --> - - 3 test-maven-cruisecontrol-plugin @@ -36,7 +34,6 @@ Test for Maven CruiseControl plugin http://maven.apache.org/reference/plugins/cruisecontrol/ /www/maven.apache.org/reference/plugins/cruisecontrol/ - Eric Pugh @@ -48,17 +45,15 @@ - commons-jelly commons-jelly-tags-xml - 1.0 - + 1.1 + - src/main epugh@opensourceconnections.com - + diff --git a/cruisecontrol/xdocs/changes.xml b/cruisecontrol/xdocs/changes.xml index 99fa7f4b..c9706c17 100644 --- a/cruisecontrol/xdocs/changes.xml +++ b/cruisecontrol/xdocs/changes.xml @@ -25,6 +25,13 @@ Vincent Massol + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
+ + Properties documentation lists incorrect default for maven.cruisecontrol.buildresults.url diff --git a/dashboard/src/plugin-test/common/project.xml b/dashboard/src/plugin-test/common/project.xml index 7c56fe30..1b13f044 100644 --- a/dashboard/src/plugin-test/common/project.xml +++ b/dashboard/src/plugin-test/common/project.xml @@ -1,5 +1,4 @@ - - 3 maven @@ -39,7 +37,7 @@ commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/xml/ diff --git a/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml b/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml index 901dfcf9..ca56c51a 100644 --- a/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml +++ b/dashboard/src/plugin-test/testIndividualReportsNotGeneratedByDashboard/project.xml @@ -1,5 +1,4 @@ - - ${basedir}/../common/project.xml testIndividualReportsNotGeneratedByDashboard @@ -25,13 +23,13 @@ xerces - xerces - 2.4.0 + xercesImpl + 2.6.2 - xml-apis - xml-apis - 1.0.b2 + xerces + xmlParserAPIs + 2.6.2 @@ -41,7 +39,7 @@ maven-findbugs-plugin maven-junit-report-plugin maven-simian-plugin - maven-jcoverage-plugin + maven-jcoverage-plugin maven-tasklist-plugin maven-javancss-plugin diff --git a/developer-activity/project.xml b/developer-activity/project.xml index 76e7e6df..dc761426 100644 --- a/developer-activity/project.xml +++ b/developer-activity/project.xml @@ -22,7 +22,7 @@ 3 maven-developer-activity-plugin Maven Developer Activity Plugin - 1.5.2 + 1.6-SNAPSHOT This document provides a report of activity in terms of CVS commits and breaks it out by developer. Developer Activity report http://maven.apache.org/reference/plugins/developer-activity/ @@ -95,8 +95,11 @@ commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/xml/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/developer-activity/xdocs/changes.xml b/developer-activity/xdocs/changes.xml index 07092164..39864dde 100644 --- a/developer-activity/xdocs/changes.xml +++ b/developer-activity/xdocs/changes.xml @@ -23,6 +23,13 @@ Emmanuel Venisse + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
+ + Allow single quotes in a developer's name Make template compatible with changelog 1.8 plugin diff --git a/dist/project.xml b/dist/project.xml index f2d41458..0c2ca51c 100644 --- a/dist/project.xml +++ b/dist/project.xml @@ -81,22 +81,31 @@ commons-logging commons-logging 1.0.3 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-lang commons-lang 2.0 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + maven maven - 1.0 + 1.0.2 maven maven-model - 3.0.0-SNAPSHOT + 3.0.1 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/dist/xdocs/changes.xml b/dist/xdocs/changes.xml index 23e76b17..6b24af75 100644 --- a/dist/xdocs/changes.xml +++ b/dist/xdocs/changes.xml @@ -25,6 +25,12 @@ + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • maven v1.0 -> v1.0.2
    • +
  • maven-model v3.0.0 -> v3.0.1
    • +
+ It requires at least maven-plugin-plugin v1.7. It requires at least maven-artifact-plugin v1.3. Added multiproject analogs mirroring single project goals. Also added the abiltiy to generate combined javadocs for multiproject distribution. However multiproject consolidation might be best put into the site plugin. These fixes are associated with the following JIRA enhancement issue. diff --git a/ear/project.xml b/ear/project.xml index d859092e..25160ace 100644 --- a/ear/project.xml +++ b/ear/project.xml @@ -23,7 +23,7 @@ 3 maven-ear-plugin Maven EAR Plugin - 1.7 + 1.8-SNAPSHOT Ear Plugin for Maven Ear Plugin for Maven http://maven.apache.org/reference/plugins/ear/ @@ -112,14 +112,20 @@ commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/xml/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-jelly commons-jelly-tags-util - 1.1 + 1.1.1 http://jakarta.apache.org/commons/jelly/libs/util/index.html + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/ear/src/plugin-test/bundlePropertiesTest/maven.xml b/ear/src/plugin-test/bundlePropertiesTest/maven.xml index aa433780..3c3bc9b5 100644 --- a/ear/src/plugin-test/bundlePropertiesTest/maven.xml +++ b/ear/src/plugin-test/bundlePropertiesTest/maven.xml @@ -42,7 +42,7 @@ msg="commons-logging was not bundled"/> - diff --git a/ear/src/plugin-test/bundlePropertiesTest/project.xml b/ear/src/plugin-test/bundlePropertiesTest/project.xml index 4fcb6f9c..f888052a 100644 --- a/ear/src/plugin-test/bundlePropertiesTest/project.xml +++ b/ear/src/plugin-test/bundlePropertiesTest/project.xml @@ -61,7 +61,7 @@ http://maven.apache.org/maven-v3_0_0.xsd"> commons-collections commons-collections - 2.1 + 3.0 true diff --git a/ear/src/plugin-test/simpleTest/maven.xml b/ear/src/plugin-test/simpleTest/maven.xml index dbaf6237..5a973e19 100644 --- a/ear/src/plugin-test/simpleTest/maven.xml +++ b/ear/src/plugin-test/simpleTest/maven.xml @@ -41,7 +41,7 @@ - @@ -53,7 +53,7 @@ diff --git a/ear/src/plugin-test/simpleTest/project.xml b/ear/src/plugin-test/simpleTest/project.xml index 61185c0a..8e47fa6c 100644 --- a/ear/src/plugin-test/simpleTest/project.xml +++ b/ear/src/plugin-test/simpleTest/project.xml @@ -54,7 +54,7 @@ http://maven.apache.org/maven-v3_0_0.xsd"> commons-collections commons-collections - 2.1 + 3.0 http://jakarta.apache.org/commons/collections/ true @@ -63,7 +63,7 @@ http://maven.apache.org/maven-v3_0_0.xsd"> commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 diff --git a/ear/xdocs/changes.xml b/ear/xdocs/changes.xml index 8ed3d5fa..fc210c08 100644 --- a/ear/xdocs/changes.xml +++ b/ear/xdocs/changes.xml @@ -24,6 +24,14 @@ Nathan Coast + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-jelly-tags-util v1.1 -> v1.1.1
    • +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
+ + Improved how dependencies are copied into the EAR file. Added property diff --git a/eclipse/src/plugin-test/justresourcestest/project.xml b/eclipse/src/plugin-test/justresourcestest/project.xml index a62474d8..3186719e 100644 --- a/eclipse/src/plugin-test/justresourcestest/project.xml +++ b/eclipse/src/plugin-test/justresourcestest/project.xml @@ -16,24 +16,21 @@ * limitations under the License. */ --> - - 3 ${basedir}/../project.xml test-maven-eclipse-nosourcetest-plugin Test project for Maven Eclipse Plugin (resources only) - maven - beta-8 + 1.0.2 maven.jar commons-jelly commons-jelly-tags-xml - 20030211.142705 + 1.1 junit @@ -45,22 +42,20 @@ src/main/java src/test/java - - src/main/resources - - **/*.properties - - false - - - src/main/noresources - - **/*.properties - - false - + + src/main/resources + + **/*.properties + + false + + + src/main/noresources + + **/*.properties + + false + - - diff --git a/eclipse/src/plugin-test/maintest/project.xml b/eclipse/src/plugin-test/maintest/project.xml index 17bab1c6..4d04b45c 100644 --- a/eclipse/src/plugin-test/maintest/project.xml +++ b/eclipse/src/plugin-test/maintest/project.xml @@ -16,22 +16,19 @@ * limitations under the License. */ --> - - 3 ${basedir}/../project.xml test-maven-eclipse-maintest-plugin (main) Test project for Maven Eclipse Plugin - - - facts - commons-dude - 1.0.3 - jar - - + + facts + commons-dude + 1.0.3 + jar + + maven 1.0.2 @@ -40,7 +37,7 @@ commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 junit @@ -57,38 +54,38 @@ src/main src/test - - **/TestAll.java - - - - src/test-resources - false - - - src/main - - + + **/TestAll.java + + + + src/test-resources + false + + + src/main + + - - src/main - - - src/resources - - **/*.properties - **/*.xml - - - **/*.log - **/*.txt - - false - - - src/test - + + src/main + + + src/resources + + **/*.properties + **/*.xml + + + **/*.log + **/*.txt + + false + + + src/test + - + diff --git a/ejb/project.xml b/ejb/project.xml index 9908e6ab..d9e9b13d 100644 --- a/ejb/project.xml +++ b/ejb/project.xml @@ -102,22 +102,31 @@ commons-logging commons-logging 1.0.3 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-lang commons-lang 2.0 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + maven maven - 1.0 + 1.0.2 maven maven-model - 3.0.0 + 3.0.1 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/ejb/xdocs/changes.xml b/ejb/xdocs/changes.xml index b2583fbe..b5c86b1e 100644 --- a/ejb/xdocs/changes.xml +++ b/ejb/xdocs/changes.xml @@ -25,6 +25,12 @@ + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • maven v1.0 -> v1.0.2
    • +
  • maven-model v3.0.0 -> v3.0.1
    • +
+ Update dependency to Maven Model v3.0.0 final (it was previously depending on 3.0.0 SNAPSHOT). diff --git a/faq/project.xml b/faq/project.xml index 5ef5f1a6..50eea3e7 100644 --- a/faq/project.xml +++ b/faq/project.xml @@ -1,5 +1,4 @@ - dom4j dom4j - 1.4-dev-8 + 1.4 http://www.dom4j.org/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + - xml-apis - xml-apis - 1.0.b2 + xerces + xmlParserAPIs + 2.6.2 http://xml.apache.org/xerces2-j/ xerces - xerces - 2.4.0 + xercesImpl + 2.6.2 http://xml.apache.org/xerces2-j/ diff --git a/faq/xdocs/changes.xml b/faq/xdocs/changes.xml index 774b26df..e06b9cb0 100644 --- a/faq/xdocs/changes.xml +++ b/faq/xdocs/changes.xml @@ -23,6 +23,14 @@ + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
  • dom4j v1.4-dev-8 -> v1.4
    • +
  • xercesImpl v 2.4.0 -> v2.6.2
    • +
  • xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2
    • +
+ New goal faq:validate. It requires at least maven-plugin-plugin v1.7. diff --git a/file-activity/project.xml b/file-activity/project.xml index fa354b40..f057c78b 100644 --- a/file-activity/project.xml +++ b/file-activity/project.xml @@ -22,7 +22,7 @@ 3 maven-file-activity-plugin Maven File Activity Plug-in - 1.5.2 + 1.6-SNAPSHOT jakarta This document provides a report of activity in terms of CVS commits and breaks it out by file. File activity Report @@ -116,8 +116,11 @@ commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/xml/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/file-activity/xdocs/changes.xml b/file-activity/xdocs/changes.xml index aa9b7efd..b5cbb92f 100644 --- a/file-activity/xdocs/changes.xml +++ b/file-activity/xdocs/changes.xml @@ -23,6 +23,13 @@ Emmanuel Venisse + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
+ + Make template compatible with changelog 1.8 plugin diff --git a/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml b/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml index bf248492..be033a43 100644 --- a/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml +++ b/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml @@ -168,7 +168,7 @@ commons-beanutils commons-beanutils - 1.6 + 1.6.1 true diff --git a/genapp/src/plugin-resources/struts/template-resources/project.xml b/genapp/src/plugin-resources/struts/template-resources/project.xml index 90884d2b..d0d130fe 100644 --- a/genapp/src/plugin-resources/struts/template-resources/project.xml +++ b/genapp/src/plugin-resources/struts/template-resources/project.xml @@ -151,7 +151,7 @@ commons-beanutils commons-beanutils - 1.6 + 1.6.1 true diff --git a/genapp/src/plugin-resources/web-velocity/template-resources/project.xml b/genapp/src/plugin-resources/web-velocity/template-resources/project.xml index 072944b7..b21d1bb1 100644 --- a/genapp/src/plugin-resources/web-velocity/template-resources/project.xml +++ b/genapp/src/plugin-resources/web-velocity/template-resources/project.xml @@ -93,7 +93,7 @@ commons-collections commons-collections - 3.1 + 3.0 true @@ -102,7 +102,7 @@ commons-beanutils commons-beanutils - 1.7.0 + 1.6.1 true diff --git a/genapp/xdocs/changes.xml b/genapp/xdocs/changes.xml index f21735cc..a1bbacaa 100644 --- a/genapp/xdocs/changes.xml +++ b/genapp/xdocs/changes.xml @@ -21,7 +21,7 @@ Changes - + Added customization guide. Added Velocity-based webapp template (named web-velocity). Use the project's name as display-name in web.xml. diff --git a/hibernate/project.xml b/hibernate/project.xml index 6c7ea92c..d6d5120b 100644 --- a/hibernate/project.xml +++ b/hibernate/project.xml @@ -1,5 +1,4 @@ - - ../plugin-parent/project.xml 3 maven-hibernate-plugin Maven Hibernate Plug-in - 1.3.1-SNAPSHOT + 1.4-SNAPSHOT Work with Hibernate classes http://maven.apache.org/reference/plugins/hibernate/ @@ -108,26 +106,38 @@ ant ant - 1.5.3-1 + 1.6.5 jar + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-jelly commons-jelly - 1.0-beta-4 + 1.0 http://jakarta.apache.org/commons/jelly/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-lang commons-lang 2.0 jar + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-beanutils commons-beanutils 1.6.1 jar + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-dbcp @@ -138,14 +148,20 @@ commons-collections commons-collections - 2.1 + 3.0 jar + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-logging commons-logging 1.0.3 jar + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-pool @@ -158,17 +174,20 @@ log4j 1.2.8 jar + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + - xml-apis - xml-apis - 1.0.b2 + xerces + xmlParserAPIs + 2.6.2 http://xml.apache.org/xerces2-j/ xerces - xerces - 2.4.0 + xercesImpl + 2.6.2 http://xml.apache.org/xerces2-j/ @@ -188,6 +207,9 @@ dom4j 1.4 jar + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + jdom diff --git a/hibernate/src/plugin-test/codeGenerationTest/project.xml b/hibernate/src/plugin-test/codeGenerationTest/project.xml index c2a2f414..874155a1 100644 --- a/hibernate/src/plugin-test/codeGenerationTest/project.xml +++ b/hibernate/src/plugin-test/codeGenerationTest/project.xml @@ -16,8 +16,6 @@ * limitations under the License. */ --> - - 3 test-maven-hibernate-plugin-codeGenerationTest @@ -50,32 +48,27 @@ Java Developer -3 - + - - commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/xml/ - - hsqldb hsqldb 1.7.1 jar - hibernate hibernate 2.1.3 jar - + cglib cglib @@ -87,7 +80,7 @@ dom4j 1.4 jar - + commons-lang commons-lang @@ -95,7 +88,6 @@ jar - src/main @@ -105,6 +97,6 @@ **/*.xml - + diff --git a/hibernate/src/plugin-test/simpleTest/project.xml b/hibernate/src/plugin-test/simpleTest/project.xml index 4e262548..4543bfad 100644 --- a/hibernate/src/plugin-test/simpleTest/project.xml +++ b/hibernate/src/plugin-test/simpleTest/project.xml @@ -16,8 +16,6 @@ * limitations under the License. */ --> - - 3 test-maven-hibernate-plugin-simpleTest @@ -59,32 +57,27 @@ Java Developer -3 - + - - commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/xml/ - - hsqldb hsqldb 1.7.1 jar - hibernate hibernate 2.1.3 jar - + cglib cglib @@ -96,9 +89,8 @@ dom4j 1.4 jar - + - src/main @@ -108,6 +100,6 @@ **/*.xml - + diff --git a/hibernate/xdocs/changes.xml b/hibernate/xdocs/changes.xml index 2513ecab..227e0ed0 100644 --- a/hibernate/xdocs/changes.xml +++ b/hibernate/xdocs/changes.xml @@ -24,6 +24,17 @@ Michal Maczka + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • ant v1.5.3-1 -> v1.6.5
    • +
  • commons-collections v2.1 -> v3.0
    • +
  • commons-jelly v1.0-beta-4 -> v1.0
    • +
  • xercesImpl v 2.4.0 -> v2.6.2
    • +
  • xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2
    • +
+ + Added new goal hibernate:code-generation. diff --git a/html2xdoc/project.xml b/html2xdoc/project.xml index 6c26d59f..8bb9be6d 100644 --- a/html2xdoc/project.xml +++ b/html2xdoc/project.xml @@ -1,5 +1,4 @@ - - ../plugin-parent/project.xml 3 maven-html2xdoc-plugin Maven Html2XDoc Plug-in - 1.3.2-SNAPSHOT + 1.4-SNAPSHOT jakarta Creates XDoc documentation from normal HTML documentation. HTML to xdoc transformer @@ -67,7 +65,7 @@ commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/xml/ @@ -82,7 +80,6 @@ 0.7.7 - commons-logging commons-logging @@ -91,19 +88,19 @@ dom4j dom4j - 1.4-dev-8 + 1.4 http://www.dom4j.org/ - xml-apis - xml-apis - 1.0.b2 + xerces + xmlParserAPIs + 2.6.2 http://xml.apache.org/xerces2-j/ xerces - xerces - 2.4.0 + xercesImpl + 2.6.2 http://xml.apache.org/xerces2-j/ diff --git a/html2xdoc/xdocs/changes.xml b/html2xdoc/xdocs/changes.xml index 39318af4..1a6ce9b6 100644 --- a/html2xdoc/xdocs/changes.xml +++ b/html2xdoc/xdocs/changes.xml @@ -24,6 +24,16 @@ dIon Gillard + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
  • dom4j v1.4-dev-8 -> v1.4
    • +
  • xercesImpl v 2.4.0 -> v2.6.2
    • +
  • xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2
    • +
+ + Run before xdoc:init so generated xdocs can also be used by pdf plugin. Fix crash with an empty html body element. diff --git a/j2ee/plugin.jelly b/j2ee/plugin.jelly index e432fd9c..9db56a97 100644 --- a/j2ee/plugin.jelly +++ b/j2ee/plugin.jelly @@ -45,7 +45,7 @@ - + diff --git a/j2ee/project.xml b/j2ee/project.xml index de374faa..5a652e29 100644 --- a/j2ee/project.xml +++ b/j2ee/project.xml @@ -21,7 +21,7 @@ 3 maven-j2ee-plugin Maven J2EE Plugin - 1.5.2-SNAPSHOT + 1.6-SNAPSHOT J2EE tools http://maven.apache.org/reference/plugins/j2ee/ @@ -98,11 +98,17 @@ commons-logging commons-logging 1.0.3 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + dom4j dom4j - 1.4-dev-8 + 1.4 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + xml-apis diff --git a/j2ee/xdocs/changes.xml b/j2ee/xdocs/changes.xml index 42bbe64d..151d6c6d 100644 --- a/j2ee/xdocs/changes.xml +++ b/j2ee/xdocs/changes.xml @@ -25,6 +25,13 @@ Peter Lynch + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • dom4j v1.4-dev-8 -> v1.4
    • +
+ + Removed dependency on non-public goal war:initand computed the name of the WAR file by using the diff --git a/jalopy/project.xml b/jalopy/project.xml index 51681f47..570fdfec 100644 --- a/jalopy/project.xml +++ b/jalopy/project.xml @@ -21,7 +21,7 @@ 3 maven-jalopy-plugin Maven Jalopy Plugin - 1.3.1 + 1.4-SNAPSHOT Reformat java source http://maven.apache.org/reference/plugins/jalopy/ @@ -108,17 +108,20 @@ jdom jdom - 1.0b8 + 1.0 log4j log4j 1.2.8 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + oro oro - 2.0.7 + 2.0.8 textarea diff --git a/jalopy/xdocs/changes.xml b/jalopy/xdocs/changes.xml index ad5ad428..d6995a04 100644 --- a/jalopy/xdocs/changes.xml +++ b/jalopy/xdocs/changes.xml @@ -1,5 +1,4 @@ - - Changes Emmanuel Venisse + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • jdom v1.0b8 -> v1.0
    • +
  • oro v2.0.7 -> v2.0.8
    • +
+ + Matchs Jalopy and checkstyle. Allows multiple includes/excludes patterns. diff --git a/jar/project.xml b/jar/project.xml index 81c14c25..a215d9ae 100644 --- a/jar/project.xml +++ b/jar/project.xml @@ -1,5 +1,4 @@ - - ../plugin-parent/project.xml 3 maven-javacc-plugin Maven Javacc Plugin - 1.1 + 1.2-SNAPSHOT Process javacc/jtree grammars http://maven.apache.org/reference/plugins/javacc/ @@ -68,7 +66,10 @@ plexus plexus-utils - 1.0-beta-1 + 1.0.3 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/javacc/xdocs/changes.xml b/javacc/xdocs/changes.xml index a691c4c9..b93f5773 100644 --- a/javacc/xdocs/changes.xml +++ b/javacc/xdocs/changes.xml @@ -24,6 +24,13 @@ Michal Maczka + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • plexus-utils v1.0-beta-1 -> v1.0.3
    • +
+ + Fix issues with DOM classes and jdk1.3 diff --git a/javadoc/project.xml b/javadoc/project.xml index 50041200..73b9c147 100644 --- a/javadoc/project.xml +++ b/javadoc/project.xml @@ -135,14 +135,18 @@ commons-lang 2.0 jar - + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-collections commons-collections 3.0 jar - + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/jbuilder/project.xml b/jbuilder/project.xml index 156de5f7..3c05551f 100644 --- a/jbuilder/project.xml +++ b/jbuilder/project.xml @@ -67,8 +67,11 @@ commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/xml/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/jbuilder/xdocs/changes.xml b/jbuilder/xdocs/changes.xml index 5fd077ab..2483c737 100644 --- a/jbuilder/xdocs/changes.xml +++ b/jbuilder/xdocs/changes.xml @@ -24,8 +24,13 @@ Emmanuel Venisse - - Aadd support for jbuilder 2005. + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
+ + Add support for jbuilder 2005. Remove use of pom.getPluginContext and replace with maven:set/get. diff --git a/jcoverage/project.xml b/jcoverage/project.xml index 3e6495ca..49b817c9 100644 --- a/jcoverage/project.xml +++ b/jcoverage/project.xml @@ -1,5 +1,4 @@ - - ../plugin-parent/project.xml 3 maven-jcoverage-plugin Maven JCoverage plugin - 1.0.10-SNAPSHOT + 1.1-SNAPSHOT org.apache.maven.jcoveragereport This plugin provides coverage analysis of your source-code based on the open-source jcoverage tool. This plugin provides coverage analysis of your source-code based on the open-source jcoverage tool. @@ -118,7 +116,7 @@ velocity velocity - 1.3 + 1.4 http://jakarta.apache.org/velocity/ @@ -126,6 +124,9 @@ log4j 1.2.8 http://jakarta.apache.org/log4j/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + bcel @@ -148,7 +149,7 @@ oro oro - 2.0.7 + 2.0.8 http://jakarta.apache.org/oro/ @@ -159,15 +160,15 @@ xerces - xercesImpl - 2.4.0 - http://xml.apache.org/xerces2-j/index.html + xmlParserAPIs + 2.6.2 + http://xml.apache.org/xerces2-j/ xerces - xmlParserAPIs - 2.2.1 - http://xml.apache.org/xerces2-j/index.html + xercesImpl + 2.6.2 + http://xml.apache.org/xerces2-j/ commons-jelly diff --git a/jcoverage/xdocs/changes.xml b/jcoverage/xdocs/changes.xml index 1ff73735..0a96641f 100644 --- a/jcoverage/xdocs/changes.xml +++ b/jcoverage/xdocs/changes.xml @@ -24,7 +24,15 @@ Emmanuel Venisse - + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • oro v2.0.7 -> v2.0.8
    • +
  • velocity v1.3 -> v1.4
    • +
  • xercesImpl v 2.4.0 -> v2.6.2
    • +
  • xmlParserAPIs v 2.2.1 -> v2.6.2
    • +
+ Open report in a new window. Allow comma separeted values for maven.jcoverage.instrumentation.excludes. Fix tests failures when user use maven.jcoverage.instrumentation.excludes diff --git a/jdepend/project.xml b/jdepend/project.xml index 809a62b7..b1238a31 100644 --- a/jdepend/project.xml +++ b/jdepend/project.xml @@ -1,5 +1,4 @@ - - ../plugin-parent/project.xml 3 maven-jellydoc-plugin Maven JellyDoc Plug-in - 1.3.2-SNAPSHOT + 1.4-SNAPSHOT - jakarta Creates a JavaDoc like report for any Jelly Tags used in a project. Javadoc stuff for Jelly tags @@ -68,8 +65,11 @@ commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/xml/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + javadoc @@ -82,23 +82,25 @@ 0.7.7 - dom4j dom4j - 1.4-dev-8 + 1.4 http://www.dom4j.org/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + - xml-apis - xml-apis - 1.0.b2 + xerces + xmlParserAPIs + 2.6.2 http://xml.apache.org/xerces2-j/ xerces - xerces - 2.4.0 + xercesImpl + 2.6.2 http://xml.apache.org/xerces2-j/ diff --git a/jellydoc/xdocs/changes.xml b/jellydoc/xdocs/changes.xml index 8971f085..145c4a97 100644 --- a/jellydoc/xdocs/changes.xml +++ b/jellydoc/xdocs/changes.xml @@ -25,6 +25,16 @@ Kurt Schrader + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
  • dom4j v1.4-dev-8 -> v1.4
    • +
  • xercesImpl v 2.4.0 -> v2.6.2
    • +
  • xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2
    • +
+ + Use tools.jar for javadoc as it cannot be distributed from the repository diff --git a/jetty/project.xml b/jetty/project.xml index a7e9b97d..bce54ea8 100644 --- a/jetty/project.xml +++ b/jetty/project.xml @@ -81,12 +81,18 @@ commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + ant ant 1.6.5 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/jetty/xdocs/changes.xml b/jetty/xdocs/changes.xml index dc24c54d..67efaba4 100644 --- a/jetty/xdocs/changes.xml +++ b/jetty/xdocs/changes.xml @@ -25,6 +25,11 @@ + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
+ Added tools.jar to the Jetty execution classpath to support JSP compilation. diff --git a/jira/project.xml b/jira/project.xml index c7fb4d88..e00a315e 100644 --- a/jira/project.xml +++ b/jira/project.xml @@ -40,22 +40,34 @@ commons-httpclient commons-httpclient 2.0.2 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-jelly commons-jelly 1.0 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-logging commons-logging - 1.0.4 + 1.0.3 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + log4j log4j 1.2.8 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + maven diff --git a/jira/xdocs/changes.xml b/jira/xdocs/changes.xml index 6ca0286f..73620a9c 100644 --- a/jira/xdocs/changes.xml +++ b/jira/xdocs/changes.xml @@ -25,6 +25,11 @@ + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-logging v1.0.4 -> v1.0.3
    • +
+ Enable retrieving component-specific issues. Authentication support for access a private Jira instalation. diff --git a/junit-report/project.xml b/junit-report/project.xml index 002c1a75..e9ae8f96 100644 --- a/junit-report/project.xml +++ b/junit-report/project.xml @@ -75,8 +75,11 @@ commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/xml/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/junit-report/xdocs/changes.xml b/junit-report/xdocs/changes.xml index ad9471fd..a378857d 100644 --- a/junit-report/xdocs/changes.xml +++ b/junit-report/xdocs/changes.xml @@ -25,7 +25,12 @@ Emmanuel Venisse - + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
+ Fix documentation, add default goal Fix HTML problems by disabling jsl's pretty printing diff --git a/jxr/project.xml b/jxr/project.xml index c79fedd7..1735e201 100644 --- a/jxr/project.xml +++ b/jxr/project.xml @@ -1,5 +1,4 @@ - oro oro - 2.0.7 + 2.0.8 plexus plexus-utils 1.0.3 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + velocity @@ -84,7 +89,10 @@ commons-collections commons-collections - 3.1 + 3.0 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/jxr/xdocs/changes.xml b/jxr/xdocs/changes.xml index c93e0e5d..66778707 100644 --- a/jxr/xdocs/changes.xml +++ b/jxr/xdocs/changes.xml @@ -24,6 +24,14 @@ Emmanuel Venisse + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-collections v3.1 -> v3.0
    • +
  • oro v2.0.7 -> v2.0.8
    • +
+ + Close streams properly on errors Ignore Java 5 package-info.java files diff --git a/linkcheck/project.xml b/linkcheck/project.xml index b7303a02..5687ccde 100644 --- a/linkcheck/project.xml +++ b/linkcheck/project.xml @@ -90,11 +90,17 @@ commons-beanutils commons-beanutils 1.6.1 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-collections commons-collections - 2.1 + 3.0 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-grant @@ -104,17 +110,26 @@ commons-httpclient commons-httpclient - 2.0 + 2.0.2 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-jelly commons-jelly - 1.0-beta-4 + 1.0 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-lang commons-lang 2.0 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-jelly @@ -124,36 +139,53 @@ commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/xml/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-jelly commons-jelly-tags-ant - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/ant/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-logging commons-logging 1.0.3 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + maven maven-model - 3.0.0-SNAPSHOT + 3.0.1 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + - log4j log4j 1.2.8 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + dom4j dom4j - 1.4-dev-8 + 1.4 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + jtidy diff --git a/linkcheck/xdocs/changes.xml b/linkcheck/xdocs/changes.xml index d344d5bf..100aa6de 100644 --- a/linkcheck/xdocs/changes.xml +++ b/linkcheck/xdocs/changes.xml @@ -26,6 +26,17 @@ + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-collections v2.1 -> v3.0
    • +
  • commons-httpclient v2.0 -> v2.0.2
    • +
  • commons-jelly v1.0-beta-4 -> v1.0
    • +
  • commons-jelly-tags-ant v1.0 -> v1.1
    • +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
  • dom4j v1.4-dev-8 -> v1.4
    • +
  • maven-model v3.0.0-SNAPSHOT -> v3.0.1
    • +
+ Make compatible with Maven 1.1 java.lang.NumberFormatException if proxy port is setted to "" diff --git a/multiproject/project.xml b/multiproject/project.xml index 1579f96a..7650f90e 100644 --- a/multiproject/project.xml +++ b/multiproject/project.xml @@ -1,5 +1,4 @@ - - ../plugin-parent/project.xml maven-multiproject-plugin @@ -100,7 +98,7 @@ +10 - + Lukas Theussl ltheussl ltheussl@apache.org @@ -121,19 +119,22 @@ velocity velocity jar - 1.4-dev + 1.4 maven maven jar - 1.0 + 1.0.2 maven maven-model jar - 3.0.0 + 3.0.1 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/multiproject/xdocs/changes.xml b/multiproject/xdocs/changes.xml index 5800bd94..87e93816 100644 --- a/multiproject/xdocs/changes.xml +++ b/multiproject/xdocs/changes.xml @@ -26,6 +26,13 @@ + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • maven v1.0 -> v1.0.2
    • +
  • maven-model v3.0.0 -> v3.0.1
    • +
  • velocity v1.4-dev -> v1.4
    • +
+ multiproject:site fails if sub-projects has a &amp; on POM. Can not mix multiproject goals with other/custom goals. diff --git a/pdf/plugin.jelly b/pdf/plugin.jelly index 6a028c8a..4fbf6e8e 100644 --- a/pdf/plugin.jelly +++ b/pdf/plugin.jelly @@ -209,10 +209,10 @@ plugin.currentVersion = [${plugin.currentVersion}] - + - + @@ -284,9 +284,9 @@ plugin.currentVersion = [${plugin.currentVersion}] - + - + diff --git a/pdf/project.xml b/pdf/project.xml index 53745d10..d3955798 100644 --- a/pdf/project.xml +++ b/pdf/project.xml @@ -1,5 +1,4 @@ - - - 3 test-maven-plugin-plugin @@ -55,7 +53,7 @@ commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/xml/ @@ -67,7 +65,7 @@ commons-httpclient commons-httpclient - 2.0-rc1 + 2.0.2 http://jakarta.apache.org/commons/httpclient/ diff --git a/plugin/xdocs/changes.xml b/plugin/xdocs/changes.xml index 136c1644..19d39508 100644 --- a/plugin/xdocs/changes.xml +++ b/plugin/xdocs/changes.xml @@ -24,6 +24,14 @@ + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
  • jdom v b10 -> v1.0
    • +
  • xercesImpl v 2.4.0 -> v2.6.2
    • +
  • xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2
    • +
+ Allow plugin-test directory to be changed. NTLM Proxy Problem. plugin:download didn't redownload SNAPSHOT plugins. diff --git a/pom/project.xml b/pom/project.xml index abf370ff..3fab9c3f 100644 --- a/pom/project.xml +++ b/pom/project.xml @@ -23,7 +23,7 @@ 3 maven-pom-plugin Maven POM Plugin - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT Check Project Object Model http://maven.apache.org/reference/plugins/pom/ @@ -85,7 +85,10 @@ dom4j dom4j - 1.4-dev-8 + 1.4 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-jelly @@ -95,7 +98,7 @@ maven maven - 1.0 + 1.0.2 diff --git a/pom/xdocs/changes.xml b/pom/xdocs/changes.xml index 8f91f8ff..3ef60570 100644 --- a/pom/xdocs/changes.xml +++ b/pom/xdocs/changes.xml @@ -24,7 +24,13 @@ - + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • dom4j v1.4-dev-8 -> v1.4
    • +
  • maven v1.0 -> v1.0.2
    • +
+ Build and run plugin against the installed version of Maven diff --git a/project.xml b/project.xml index 1fecf5a0..437a7d66 100644 --- a/project.xml +++ b/project.xml @@ -1,5 +1,4 @@ - - - - 3 maven-master Maven Plugins @@ -35,13 +31,11 @@ 2001 org.apache.maven http://maven.apache.org/images/maven-logo-2.gif - http://jira.codehaus.org/BrowseProject.jspa?id=10030 people.apache.org /www/maven.apache.org/reference/plugins/ people.apache.org /www/www.apache.org/dist/java-repository/ - Maven User List @@ -56,13 +50,11 @@ http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=dev@maven.apache.org - scm:svn:http://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/ scm:svn:https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk/ http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/ - dIon Gillard @@ -92,7 +84,7 @@ Java Developer - + James Strachan jstrachan @@ -162,9 +154,8 @@ Developer +1 - + - commons-jelly @@ -172,18 +163,15 @@ 1.0 - dev@maven.apache.org src/main src/test - **/*Test.java - .. @@ -207,7 +195,6 @@ - maven-jdepend-plugin maven-checkstyle-plugin @@ -226,5 +213,4 @@ maven-multiproject-plugin maven-multichanges-plugin - diff --git a/rar/project.xml b/rar/project.xml index 9f8a7518..673157bb 100644 --- a/rar/project.xml +++ b/rar/project.xml @@ -65,8 +65,11 @@ commons-jelly commons-jelly-tags-util - 1.1 + 1.1.1 http://jakarta.apache.org/commons/jelly/tags/util/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/rar/xdocs/changes.xml b/rar/xdocs/changes.xml index a8a82fac..fd1a7a63 100644 --- a/rar/xdocs/changes.xml +++ b/rar/xdocs/changes.xml @@ -24,7 +24,12 @@ dIon Gillard - + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-jelly-tags-util v1.1 -> v1.1.1
    • +
+ Deprecate rar:load hook goal Add xdocs/changes.xml Move versions element to correct location in POM diff --git a/release/project.xml b/release/project.xml index 1fa90a89..bd91228e 100644 --- a/release/project.xml +++ b/release/project.xml @@ -1,5 +1,4 @@ - - ../plugin-parent/project.xml 3 maven-release-plugin Maven Release Plug-in - 1.4.2-SNAPSHOT + 1.5-SNAPSHOT Produce project release http://maven.apache.org/reference/plugins/release/ @@ -50,18 +48,24 @@ maven maven - 1.0-rc2 + 1.0.2 commons-io commons-io 1.0 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + dom4j dom4j - 1.4-dev-8 + 1.4 http://www.dom4j.org/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + jaxen @@ -71,7 +75,10 @@ commons-jelly commons-jelly - 1.0-beta-4 + 1.0 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + saxpath @@ -79,9 +86,9 @@ 1.0-FCS - xml-apis - xml-apis - 1.0.b2 + xerces + xmlParserAPIs + 2.6.2 http://xml.apache.org/xerces2-j/ diff --git a/release/xdocs/changes.xml b/release/xdocs/changes.xml index 2f273c0c..04224a6f 100644 --- a/release/xdocs/changes.xml +++ b/release/xdocs/changes.xml @@ -25,6 +25,16 @@ dIon Gillard + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • maven v1.0-rc2 -> v1.0.2
    • +
  • dom4j v1.4-dev-8 -> v1.4
    • +
  • commons-jelly v1.0-beta-4 -> v1.0
    • +
  • xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2
    • +
+ + Close output file in AbstractPomTransformer.write() diff --git a/repository/project.xml b/repository/project.xml index 0b33d082..be4bb67c 100644 --- a/repository/project.xml +++ b/repository/project.xml @@ -23,7 +23,7 @@ 3 maven-repository-plugin Maven Repository Plug-in - 1.2.1-SNAPSHOT + 1.3-SNAPSHOT Tools to work with the central repo http://maven.apache.org/reference/plugins/repository/ http://jira.codehaus.org/browse/MPREPO @@ -50,14 +50,20 @@ commons-jelly commons-jelly-tags-util - 1.1 + 1.1.1 http://jakarta.apache.org/commons/jelly/libs/util/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-jelly commons-jelly-tags-xml - 1.0 + 1.1 http://jakarta.apache.org/commons/jelly/libs/xml/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/repository/xdocs/changes.xml b/repository/xdocs/changes.xml index fe5e1b70..1831380d 100644 --- a/repository/xdocs/changes.xml +++ b/repository/xdocs/changes.xml @@ -24,7 +24,13 @@ dIon Gillard - + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-jelly-tags-util v1.1 -> v1.1.1
    • +
  • commons-jelly-tags-xml v1.0 -> v1.1
    • +
+ Fixed typo in docs diff --git a/scm/project.xml b/scm/project.xml index 59abcc94..b22b4feb 100644 --- a/scm/project.xml +++ b/scm/project.xml @@ -1,5 +1,4 @@ - - ../plugin-parent/project.xml maven-scm-plugin @@ -114,7 +112,10 @@ plexus plexus-utils - 1.0.1 + 1.0.3 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + classworlds diff --git a/simian/project.xml b/simian/project.xml index 1080b41d..f3e2ef26 100644 --- a/simian/project.xml +++ b/simian/project.xml @@ -110,20 +110,29 @@ ant ant - 1.5.3-1 + 1.6.5 http://ant.apache.org/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-jelly commons-jelly - 1.0-beta-4 + 1.0 http://jakarta.apache.org/commons/jelly/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-logging commons-logging 1.0.3 http://jakarta.apache.org/commons/logging/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + diff --git a/simian/xdocs/changes.xml b/simian/xdocs/changes.xml index 84507fff..35e2319a 100644 --- a/simian/xdocs/changes.xml +++ b/simian/xdocs/changes.xml @@ -26,6 +26,12 @@ + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • ant v1.5.3-1 -> v1.6.5
    • +
  • commons-jelly v1.0-beta-4 -> v1.0
    • +
+ Tag library warning when using simian 1.5 Simian report contains broken links to xref/xref-test directories diff --git a/site/project.xml b/site/project.xml index 9d78c526..750fe23e 100644 --- a/site/project.xml +++ b/site/project.xml @@ -21,7 +21,7 @@ 3 maven-site-plugin Maven Site Plugin - 1.6.2-SNAPSHOT + 1.7-SNAPSHOT Generate web site. Generate web site http://maven.apache.org/reference/plugins/site/ @@ -94,6 +94,9 @@ commons-lang commons-lang 2.0 + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + ant diff --git a/site/xdocs/changes.xml b/site/xdocs/changes.xml index c2b0fccb..d2859d8d 100644 --- a/site/xdocs/changes.xml +++ b/site/xdocs/changes.xml @@ -22,7 +22,7 @@ dIon Gillard - + Missing maven.ssh.args in site:publish. Make chmod options in site:sshdeploy configurable. SSH arguments not used in sshdeploy with 'clean'. diff --git a/tasklist/project.xml b/tasklist/project.xml index 4ab0c885..983dae87 100644 --- a/tasklist/project.xml +++ b/tasklist/project.xml @@ -113,8 +113,11 @@ commons-jelly commons-jelly - 1.0-RC1 + 1.0 http://jakarta.apache.org/commons/jelly/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + commons-jelly diff --git a/tasklist/xdocs/changes.xml b/tasklist/xdocs/changes.xml index 567db6ef..7ede7ca3 100644 --- a/tasklist/xdocs/changes.xml +++ b/tasklist/xdocs/changes.xml @@ -26,6 +26,13 @@ Arnaud Heritier + + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : +
    +
  • commons-jelly v1.0-RC1 -> v1.0
    • +
+ + Show todos for fields Fix xdoc title diff --git a/test/plugin.jelly b/test/plugin.jelly index 02d9ccb7..1bad3d7c 100644 --- a/test/plugin.jelly +++ b/test/plugin.jelly @@ -59,8 +59,8 @@ - - + + @@ -160,8 +160,8 @@ - - + + @@ -216,8 +216,8 @@ - - + + @@ -278,8 +278,8 @@ - - + + @@ -363,8 +363,8 @@ - - + + diff --git a/test/project.xml b/test/project.xml index 744d1ed4..0ede1e8a 100644 --- a/test/project.xml +++ b/test/project.xml @@ -1,5 +1,4 @@ -