Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use recent releases of dependencies to allow developers to use them in plugins :

Browse Source 
* commons-logging v1.0.3 -> v1.0.4
* log4j v1.2.8 -> v1.2.12

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@321081 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier 2005-10-14 12:00:34 +00:00
parent 8cb683d4ef
commit 4eee931710
55 changed files with 76 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ant/src/plugin-test/project.xml
View File

@ -65,7 +65,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<type>jar</type>
<properties/>
</dependency>

2
artifact/project.xml
View File

@ -125,7 +125,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>

4
artifact/src/plugin-test/maven.xml
View File

@ -30,7 +30,7 @@
excludes="commons-logging" />
<!-- check that an exclude with just id works -->
<assert:assertFileNotFound file="${maven.build.dir}/commons-logging-1.0.3.jar"/>
<assert:assertFileNotFound file="${maven.build.dir}/commons-logging-1.0.4.jar"/>
<assert:assertFileExists file="${maven.build.dir}/commons-lang-2.0.jar"/>
<attainGoal name="clean"/>
@ -40,7 +40,7 @@
todir="${maven.build.dir}"
excludes="commons-lang:commons-lang" />
<assert:assertFileNotFound file="${maven.build.dir}/commons-lang-2.0.jar"/>
<assert:assertFileExists file="${maven.build.dir}/commons-logging-1.0.3.jar"/>
<assert:assertFileExists file="${maven.build.dir}/commons-logging-1.0.4.jar"/>
</goal>
</project>

2
artifact/src/plugin-test/project.xml
View File

@ -56,7 +56,7 @@ http://maven.apache.org/maven-v3_0_0.xsd">
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
</dependency>
<dependency>

1
artifact/xdocs/changes.xml
View File

@ -31,6 +31,7 @@
<li>commons-httpclient v2.0 -> v2.0.2</li>
<li>commons-jelly v1.0-beta-4 -> v1.0</li>
<li>commons-jexl v1.0-beta-1 -> v1.0</li>
<li>commons-logging v1.0.3 -> v1.0.4</li>
<li>commons-net v1.1.0 -> v1.4.0</li>
<li>plexus-utils v1.0-alpha-3 -> v1.0.3</li>
</ul>

2
changelog/project.xml
View File

@ -178,7 +178,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>

1
changelog/xdocs/changes.xml
View File

@ -29,6 +29,7 @@
<ul>
<li>ant v1.5.3-1 -> v1.6.5</li>
<li>commons-jelly-tags-xml v1.0 -> v1.1</li>
<li>commons-logging v1.0.3 -> v1.0.4</li>
<li>maven v1.0 -> v1.0.2</li>
<li>maven-model v3.0.0 -> v3.0.1</li>
<li>xercesImpl v 2.4.0 -> v2.6.2</li>

2
dist/project.xml vendored
View File

@ -80,7 +80,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>

1
dist/xdocs/changes.xml vendored
View File

@ -27,6 +27,7 @@
<release version="1.7-SNAPSHOT" date="in SVN">
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>
<li>commons-logging v1.0.3 -> v1.0.4</li>
<li>maven v1.0 -> v1.0.2</li>
<li>maven-model v3.0.0 -> v3.0.1</li>
</ul>

2
ear/src/plugin-test/bundlePropertiesTest/maven.xml
View File

@ -37,7 +37,7 @@
<unzip src="${earFile}" dest="${unzipDir}"/>
<!-- check for commons-logging -->
<j:set var="commonsExpectedPath" value="/APP-INF/lib/commons-logging-1.0.3.jar"/>
<j:set var="commonsExpectedPath" value="/APP-INF/lib/commons-logging-1.0.4.jar"/>
<assert:assertFileExists file="${unzipDir}${commonsExpectedPath}"
msg="commons-logging was not bundled"/>

4
ear/src/plugin-test/bundlePropertiesTest/project.xml
View File

@ -52,7 +52,7 @@ http://maven.apache.org/maven-v3_0_0.xsd">
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<ear.bundle.dir>/APP-INF/lib</ear.bundle.dir>
<ear.module>true</ear.module>
@ -78,7 +78,7 @@ http://maven.apache.org/maven-v3_0_0.xsd">
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
<version>1.2.12</version>
<properties>
<ear.bundle>true</ear.bundle>
<ear.bundle.name>LOG4J.JAR</ear.bundle.name>

2
ear/src/plugin-test/simpleTest/maven.xml
View File

@ -38,7 +38,7 @@
<unzip src="${earFile}" dest="${unzipDir}"/>
<!-- check for commons-logging -->
<assert:assertFileExists file="${unzipDir}/commons-logging-1.0.3.jar"
<assert:assertFileExists file="${unzipDir}/commons-logging-1.0.4.jar"
msg="commons logging was not bundled"/>
<!-- check for commons-collections -->
<assert:assertFileExists file="${unzipDir}/commons-collections-3.0.jar"

2
ear/src/plugin-test/simpleTest/project.xml
View File

@ -45,7 +45,7 @@ http://maven.apache.org/maven-v3_0_0.xsd">
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
<ear.bundle>true</ear.bundle>

2
eclipse/src/plugin-test/maintest/maven.xml
View File

@ -138,7 +138,7 @@
<x:parse var="classpathDoc" xml="${classpathFile.toURL()}" />
<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/maven/jars/maven.jar')])"/>
<assert:assertEquals expected="1" value="${count.intValue().toString()}" msg="override by jar tag not found"/>
<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/commons-logging/jars/commons-logging-1.0.3.jar')])"/>
<x:set var="count" select="count($classpathDoc/classpath/classpathentry[contains(@path,'MAVEN_REPO/commons-logging/jars/commons-logging-1.0.4.jar')])"/>
<assert:assertEquals expected="1" value="${count.intValue().toString()}" msg="maven.jar.override didn't work"/>
</goal>

2
eclipse/src/plugin-test/maintest/project.properties
View File

@ -1,4 +1,4 @@
cactus.src.dir=${basedir}/src/cactus-test
maven.jar.override=on
maven.jar.commons-dude=${maven.repo.local}/commons-logging/jars/commons-logging-1.0.3.jar
maven.jar.commons-dude=${maven.repo.local}/commons-logging/jars/commons-logging-1.0.4.jar
maven.eclipse.resources.addtoclasspath=true

2
ejb/project.xml
View File

@ -101,7 +101,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>

1
ejb/xdocs/changes.xml
View File

@ -27,6 +27,7 @@
<release version="1.8-SNAPSHOT" date="in SVN">
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>
<li>commons-logging v1.0.3 -> v1.0.4</li>
<li>maven v1.0 -> v1.0.2</li>
<li>maven-model v3.0.0 -> v3.0.1</li>
</ul>

2
examples/exampleear-1.0/project.xml
View File

@ -58,7 +58,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.2</version>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
<ear.bundle.jar>true</ear.bundle.jar>

2
examples/exampleejb-1.0/project.xml
View File

@ -71,7 +71,7 @@
<dependency>
<id>commons-logging</id>
<version>1.0.2</version>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
<ejb.manifest.classpath>true</ejb.manifest.classpath>

2
genapp/src/plugin-resources/complex/template-resources/components/ejbs/ejb/project.xml
View File

@ -71,7 +71,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<ejb.bundle>true</ejb.bundle>
</properties>

2
genapp/src/plugin-resources/complex/template-resources/components/wars/web/project.xml
View File

@ -60,7 +60,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>

2
genapp/src/plugin-resources/ejb/template-resources/project.xml
View File

@ -133,7 +133,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<ejb.bundle>true</ejb.bundle>
</properties>

2
genapp/src/plugin-resources/struts-jstl/template-resources/project.xml
View File

@ -110,7 +110,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>

2
genapp/src/plugin-resources/struts/template-resources/project.xml
View File

@ -93,7 +93,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>

2
genapp/src/plugin-resources/web-jstl/template-resources/project.xml
View File

@ -110,7 +110,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>

2
genapp/src/plugin-resources/web-velocity/template-resources/project.xml
View File

@ -111,7 +111,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>

2
genapp/src/plugin-resources/web/template-resources/project.xml
View File

@ -93,7 +93,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<war.bundle>true</war.bundle>
</properties>

7
genapp/xdocs/changes.xml
View File

@ -21,7 +21,12 @@
<title>Changes</title>
</properties>
<body>
<release version="2.3" date="in SVN">
<release version="2.3-SNAPSHOT" date="in SVN">
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>
<li>commons-logging v1.0.3 -> v1.0.4</li>
</ul>
</action>
<action dev="felipeal" type="add" issue="MPGENAPP-20" due-to="Miguel Griffa">Added customization guide.</action>
<action dev="felipeal" type="add" issue="MPGENAPP-19" due-to="Miguel Griffa">Added Velocity-based webapp template (named <code>web-velocity</code>).</action>
<action dev="aheritier" type="add" issue="MPGENAPP-18" due-to="Archimedes Trajano">Use the project's name as display-name in web.xml.</action>

4
hibernate/project.xml
View File

@ -157,7 +157,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<type>jar</type>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
@ -172,7 +172,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
<version>1.2.12</version>
<type>jar</type>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>

2
hibernate/xdocs/changes.xml
View File

@ -30,6 +30,8 @@
<li>ant v1.5.3-1 -> v1.6.5</li>
<li>commons-collections v2.1 -> v3.0</li>
<li>commons-jelly v1.0-beta-4 -> v1.0</li>
<li>commons-logging v1.0.3 -> v1.0.4</li>
<li>log4j v1.2.8 -> v1.2.12</li>
<li>xercesImpl v 2.4.0 -> v2.6.2</li>
<li>xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2</li>
</ul>

8
html2xdoc/project.xml
View File

@ -67,6 +67,9 @@
<artifactId>commons-jelly-tags-xml</artifactId>
<version>1.1</version>
<url>http://jakarta.apache.org/commons/jelly/libs/xml/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
<groupId>commons-jelly</groupId>
@ -83,7 +86,10 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
</dependency>
<dependency>
<groupId>dom4j</groupId>

1
html2xdoc/xdocs/changes.xml
View File

@ -28,6 +28,7 @@
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>
<li>commons-jelly-tags-xml v1.0 -> v1.1</li>
<li>commons-logging v1.0.3 -> v1.0.4</li>
<li>dom4j v1.4-dev-8 -> v1.4</li>
<li>xercesImpl v 2.4.0 -> v2.6.2</li>
<li>xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2</li>

2
j2ee/project.xml
View File

@ -97,7 +97,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>

1
j2ee/xdocs/changes.xml
View File

@ -28,6 +28,7 @@
<release version="1.6-SNAPSHOT" date="In SVN">
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>
<li>commons-logging v1.0.3 -> v1.0.4</li>
<li>dom4j v1.4-dev-8 -> v1.4</li>
</ul>
</action>

2
jalopy/project.xml
View File

@ -113,7 +113,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
<version>1.2.12</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>

1
jalopy/xdocs/changes.xml
View File

@ -26,6 +26,7 @@
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>
<li>jdom v1.0b8 -> v1.0</li>
<li>log4j v1.2.8 -> v1.2.12</li>
<li>oro v2.0.7 -> v2.0.8</li>
</ul>
</action>

2
jcoverage/project.xml
View File

@ -122,7 +122,7 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
<version>1.2.12</version>
<url>http://jakarta.apache.org/log4j/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>

1
jcoverage/xdocs/changes.xml
View File

@ -27,6 +27,7 @@
<release version="1.1" date="In SVN">
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>
<li>log4j v1.2.8 -> v1.2.12</li>
<li>oro v2.0.7 -> v2.0.8</li>
<li>velocity v1.3 -> v1.4</li>
<li>xercesImpl v 2.4.0 -> v2.6.2</li>

4
jira/project.xml
View File

@ -55,7 +55,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
@ -64,7 +64,7 @@
<!-- Required for commons-httpclient -->
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
<version>1.2.12</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>

2
jira/xdocs/changes.xml
View File

@ -27,7 +27,7 @@
<release version="1.2-SNAPSHOT" date="in SVN">
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>
<li>commons-logging v1.0.4 -> v1.0.3</li>
<li>log4j v1.2.8 -> v1.2.12</li>
</ul>
</action>
<action dev="carlos" type="fix" issue="MPJIRA-11" due-to="Michael Franken">Enable retrieving component-specific issues.</action>

2
jxr/project.xml
View File

@ -62,7 +62,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>

1
jxr/xdocs/changes.xml
View File

@ -28,6 +28,7 @@
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>
<li>commons-collections v3.1 -> v3.0</li>
<li>commons-logging v1.0.3 -> v1.0.4</li>
<li>oro v2.0.7 -> v2.0.8</li>
</ul>
</action>

4
linkcheck/project.xml
View File

@ -157,7 +157,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>
@ -174,7 +174,7 @@
<!-- Required for commons-httpclient -->
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.8</version>
<version>1.2.12</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>

2
linkcheck/xdocs/changes.xml
View File

@ -33,7 +33,9 @@
<li>commons-jelly v1.0-beta-4 -> v1.0</li>
<li>commons-jelly-tags-ant v1.0 -> v1.1</li>
<li>commons-jelly-tags-xml v1.0 -> v1.1</li>
<li>commons-logging v1.0.3 -> v1.0.4</li>
<li>dom4j v1.4-dev-8 -> v1.4</li>
<li>log4j v1.2.8 -> v1.2.12</li>
<li>maven-model v3.0.0-SNAPSHOT -> v3.0.1</li>
</ul>
</action>

4
plugin-parent/project.properties
View File

@ -103,10 +103,10 @@ maven.jar.commons-jelly-tags-util=1.1.1
maven.jar.commons-jelly-tags-xml=1.1
maven.jar.commons-jexl=1.0
maven.jar.commons-lang=2.0
maven.jar.commons-logging=1.0.3
maven.jar.commons-logging=1.0.4
maven.jar.dom4j=1.4
maven.jar.forehead=1.0-beta-5
maven.jar.log4j=1.2.8
maven.jar.log4j=1.2.12
maven.jar.maven-model=3.0.1
maven.jar.plexus-utils=1.0.3
maven.jar.wagon-file=1.0-alpha-4

2
plugin/project.xml
View File

@ -151,7 +151,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>

1
plugin/xdocs/changes.xml
View File

@ -27,6 +27,7 @@
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>
<li>commons-jelly-tags-xml v1.0 -> v1.1</li>
<li>commons-logging v1.0.3 -> v1.0.4</li>
<li>jdom v b10 -> v1.0</li>
<li>xercesImpl v 2.4.0 -> v2.6.2</li>
<li>xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2</li>

2
rar/src/plugin-test/maven.xml
View File

@ -36,7 +36,7 @@
<unzip src="${rarFile}" dest="${unzipDir}"/>
<!-- check for commons-logging -->
<assert:assertFileExists file="${unzipDir}/commons-logging-1.0.3.jar"
<assert:assertFileExists file="${unzipDir}/commons-logging-1.0.4.jar"
msg="commons logging was not bundled"/>
<!-- check for the LICENSE -->

2
rar/src/plugin-test/project.xml
View File

@ -56,7 +56,7 @@ http://maven.apache.org/maven-v3_0_0.xsd">
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
<rar.bundle>true</rar.bundle>

2
simian/project.xml
View File

@ -128,7 +128,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging/</url>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>

1
simian/xdocs/changes.xml
View File

@ -30,6 +30,7 @@
<ul>
<li>ant v1.5.3-1 -> v1.6.5</li>
<li>commons-jelly v1.0-beta-4 -> v1.0</li>
<li>commons-logging v1.0.3 -> v1.0.4</li>
</ul>
</action>
<action dev="epugh" type="fix" issue="MPSIMIAN-15">Tag library warning when using simian 1.5</action>

4
war/src/plugin-test/test01/maven.xml
View File

@ -28,7 +28,7 @@
<j:set var="warFile" value="${maven.build.dir}/${pom.artifactId}.war"/>
<j:set var="warDir" value="${maven.build.dir}/${pom.artifactId}"/>
<assert:assertFileExists file="${warFile}"/>
<assert:assertFileExists file="${warDir}/WEB-INF/lib/commons-logging-1.0.3.jar"/>
<assert:assertFileExists file="${warDir}/WEB-INF/lib/commons-logging-1.0.4.jar"/>
<!-- check for manifest contents -->
<!-- a) Make sure existing manifest gets merged -->
@ -41,7 +41,7 @@
<fail>Manifest not merged</fail>
</j:if>
<!-- b) Make sure Class-Path entry is created -->
<j:set var="found" value='${manifest.indexOf("Class-Path: commons-logging-1.0.3.jar") ge 0}'/>
<j:set var="found" value='${manifest.indexOf("Class-Path: commons-logging-1.0.4.jar") ge 0}'/>
<j:if test="${!found}">
<fail>Class-Path not generated</fail>
</j:if>

2
war/src/plugin-test/test01/project.xml
View File

@ -44,7 +44,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<url>http://jakarta.apache.org/commons/logging.html</url>
<properties>
<war.bundle>true</war.bundle>

2
xdoc/project.xml
View File

@ -219,7 +219,7 @@
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.0.3</version>
<version>1.0.4</version>
<properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties>

3
xdoc/xdocs/changes.xml
View File

@ -22,7 +22,7 @@
<title>Changes</title>
<author email="dion@multitask.com.au">dIon Gillard</author>
<author email="vmassol@apache.org">Vincent Massol</author>
<author email="aheritier@apache.org">Arnaud HERITIER</author>
<author email="aheritier@apache.org">Arnaud Heritier</author>
<author email="vincent.siveton@gmail.org">Vincent Siveton</author>
</properties>
<body>
@ -30,6 +30,7 @@
<action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
<ul>
<li>commons-jelly v1.0-RC1 -> v1.0</li>
<li>commons-logging v1.0.3 -> v1.0.4</li>
<li>maven-model v3.0.0 -> v3.0.1</li>
</ul>
</action>