diff --git a/artifact/project.xml b/artifact/project.xml index 45138ae5..614f30b6 100644 --- a/artifact/project.xml +++ b/artifact/project.xml @@ -113,9 +113,9 @@ 1.1-beta-3 - plexus + org.codehaus.plexus plexus-utils - 1.0.3 + 1.0.5 commons-collections diff --git a/artifact/xdocs/changes.xml b/artifact/xdocs/changes.xml index 6932eba4..12de56eb 100644 --- a/artifact/xdocs/changes.xml +++ b/artifact/xdocs/changes.xml @@ -25,6 +25,7 @@ + Upgrade plexus-utils to version 1.0.5 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. diff --git a/jalopy/project.xml b/jalopy/project.xml index 59587a8a..049f4091 100644 --- a/jalopy/project.xml +++ b/jalopy/project.xml @@ -94,9 +94,9 @@ 1.5b5 - plexus + org.codehaus.plexus plexus-utils - 1.0.3 + 1.0.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/jalopy/xdocs/changes.xml b/jalopy/xdocs/changes.xml index 14ac81c4..3e46c0ae 100644 --- a/jalopy/xdocs/changes.xml +++ b/jalopy/xdocs/changes.xml @@ -23,6 +23,9 @@ Emmanuel Venisse + + Upgrade plexus-utils to version 1.0.5 + Add a new goal to open Jalopy's SettingsDialog. Rewrite the plugin so it doesn't use the jalopy ant task anymore. diff --git a/javacc/project.xml b/javacc/project.xml index ba1b66e1..2c916c5d 100644 --- a/javacc/project.xml +++ b/javacc/project.xml @@ -22,7 +22,7 @@ 3 maven-javacc-plugin Maven Javacc Plugin - 1.3-SNAPSHOT + 1.2.1-SNAPSHOT Process javacc/jtree grammars @@ -62,9 +62,9 @@ 3.2 - plexus + org.codehaus.plexus plexus-utils - 1.0.3 + 1.0.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/javacc/xdocs/changes.xml b/javacc/xdocs/changes.xml index 11ca0075..1f4b9b96 100644 --- a/javacc/xdocs/changes.xml +++ b/javacc/xdocs/changes.xml @@ -23,8 +23,8 @@ Michal Maczka - - + + Upgrade plexus-utils to version 1.0.5 Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : diff --git a/jxr/project.xml b/jxr/project.xml index b98ec3c0..f478ed94 100644 --- a/jxr/project.xml +++ b/jxr/project.xml @@ -67,9 +67,9 @@ 2.0.8 - plexus + org.codehaus.plexus plexus-utils - 1.0.3 + 1.0.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/jxr/xdocs/changes.xml b/jxr/xdocs/changes.xml index 872ee4e0..b9eafc5f 100644 --- a/jxr/xdocs/changes.xml +++ b/jxr/xdocs/changes.xml @@ -25,6 +25,7 @@ + Upgrade plexus-utils to version 1.0.5 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]"). diff --git a/plugins-parent/project.properties b/plugins-parent/project.properties index 4586e7da..3b73be71 100644 --- a/plugins-parent/project.properties +++ b/plugins-parent/project.properties @@ -76,7 +76,7 @@ maven.jar.jaxen=1.1-beta-9 maven.jar.forehead=1.0-beta-5 maven.jar.log4j=1.2.13 maven.jar.maven-model=3.0.2-20061008.232644 -maven.jar.plexus-utils=1.0.3 +maven.jar.plexus-utils=1.0.5 maven.jar.wagon-file=1.0-beta-1 maven.jar.wagon-http=1.0-beta-1 maven.jar.wagon-ssh=1.0-beta-1 diff --git a/scm/project.xml b/scm/project.xml index 6a85ef83..7e40d401 100644 --- a/scm/project.xml +++ b/scm/project.xml @@ -155,14 +155,18 @@ 1.1-beta-9 - plexus - plexus-container-default - 1.0-alpha-5 + org.codehaus.plexus + plexus-component-api + 1.0-alpha-14 - plexus + org.codehaus.plexus + plexus-container-default + 1.0-alpha-14 + + org.codehaus.plexus plexus-utils - 1.0.3 + 1.0.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/scm/xdocs/changes.xml b/scm/xdocs/changes.xml index c7d0bde8..9abbab51 100644 --- a/scm/xdocs/changes.xml +++ b/scm/xdocs/changes.xml @@ -27,6 +27,8 @@ The prepare-release goal should fail if project.xml can't be edited (e.g. read only). SCM Parse Connection output is wrong / misleading. scm:prepare-release does not commit modified changes.xml. + Upgrade plexus-utils to version 1.0.5 + Upgrade plexus-container-default to version 1.0-alpha-14 Update dom4j and jelly dependencies 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, jaxen v1.0-FCS-full to 1.1-beta-9. Add the dependency to jline for commons-jelly-tags-interaction v1.1. Upgrade to commons-io 1.2.