Index: core/project.xml =================================================================== --- core/project.xml (revision 466405) +++ core/project.xml (working copy) @@ -605,7 +605,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 http://jakarta.apache.org/commons/logging/ Index: plugins-sandbox/struts/src/plugin-test/project.xml =================================================================== --- plugins-sandbox/struts/src/plugin-test/project.xml (revision 466405) +++ plugins-sandbox/struts/src/plugin-test/project.xml (working copy) @@ -104,7 +104,7 @@ commons-logging commons-logging - 1.0.3 + 1.1 http://jakarta.apache.org/commons/logging.html true Index: plugins/ant/src/plugin-test/project.xml =================================================================== --- plugins/ant/src/plugin-test/project.xml (revision 466405) +++ plugins/ant/src/plugin-test/project.xml (working copy) @@ -65,7 +65,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 jar Index: plugins/artifact/project.xml =================================================================== --- plugins/artifact/project.xml (revision 466405) +++ plugins/artifact/project.xml (working copy) @@ -166,7 +166,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 This library is already loaded by maven's core. Be careful to use the same version number as in the core. Index: plugins/artifact/src/plugin-test/project.xml =================================================================== --- plugins/artifact/src/plugin-test/project.xml (revision 466405) +++ plugins/artifact/src/plugin-test/project.xml (working copy) @@ -56,7 +56,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 http://jakarta.apache.org/commons/logging.html Index: plugins/artifact/xdocs/changes.xml =================================================================== --- plugins/artifact/xdocs/changes.xml (revision 466405) +++ plugins/artifact/xdocs/changes.xml (working copy) @@ -25,6 +25,7 @@ + Upgrade commons-logging to version 1.1 Upgrade commons-jexl to version 1.1 Upgrade maven-model to version 3.0.2 Change the default repository to http://repo1.maven.org/maven/ for dependencies url in the manifest. Index: plugins/changelog/project.xml =================================================================== --- plugins/changelog/project.xml (revision 466405) +++ plugins/changelog/project.xml (working copy) @@ -184,7 +184,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 This library is already loaded by maven's core. Be careful to use the same version number as in the core. Index: plugins/changelog/xdocs/changes.xml =================================================================== --- plugins/changelog/xdocs/changes.xml (revision 466405) +++ plugins/changelog/xdocs/changes.xml (working copy) @@ -25,6 +25,7 @@ + Upgrade commons-logging to version 1.1 Upgrade maven-model to version 3.0.2 New property maven.changelog.useDeveloperConnection. Support time period in MKS changelog parser. Index: plugins/dist/project.xml =================================================================== --- plugins/dist/project.xml (revision 466405) +++ plugins/dist/project.xml (working copy) @@ -93,7 +93,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 This library is already loaded by maven's core. Be careful to use the same version number as in the core. Index: plugins/dist/xdocs/changes.xml =================================================================== --- plugins/dist/xdocs/changes.xml (revision 466405) +++ plugins/dist/xdocs/changes.xml (working copy) @@ -24,6 +24,7 @@ + Upgrade commons-logging to version 1.1 Upgrade maven-model to version 3.0.2 Fix combined javadoc classpath in dist:multiproject-bin. New Index: plugins/ear/project.xml =================================================================== --- plugins/ear/project.xml (revision 466405) +++ plugins/ear/project.xml (working copy) @@ -22,7 +22,7 @@ 3 maven-ear-plugin Maven EAR Plugin - 1.9 + 1.9.1-SNAPSHOT Ear Plugin for Maven Ear Plugin for Maven @@ -140,7 +140,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 This library is already loaded by maven's core. Be careful to use the same version number as in the core. Index: plugins/ear/src/plugin-test/bundlePropertiesTest/project.xml =================================================================== --- plugins/ear/src/plugin-test/bundlePropertiesTest/project.xml (revision 466405) +++ plugins/ear/src/plugin-test/bundlePropertiesTest/project.xml (working copy) @@ -52,7 +52,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 /APP-INF/lib true Index: plugins/ear/src/plugin-test/simpleTest/project.xml =================================================================== --- plugins/ear/src/plugin-test/simpleTest/project.xml (revision 466405) +++ plugins/ear/src/plugin-test/simpleTest/project.xml (working copy) @@ -45,7 +45,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 http://jakarta.apache.org/commons/logging.html true Index: plugins/ear/xdocs/changes.xml =================================================================== --- plugins/ear/xdocs/changes.xml (revision 466405) +++ plugins/ear/xdocs/changes.xml (working copy) @@ -23,6 +23,9 @@ Nathan Coast + + Upgrade commons-logging to version 1.1 + Added support to set the description and the security roles in the generated application.xml. Index: plugins/eclipse/project.xml =================================================================== --- plugins/eclipse/project.xml (revision 466405) +++ plugins/eclipse/project.xml (working copy) @@ -140,7 +140,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 This library is already loaded by maven's core. Be careful to use the same version number as in the core. Index: plugins/eclipse/xdocs/changes.xml =================================================================== --- plugins/eclipse/xdocs/changes.xml (revision 466405) +++ plugins/eclipse/xdocs/changes.xml (working copy) @@ -24,6 +24,7 @@ + Upgrade commons-logging to version 1.1 Upgrade maven-model to version 3.0.2 Updated FAQ with multiproject entries. Fixed broken test cases. Index: plugins/ejb/project.xml =================================================================== --- plugins/ejb/project.xml (revision 466405) +++ plugins/ejb/project.xml (working copy) @@ -96,7 +96,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 This library is already loaded by maven's core. Be careful to use the same version number as in the core. Index: plugins/ejb/xdocs/changes.xml =================================================================== --- plugins/ejb/xdocs/changes.xml (revision 466405) +++ plugins/ejb/xdocs/changes.xml (working copy) @@ -25,6 +25,7 @@ + Upgrade commons-logging to version 1.1 Upgrade maven-model to version 3.0.2 Index: plugins/examples/exampleear-1.0/project.xml =================================================================== --- plugins/examples/exampleear-1.0/project.xml (revision 466405) +++ plugins/examples/exampleear-1.0/project.xml (working copy) @@ -58,7 +58,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 http://jakarta.apache.org/commons/logging.html true Index: plugins/examples/exampleejb-1.0/project.xml =================================================================== --- plugins/examples/exampleejb-1.0/project.xml (revision 466405) +++ plugins/examples/exampleejb-1.0/project.xml (working copy) @@ -71,7 +71,7 @@ commons-logging - 1.0.4 + 1.1 http://jakarta.apache.org/commons/logging.html true Index: plugins/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml =================================================================== --- plugins/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml (revision 466405) +++ plugins/genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml (working copy) @@ -71,7 +71,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 true Index: plugins/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml =================================================================== --- plugins/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml (revision 466405) +++ plugins/genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml (working copy) @@ -60,7 +60,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 true Index: plugins/genapp/src/plugin-resources/ejb/template-resources/project.xml =================================================================== --- plugins/genapp/src/plugin-resources/ejb/template-resources/project.xml (revision 466405) +++ plugins/genapp/src/plugin-resources/ejb/template-resources/project.xml (working copy) @@ -143,7 +143,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 true Index: plugins/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml =================================================================== --- plugins/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml (revision 466405) +++ plugins/genapp/src/plugin-resources/struts-jstl/template-resources/project.xml (working copy) @@ -117,7 +117,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 true Index: plugins/genapp/src/plugin-resources/struts-validation/template-resources/project.xml =================================================================== --- plugins/genapp/src/plugin-resources/struts-validation/template-resources/project.xml (revision 466405) +++ plugins/genapp/src/plugin-resources/struts-validation/template-resources/project.xml (working copy) @@ -114,7 +114,7 @@ commons-logging commons-logging - 1.0.3 + 1.1 true Index: plugins/genapp/src/plugin-resources/struts/template-resources/project.xml =================================================================== --- plugins/genapp/src/plugin-resources/struts/template-resources/project.xml (revision 466405) +++ plugins/genapp/src/plugin-resources/struts/template-resources/project.xml (working copy) @@ -99,7 +99,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 true Index: plugins/genapp/src/plugin-resources/tapestry/template-resources/project.xml =================================================================== --- plugins/genapp/src/plugin-resources/tapestry/template-resources/project.xml (revision 466405) +++ plugins/genapp/src/plugin-resources/tapestry/template-resources/project.xml (working copy) @@ -99,7 +99,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 true Index: plugins/genapp/src/plugin-resources/web-jstl/template-resources/project.xml =================================================================== --- plugins/genapp/src/plugin-resources/web-jstl/template-resources/project.xml (revision 466405) +++ plugins/genapp/src/plugin-resources/web-jstl/template-resources/project.xml (working copy) @@ -118,7 +118,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 true Index: plugins/genapp/src/plugin-resources/web-velocity/template-resources/project.xml =================================================================== --- plugins/genapp/src/plugin-resources/web-velocity/template-resources/project.xml (revision 466405) +++ plugins/genapp/src/plugin-resources/web-velocity/template-resources/project.xml (working copy) @@ -118,7 +118,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 true Index: plugins/genapp/src/plugin-resources/web/template-resources/project.xml =================================================================== --- plugins/genapp/src/plugin-resources/web/template-resources/project.xml (revision 466405) +++ plugins/genapp/src/plugin-resources/web/template-resources/project.xml (working copy) @@ -99,7 +99,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 true Index: plugins/genapp/xdocs/changes.xml =================================================================== --- plugins/genapp/xdocs/changes.xml (revision 466405) +++ plugins/genapp/xdocs/changes.xml (working copy) @@ -23,6 +23,7 @@ + Upgrade commons-logging to version 1.1 in templates Problem when maven.genapp.repackage.dir is empty. Generated poms contain deprecated id elements. Update dependencies to unify them between plugins. The following dependencies are updated : commons-jelly-tags-interaction v1.0 to v1.1 Index: plugins/html2xdoc/project.xml =================================================================== --- plugins/html2xdoc/project.xml (revision 466405) +++ plugins/html2xdoc/project.xml (working copy) @@ -85,7 +85,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 This library is already loaded by maven's core. Be careful to use the same version number as in the core. Index: plugins/html2xdoc/xdocs/changes.xml =================================================================== --- plugins/html2xdoc/xdocs/changes.xml (revision 466405) +++ plugins/html2xdoc/xdocs/changes.xml (working copy) @@ -24,6 +24,7 @@ + Upgrade commons-logging to version 1.1 Update dom4j dependency to match the one in maven 1.1 core. Update dependencies to unify them between plugins. The following dependencies are updated : jaxen v1.0-FCS-full to 1.1-beta-9. Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces. Index: plugins/jalopy/project.xml =================================================================== --- plugins/jalopy/project.xml (revision 466405) +++ plugins/jalopy/project.xml (working copy) @@ -22,7 +22,7 @@ 3 maven-jalopy-plugin Maven Jalopy Plugin - 1.5 + 1.5.1-SNAPSHOT Reformat java source @@ -104,7 +104,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 This library is already loaded by maven's core. Be careful to use the same version number as in the core. Index: plugins/jalopy/xdocs/changes.xml =================================================================== --- plugins/jalopy/xdocs/changes.xml (revision 466405) +++ plugins/jalopy/xdocs/changes.xml (working copy) @@ -23,6 +23,9 @@ Emmanuel Venisse + + Upgrade commons-logging to version 1.1 + Add a new goal to open Jalopy's SettingsDialog. Rewrite the plugin so it doesn't use the jalopy ant task anymore. Index: plugins/jira/project.xml =================================================================== --- plugins/jira/project.xml (revision 466405) +++ plugins/jira/project.xml (working copy) @@ -62,7 +62,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 This library is already loaded by maven's core. Be careful to use the same version number as in the core. Index: plugins/jira/xdocs/changes.xml =================================================================== --- plugins/jira/xdocs/changes.xml (revision 466405) +++ plugins/jira/xdocs/changes.xml (working copy) @@ -24,6 +24,7 @@ + Upgrade commons-logging to version 1.1 Update jelly dependency to match the ones in maven 1.1 core. Upgrade to log4j 1.2.13. If a report isn't generated the plugin fails trying to replace entities in a not existing file. Index: plugins/jxr/project.xml =================================================================== --- plugins/jxr/project.xml (revision 466405) +++ plugins/jxr/project.xml (working copy) @@ -55,7 +55,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 This library is already loaded by maven's core. Be careful to use the same version number as in the core. Index: plugins/jxr/xdocs/changes.xml =================================================================== --- plugins/jxr/xdocs/changes.xml (revision 466405) +++ plugins/jxr/xdocs/changes.xml (working copy) @@ -25,6 +25,7 @@ + Upgrade commons-logging to version 1.1 Use a custom build of velocity (1.5-20060721.044818) to wait for a release of velocity 1.5 which will fix the issue VELOCITY-193 (The horrible error : "log4j:ERROR Attempted to append to closed appender named [null]"). Index: plugins/linkcheck/project.xml =================================================================== --- plugins/linkcheck/project.xml (revision 466405) +++ plugins/linkcheck/project.xml (working copy) @@ -176,7 +176,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 This library is already loaded by maven's core. Be careful to use the same version number as in the core. Index: plugins/linkcheck/xdocs/changes.xml =================================================================== --- plugins/linkcheck/xdocs/changes.xml (revision 466405) +++ plugins/linkcheck/xdocs/changes.xml (working copy) @@ -26,6 +26,7 @@ + Upgrade commons-logging to version 1.1 Upgrade maven-model to version 3.0.2 Update jelly dependency to match the ones in maven 1.1 core. Maven 1.0.x : The report is incomplete if one or more files has errors in them. Index: plugins/multichanges/project.xml =================================================================== --- plugins/multichanges/project.xml (revision 466405) +++ plugins/multichanges/project.xml (working copy) @@ -76,7 +76,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 This library is already loaded by maven's core. Be careful to use the same version number as in the core. Index: plugins/multichanges/xdocs/changes.xml =================================================================== --- plugins/multichanges/xdocs/changes.xml (revision 466405) +++ plugins/multichanges/xdocs/changes.xml (working copy) @@ -24,6 +24,7 @@ + Upgrade commons-logging to version 1.1 New page to describe the next releases. New RSS feed for releases. New internal format to store information about releases. Index: plugins/plugin/project.xml =================================================================== --- plugins/plugin/project.xml (revision 466405) +++ plugins/plugin/project.xml (working copy) @@ -157,7 +157,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 This library is already loaded by maven's core. Be careful to use the same version number as in the core. Index: plugins/plugin/xdocs/changes.xml =================================================================== --- plugins/plugin/xdocs/changes.xml (revision 466405) +++ plugins/plugin/xdocs/changes.xml (working copy) @@ -24,6 +24,7 @@ + Upgrade commons-logging to version 1.1 Update dependencies to unify them between plugins. The following dependencies are updated : commons-jelly-tags-interaction v1.0 to v1.1, jaxen v1.0-FCS-full to 1.1-beta-9. The following dependencies are removed : saxpath. Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces. Index: plugins/plugins-parent/project.properties =================================================================== --- plugins/plugins-parent/project.properties (revision 466405) +++ plugins/plugins-parent/project.properties (working copy) @@ -70,7 +70,7 @@ maven.jar.commons-jelly-tags-xml=1.1 maven.jar.commons-jexl=1.1 maven.jar.commons-lang=2.0 -maven.jar.commons-logging=1.0.4 +maven.jar.commons-logging=1.1 maven.jar.dom4j=1.7-20060614 maven.jar.jaxen=1.1-beta-9 maven.jar.forehead=1.0-beta-5 Index: plugins/rar/src/plugin-test/project.xml =================================================================== --- plugins/rar/src/plugin-test/project.xml (revision 466405) +++ plugins/rar/src/plugin-test/project.xml (working copy) @@ -56,7 +56,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 http://jakarta.apache.org/commons/logging.html true Index: plugins/simian/project.xml =================================================================== --- plugins/simian/project.xml (revision 466405) +++ plugins/simian/project.xml (working copy) @@ -125,7 +125,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 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. Index: plugins/simian/xdocs/changes.xml =================================================================== --- plugins/simian/xdocs/changes.xml (revision 466405) +++ plugins/simian/xdocs/changes.xml (working copy) @@ -25,6 +25,7 @@ + Upgrade commons-logging to version 1.1 Update jelly dependency to match the ones in maven 1.1 core. plugin:deregister does not work. Index: plugins/source/project.xml =================================================================== --- plugins/source/project.xml (revision 466405) +++ plugins/source/project.xml (working copy) @@ -61,7 +61,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 This library is already loaded by maven's core. Be careful to use the same version number as in the core. Index: plugins/source/xdocs/changes.xml =================================================================== --- plugins/source/xdocs/changes.xml (revision 466405) +++ plugins/source/xdocs/changes.xml (working copy) @@ -24,6 +24,7 @@ + Upgrade commons-logging to version 1.1 Upgrade maven-model to version 3.0.2 Update jelly dependency to match the ones in maven 1.1 core. Update dependencies to unify them between plugins. The following dependencies are updated : commons-jelly-tags-interaction v1.0 to v1.1. The dependency to jline is added for commons-jelly-tags-interaction v1.1. Index: plugins/war/src/plugin-test/test01/project.xml =================================================================== --- plugins/war/src/plugin-test/test01/project.xml (revision 466405) +++ plugins/war/src/plugin-test/test01/project.xml (working copy) @@ -44,7 +44,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 http://jakarta.apache.org/commons/logging.html true Index: plugins/war/src/plugin-test/test02/project.xml =================================================================== --- plugins/war/src/plugin-test/test02/project.xml (revision 466405) +++ plugins/war/src/plugin-test/test02/project.xml (working copy) @@ -44,7 +44,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 http://jakarta.apache.org/commons/logging.html true Index: plugins/war/src/plugin-test/test03/project.xml =================================================================== --- plugins/war/src/plugin-test/test03/project.xml (revision 466405) +++ plugins/war/src/plugin-test/test03/project.xml (working copy) @@ -44,7 +44,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 http://jakarta.apache.org/commons/logging.html true Index: plugins/war/src/plugin-test/test04/project.xml =================================================================== --- plugins/war/src/plugin-test/test04/project.xml (revision 466405) +++ plugins/war/src/plugin-test/test04/project.xml (working copy) @@ -44,7 +44,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 http://jakarta.apache.org/commons/logging.html true Index: plugins/xdoc/project.xml =================================================================== --- plugins/xdoc/project.xml (revision 466405) +++ plugins/xdoc/project.xml (working copy) @@ -234,7 +234,7 @@ commons-logging commons-logging - 1.0.4 + 1.1 This library is already loaded by maven's core. Be careful to use the same version number as in the core. Index: plugins/xdoc/xdocs/changes.xml =================================================================== --- plugins/xdoc/xdocs/changes.xml (revision 466405) +++ plugins/xdoc/xdocs/changes.xml (working copy) @@ -27,6 +27,7 @@ + Upgrade commons-logging to version 1.1 Upgrade maven-model to version 3.0.2 Wrong margin around organization/name when no organization/logo is present. Report fails if there is no connection element in repository.