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

MAVEN-1753 : Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver 1.1 dependency for xerces.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@396338 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
aheritier 2006-04-23 23:36:53 +00:00
parent a3a792c123
commit 4005226350
24 changed files with 163 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
changelog/project.xml
View File

@ -216,18 +216,27 @@
</dependency> </dependency>
<!-- Required to build under for JDK 1.3 because we fork junit --> <!-- Required to build under for JDK 1.3 because we fork junit -->
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xml-apis</groupId>
<artifactId>xercesImpl</artifactId> <artifactId>xml-apis</artifactId>
<version>2.6.2</version> <version>1.3.03</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xml.apache.org/commons/</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>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties> </properties>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xerces</groupId>
<artifactId>xmlParserAPIs</artifactId> <artifactId>xercesImpl</artifactId>
<version>2.6.2</version> <version>2.8.0</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xerces.apache.org/xerces2-j/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>

1
changelog/xdocs/changes.xml
View File

@ -25,6 +25,7 @@
</properties> </properties>
<body> <body>
<release version="1.10" date="In SVN"> <release version="1.10" date="In SVN">
<action dev="aheritier" type="update" issue="MAVEN-1753">Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces.</action>
<action dev="aheritier" type="update">Upgrade to Junit 3.8.2.</action> <action dev="aheritier" type="update">Upgrade to Junit 3.8.2.</action>
</release> </release>
<release version="1.9.1" date="2006-03-26"> <release version="1.9.1" date="2006-03-26">

8
changes/project.xml
View File

@ -108,10 +108,10 @@
</properties> </properties>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xml-apis</groupId>
<artifactId>xmlParserAPIs</artifactId> <artifactId>xml-apis</artifactId>
<version>2.6.2</version> <version>1.3.03</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xml.apache.org/commons/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties> </properties>

3
changes/xdocs/changes.xml
View File

@ -23,7 +23,8 @@
<author email="vmassol@apache.org">Vincent Massol</author> <author email="vmassol@apache.org">Vincent Massol</author>
</properties> </properties>
<body> <body>
<release version="1.6.1" date="In SVN"> <release version="1.6.1-SNAPSHOT" date="In SVN">
<action dev="aheritier" type="update" issue="MAVEN-1753">Replace the deprecated xmlParserAPIs by xml-apis 1.3.03.</action>
<action dev="aheritier" type="update">Upgrade to commons-io 1.2.</action> <action dev="aheritier" type="update">Upgrade to commons-io 1.2.</action>
<action dev="ltheussl" type="fix" issue="MPCHANGES-30">Missing <code>changes.xml</code> makes report fail.</action> <action dev="ltheussl" type="fix" issue="MPCHANGES-30">Missing <code>changes.xml</code> makes report fail.</action>
<action dev="aheritier" type="fix" issue="MPCHANGES-29">Add icons used by this plugin. This must be independent of the xdoc plugin.</action> <action dev="aheritier" type="fix" issue="MPCHANGES-29">Add icons used by this plugin. This must be independent of the xdoc plugin.</action>

21
html2xdoc/project.xml
View File

@ -22,7 +22,7 @@
<pomVersion>3</pomVersion> <pomVersion>3</pomVersion>
<id>maven-html2xdoc-plugin</id> <id>maven-html2xdoc-plugin</id>
<name>Maven Html2XDoc Plugin</name> <name>Maven Html2XDoc Plugin</name>
<currentVersion>1.4</currentVersion> <currentVersion>1.5-SNAPSHOT</currentVersion>
<gumpRepositoryId>jakarta</gumpRepositoryId> <gumpRepositoryId>jakarta</gumpRepositoryId>
<description>Creates XDoc documentation from normal HTML documentation.</description> <description>Creates XDoc documentation from normal HTML documentation.</description>
<shortDescription>HTML to xdoc transformer</shortDescription> <shortDescription>HTML to xdoc transformer</shortDescription>
@ -97,10 +97,19 @@
<url>http://www.dom4j.org/</url> <url>http://www.dom4j.org/</url>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xml-apis</groupId>
<artifactId>xmlParserAPIs</artifactId> <artifactId>xml-apis</artifactId>
<version>2.6.2</version> <version>1.3.03</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xml.apache.org/commons/</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>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties> </properties>
@ -108,7 +117,7 @@
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId> <artifactId>xercesImpl</artifactId>
<version>2.6.2</version> <version>2.8.0</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xerces.apache.org/xerces2-j/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>

3
html2xdoc/xdocs/changes.xml
View File

@ -23,6 +23,9 @@
<author email="dion@multitask.com.au">dIon Gillard</author> <author email="dion@multitask.com.au">dIon Gillard</author>
</properties> </properties>
<body> <body>
<release version="1.5-SNAPSHOT" date="In SVN">
<action dev="aheritier" type="update" issue="MAVEN-1753">Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces.</action>
</release>
<release version="1.4" date="2006-01-15"> <release version="1.4" date="2006-01-15">
<action dev="ltheussl" type="update">Update documentation.</action> <action dev="ltheussl" type="update">Update documentation.</action>
<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 : <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 :

8
jalopy/project.xml
View File

@ -105,10 +105,10 @@
<version>1.2</version> <version>1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xml-apis</groupId>
<artifactId>xmlParserAPIs</artifactId> <artifactId>xml-apis</artifactId>
<version>2.6.2</version> <version>1.3.03</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xml.apache.org/commons/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties> </properties>

1
jalopy/xdocs/changes.xml
View File

@ -25,6 +25,7 @@
<body> <body>
<release version="1.4.1-SNAPSHOT" date="In SVN"> <release version="1.4.1-SNAPSHOT" date="In SVN">
<action dev="aheritier" type="fix" issue="MPJALOPY-9">Jalopy classes aren't found.</action> <action dev="aheritier" type="fix" issue="MPJALOPY-9">Jalopy classes aren't found.</action>
<action dev="aheritier" type="update" issue="MAVEN-1753">Replace the deprecated xmlParserAPIs by xml-apis 1.3.03.</action>
</release> </release>
<release version="1.4" date="2006-01-15"> <release version="1.4" date="2006-01-15">
<action dev="carlos" type="update">Update to jalopy 1.5b5 adding support for java 5.</action> <action dev="carlos" type="update">Update to jalopy 1.5b5 adding support for java 5.</action>

21
jdepend/project.xml
View File

@ -22,7 +22,7 @@
<pomVersion>3</pomVersion> <pomVersion>3</pomVersion>
<id>maven-jdepend-plugin</id> <id>maven-jdepend-plugin</id>
<name>Maven JDepend Plugin</name> <name>Maven JDepend Plugin</name>
<currentVersion>1.6.1</currentVersion> <currentVersion>1.7-SNAPSHOT</currentVersion>
<shortDescription>JDepend generates design quality metrics.</shortDescription> <shortDescription>JDepend generates design quality metrics.</shortDescription>
<description>JDepend traverses Java class file directories and generates design quality metrics for each Java package. JDepend allows you to automatically measure the quality of a design in terms of its extensibility, reusability, and maintainability to manage package dependencies effectively.</description> <description>JDepend traverses Java class file directories and generates design quality metrics for each Java package. JDepend allows you to automatically measure the quality of a design in terms of its extensibility, reusability, and maintainability to manage package dependencies effectively.</description>
<versions> <versions>
@ -120,10 +120,19 @@
<version>2.9.1</version> <version>2.9.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xml-apis</groupId>
<artifactId>xmlParserAPIs</artifactId> <artifactId>xml-apis</artifactId>
<version>2.6.2</version> <version>1.3.03</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xml.apache.org/commons/</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>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties> </properties>
@ -131,7 +140,7 @@
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId> <artifactId>xercesImpl</artifactId>
<version>2.6.2</version> <version>2.8.0</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xerces.apache.org/xerces2-j/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>

3
jdepend/xdocs/changes.xml
View File

@ -23,6 +23,9 @@
<author email="evenisse@ifrance.com">Emmanuel Venisse</author> <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties> </properties>
<body> <body>
<release version="1.7-SNAPSHOT" date="In SVN">
<action dev="aheritier" type="update" issue="MAVEN-1753">Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces.</action>
</release>
<release version="1.6.1" date="2006-03-26"> <release version="1.6.1" date="2006-03-26">
<action dev="ltheussl" type="fix" issue="MPJDEPEND-8">Set <action dev="ltheussl" type="fix" issue="MPJDEPEND-8">Set
<code>maven.jdepend.components</code>to empty by default for backwards compatibility. <code>maven.jdepend.components</code>to empty by default for backwards compatibility.

3
jellydoc/plugin.jelly
View File

@ -114,7 +114,8 @@
<ant:pathelement path="${plugin.getDependencyPath('nekohtml')}"/> <ant:pathelement path="${plugin.getDependencyPath('nekohtml')}"/>
<ant:pathelement path="${plugin.getDependencyPath('dom4j')}"/> <ant:pathelement path="${plugin.getDependencyPath('dom4j')}"/>
<ant:pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/> <ant:pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
<ant:pathelement path="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/> <ant:pathelement path="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
<ant:pathelement path="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
<ant:pathelement path="${plugin.getDependencyPath('commons-jelly')}"/> <ant:pathelement path="${plugin.getDependencyPath('commons-jelly')}"/>
</ant:path> </ant:path>
</goal> </goal>

19
jellydoc/project.xml
View File

@ -85,10 +85,19 @@
</properties> </properties>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xml-apis</groupId>
<artifactId>xmlParserAPIs</artifactId> <artifactId>xml-apis</artifactId>
<version>2.6.2</version> <version>1.3.03</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xml.apache.org/commons/</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>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties> </properties>
@ -96,7 +105,7 @@
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId> <artifactId>xercesImpl</artifactId>
<version>2.6.2</version> <version>2.8.0</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xerces.apache.org/xerces2-j/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>

1
jellydoc/xdocs/changes.xml
View File

@ -26,6 +26,7 @@
</properties> </properties>
<body> <body>
<release version="1.4-SNAPSHOT" date="In SVN"> <release version="1.4-SNAPSHOT" date="In SVN">
<action dev="aheritier" type="update" issue="MAVEN-1753">Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces.</action>
<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 : <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> <ul>
<li>commons-jelly-tags-xml v1.0 -> v1.1</li> <li>commons-jelly-tags-xml v1.0 -> v1.1</li>

19
pdf/plugin.jelly
View File

@ -70,7 +70,6 @@
</j:if> </j:if>
<!-- internal variables --> <!-- internal variables -->
<j:set var="internal_pdf_workingDir" value="${maven.build.dir}/pdf"/> <j:set var="internal_pdf_workingDir" value="${maven.build.dir}/pdf"/>
<j:set var="java_version" value="${java.specification.version}"/>
<j:if test="${maven.pdf.debug}"> <j:if test="${maven.pdf.debug}">
<ant:echo> <ant:echo>
### Debug mode is on ### ### Debug mode is on ###
@ -109,7 +108,6 @@ maven.jar.jaicodec = [${maven.jar.jaicodec}]
=== pdf internal variables === === pdf internal variables ===
============================== ==============================
internal_pdf_workingDir = [${internal_pdf_workingDir}] internal_pdf_workingDir = [${internal_pdf_workingDir}]
java_version = [${java_version}]
maven.application.version = [${maven.application.version}] maven.application.version = [${maven.application.version}]
plugin.currentVersion = [${plugin.currentVersion}] plugin.currentVersion = [${plugin.currentVersion}]
</ant:echo> </ant:echo>
@ -228,12 +226,14 @@ plugin.currentVersion = [${plugin.currentVersion}]
<arg value="-PARAM"/> <arg value="-PARAM"/>
<arg value="footer_Height"/> <arg value="footer_Height"/>
<arg value="${maven.pdf.cover.footerHeight}"/> <arg value="${maven.pdf.cover.footerHeight}"/>
<sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImp"/>
<sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/>
<sysproperty key="java.endorsed.dirs" path="${java.home}/lib/endorsed;${maven.home}/lib/endorsed}"/>
<classpath> <classpath>
<pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/> <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
<pathelement location="${plugin.getDependencyPath('xalan')}"/> <pathelement location="${plugin.getDependencyPath('xalan')}"/>
<j:if test="${java_version.compareTo('1.4') lt 0}"> <pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
<pathelement location="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/> <pathelement location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
</j:if>
</classpath> </classpath>
</java> </java>
</goal> </goal>
@ -274,7 +274,6 @@ plugin.currentVersion = [${plugin.currentVersion}]
<echo>Generating ${internal_pdf_workingDir}/${maven.pdf.pdfName} ...</echo> <echo>Generating ${internal_pdf_workingDir}/${maven.pdf.pdfName} ...</echo>
<echo>Config file: ${internal_pdf_workingDir}/userconfig.xml</echo> <echo>Config file: ${internal_pdf_workingDir}/userconfig.xml</echo>
<java classname="org.apache.fop.apps.Fop" fork="true" failonerror="true"> <java classname="org.apache.fop.apps.Fop" fork="true" failonerror="true">
<sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/>
<sysproperty key="javax.xml.transform.TransformerFactory" value="org.apache.xalan.processor.TransformerFactoryImpl"/> <sysproperty key="javax.xml.transform.TransformerFactory" value="org.apache.xalan.processor.TransformerFactoryImpl"/>
<!-- System proxies for jdk 1.5+ --> <!-- System proxies for jdk 1.5+ -->
<sysproperty key="java.net.useSystemProxies" value="true"/> <sysproperty key="java.net.useSystemProxies" value="true"/>
@ -301,11 +300,13 @@ plugin.currentVersion = [${plugin.currentVersion}]
<arg value="${internal_pdf_workingDir}/project.fo"/> <arg value="${internal_pdf_workingDir}/project.fo"/>
<arg value="-pdf"/> <arg value="-pdf"/>
<arg value="${internal_pdf_workingDir}/${maven.pdf.pdfName}"/> <arg value="${internal_pdf_workingDir}/${maven.pdf.pdfName}"/>
<sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImp"/>
<sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/>
<sysproperty key="java.endorsed.dirs" path="${java.home}/lib/endorsed;${maven.home}/lib/endorsed}"/>
<classpath> <classpath>
<pathelement location="${plugin.getDependencyPath('fop')}"/> <pathelement location="${plugin.getDependencyPath('fop')}"/>
<j:if test="${java_version.compareTo('1.4') lt 0}"> <pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
<pathelement location="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/> <pathelement location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
</j:if>
<pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/> <pathelement location="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
<pathelement location="${plugin.getDependencyPath('xalan')}"/> <pathelement location="${plugin.getDependencyPath('xalan')}"/>
<pathelement location="${plugin.getDependencyPath('batik')}"/> <pathelement location="${plugin.getDependencyPath('batik')}"/>

19
pdf/project.xml
View File

@ -128,10 +128,19 @@
<url>http://avalon.apache.org/framework/</url> <url>http://avalon.apache.org/framework/</url>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xml-apis</groupId>
<artifactId>xmlParserAPIs</artifactId> <artifactId>xml-apis</artifactId>
<version>2.6.2</version> <version>1.3.03</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xml.apache.org/commons/</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>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties> </properties>
@ -139,7 +148,7 @@
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId> <artifactId>xercesImpl</artifactId>
<version>2.6.2</version> <version>2.8.0</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xerces.apache.org/xerces2-j/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>

8
pdf/xdocs/changes.xml
View File

@ -25,17 +25,13 @@
</properties> </properties>
<body> <body>
<release version="2.5-SNAPSHOT" date="in SVN"> <release version="2.5-SNAPSHOT" date="in SVN">
<action dev="aheritier" type="update" issue="MAVEN-1753">Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces.</action>
<action dev="aheritier" type="update">An icon is added to the report entry in the navigation. Works only with the xdoc plugin 1.10 and above.</action> <action dev="aheritier" type="update">An icon is added to the report entry in the navigation. Works only with the xdoc plugin 1.10 and above.</action>
<action dev="aheritier" type="fix">The links generated in the reports list are wrong. Works only with the xdoc plugin 1.10 and above.</action> <action dev="aheritier" type="fix">The links generated in the reports list are wrong. Works only with the xdoc plugin 1.10 and above.</action>
<action dev="ltheussl" type="add" due-to="Greg Ludington">New property <code>maven.pdf.createBookmarks</code> to create PDF bookmarks.</action> <action dev="ltheussl" type="add" due-to="Greg Ludington">New property <code>maven.pdf.createBookmarks</code> to create PDF bookmarks.</action>
<action dev="ltheussl" type="fix" issue="MPPDF-53">Title and dates are incorrect when used with Maven 1.0.2.</action> <action dev="ltheussl" type="fix" issue="MPPDF-53">Title and dates are incorrect when used with Maven 1.0.2.</action>
<action dev="ltheussl" type="fix" issue="MPPDF-54">Identical ids in tables in different documents caused a build failure.</action> <action dev="ltheussl" type="fix" issue="MPPDF-54">Identical ids in tables in different documents caused a build failure.</action>
<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 : <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins.</action>
<ul>
<li>xercesImpl v 2.4.0 -> v2.6.2</li>
<li>xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2</li>
</ul>
</action>
<action dev="aheritier" type="fix" issue="MPPDF-47">An error occurs if the project logo or the company logo aren't defined.</action> <action dev="aheritier" type="fix" issue="MPPDF-47">An error occurs if the project logo or the company logo aren't defined.</action>
<action dev="ltheussl" type="fix" issue="MPPDF-37">Page numbering not correct with more than 10 items in menu.</action> <action dev="ltheussl" type="fix" issue="MPPDF-37">Page numbering not correct with more than 10 items in menu.</action>
<action dev="ltheussl" type="add" issue="MPPDF-48">New goal <code>pdf:navigation-validate</code> to validate the pdf navigation file.</action> <action dev="ltheussl" type="add" issue="MPPDF-48">New goal <code>pdf:navigation-validate</code> to validate the pdf navigation file.</action>

21
plugin/project.xml
View File

@ -22,7 +22,7 @@
<pomVersion>3</pomVersion> <pomVersion>3</pomVersion>
<id>maven-plugin-plugin</id> <id>maven-plugin-plugin</id>
<name>Maven Plugin Plugin</name> <name>Maven Plugin Plugin</name>
<currentVersion>1.7</currentVersion> <currentVersion>1.8-SNAPSHOT</currentVersion>
<description>Maven Plugin management plugin.</description> <description>Maven Plugin management plugin.</description>
<shortDescription>Maven Plugin plugin</shortDescription> <shortDescription>Maven Plugin plugin</shortDescription>
<versions> <versions>
@ -170,10 +170,19 @@
<version>1.0-FCS-full</version> <version>1.0-FCS-full</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xml-apis</groupId>
<artifactId>xmlParserAPIs</artifactId> <artifactId>xml-apis</artifactId>
<version>2.6.2</version> <version>1.3.03</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xml.apache.org/commons/</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>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties> </properties>
@ -181,7 +190,7 @@
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId> <artifactId>xercesImpl</artifactId>
<version>2.6.2</version> <version>2.8.0</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xerces.apache.org/xerces2-j/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>

3
plugin/xdocs/changes.xml
View File

@ -23,6 +23,9 @@
<author email="evenisse@ifrance.com">Emmanuel Venisse</author> <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
</properties> </properties>
<body> <body>
<release version="1.8-SNAPSHOT" date="In SVN">
<action dev="aheritier" type="update" issue="MAVEN-1753">Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces.</action>
</release>
<release version="1.7" date="2005-12-12"> <release version="1.7" date="2005-12-12">
<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 : <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> <ul>

5
plugins-parent/project.properties
View File

@ -79,8 +79,9 @@ maven.jar.plexus-utils=1.0.3
maven.jar.wagon-file=1.0-alpha-4 maven.jar.wagon-file=1.0-alpha-4
maven.jar.wagon-http=1.0-alpha-3 maven.jar.wagon-http=1.0-alpha-3
maven.jar.wagon-provider-api=1.0-alpha-3 maven.jar.wagon-provider-api=1.0-alpha-3
maven.jar.xercesImpl=2.6.2 maven.jar.xercesImpl=2.8.0
maven.jar.xmlParserAPIs=2.6.2 maven.jar.xml-apis=1.3.03
maven.jar.xml-resolver=1.1
maven.jar.maven = ${maven.home}/lib/maven.jar maven.jar.maven = ${maven.home}/lib/maven.jar

28
test/plugin.jelly
View File

@ -47,7 +47,6 @@
<u:tokenize var="_listOfTestSrcDirs" delim="${path.separator}">${_testSrcDirs}</u:tokenize> <u:tokenize var="_listOfTestSrcDirs" delim="${path.separator}">${_testSrcDirs}</u:tokenize>
<j:if test="${unitTestSourcesPresent == 'true' and context.getVariable('maven.test.skip') != 'true'}"> <j:if test="${unitTestSourcesPresent == 'true' and context.getVariable('maven.test.skip') != 'true'}">
<javac <javac
destdir="${maven.test.dest}" destdir="${maven.test.dest}"
excludes="**/package.html" excludes="**/package.html"
@ -63,9 +62,10 @@
<path refid="maven.dependency.classpath"/> <path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/> <pathelement path="${plugin.getDependencyPath('junit')}"/>
<j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }"> <j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
<pathelement path="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/> <pathelement location="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
<pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
</j:if> </j:if>
<pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
<pathelement location="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
</classpath> </classpath>
<src> <src>
<path refid="maven.test.compile.src.set"/> <path refid="maven.test.compile.src.set"/>
@ -181,9 +181,10 @@
<path refid="maven.dependency.classpath"/> <path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/> <pathelement path="${plugin.getDependencyPath('junit')}"/>
<j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }"> <j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
<pathelement path="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/> <pathelement path="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
<pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
</j:if> </j:if>
<pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
<pathelement path="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
<j:if test="${not empty(context.getVariable('maven.test.classpath'))}"> <j:if test="${not empty(context.getVariable('maven.test.classpath'))}">
<pathelement path="${maven.test.classpath}"/> <pathelement path="${maven.test.classpath}"/>
</j:if> </j:if>
@ -247,9 +248,10 @@
<path refid="maven.dependency.classpath"/> <path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/> <pathelement path="${plugin.getDependencyPath('junit')}"/>
<j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }"> <j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
<pathelement path="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/> <pathelement path="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
<pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
</j:if> </j:if>
<pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
<pathelement path="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
<j:if test="${not empty(context.getVariable('maven.test.classpath'))}"> <j:if test="${not empty(context.getVariable('maven.test.classpath'))}">
<pathelement path="${maven.test.classpath}"/> <pathelement path="${maven.test.classpath}"/>
</j:if> </j:if>
@ -326,16 +328,16 @@
</j:forEach> </j:forEach>
<formatter type="xml"/> <formatter type="xml"/>
<formatter type="${maven.junit.format}" usefile="${maven.junit.usefile}"/> <formatter type="${maven.junit.format}" usefile="${maven.junit.usefile}"/>
<classpath> <classpath>
<pathelement location="${maven.test.dest}"/> <pathelement location="${maven.test.dest}"/>
<pathelement location="${maven.build.dest}"/> <pathelement location="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/> <path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/> <pathelement path="${plugin.getDependencyPath('junit')}"/>
<j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }"> <j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
<pathelement path="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/> <pathelement path="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
<pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
</j:if> </j:if>
<pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
<pathelement path="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
<j:if test="${not empty(context.getVariable('maven.test.classpath'))}"> <j:if test="${not empty(context.getVariable('maven.test.classpath'))}">
<pathelement path="${maven.test.classpath}"/> <pathelement path="${maven.test.classpath}"/>
</j:if> </j:if>
@ -435,16 +437,16 @@
</j:forEach> </j:forEach>
<formatter type="xml"/> <formatter type="xml"/>
<formatter type="${maven.junit.format}" usefile="${maven.junit.usefile}"/> <formatter type="${maven.junit.format}" usefile="${maven.junit.usefile}"/>
<classpath> <classpath>
<pathelement location="${maven.test.dest}"/> <pathelement location="${maven.test.dest}"/>
<pathelement location="${maven.build.dest}"/> <pathelement location="${maven.build.dest}"/>
<path refid="maven.dependency.classpath"/> <path refid="maven.dependency.classpath"/>
<pathelement path="${plugin.getDependencyPath('junit')}"/> <pathelement path="${plugin.getDependencyPath('junit')}"/>
<j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }"> <j:if test="${!context.getVariable('maven.junit.fork').toString().trim().equalsIgnoreCase('no') and !context.getVariable('maven.test.excludeXmlApis').toString().trim().equalsIgnoreCase('yes') }">
<pathelement path="${plugin.getDependencyPath('xerces:xmlParserAPIs')}"/> <pathelement path="${plugin.getDependencyPath('xml-apis:xml-apis')}"/>
<pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
</j:if> </j:if>
<pathelement path="${plugin.getDependencyPath('xerces:xercesImpl')}"/>
<pathelement path="${plugin.getDependencyPath('xml-resolver:xml-resolver')}"/>
<j:if test="${not empty(context.getVariable('maven.test.classpath'))}"> <j:if test="${not empty(context.getVariable('maven.test.classpath'))}">
<pathelement path="${maven.test.classpath}"/> <pathelement path="${maven.test.classpath}"/>
</j:if> </j:if>

19
test/project.xml
View File

@ -62,10 +62,19 @@
</properties> </properties>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xml-apis</groupId>
<artifactId>xmlParserAPIs</artifactId> <artifactId>xml-apis</artifactId>
<version>2.6.2</version> <version>1.3.03</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xml.apache.org/commons/</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>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
<version>1.1</version>
<url>http://xml.apache.org/commons/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties> </properties>
@ -73,7 +82,7 @@
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId> <artifactId>xercesImpl</artifactId>
<version>2.6.2</version> <version>2.8.0</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xerces.apache.org/xerces2-j/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>

8
test/xdocs/changes.xml
View File

@ -24,6 +24,7 @@
</properties> </properties>
<body> <body>
<release version="1.8-SNAPSHOT" date="in SVN"> <release version="1.8-SNAPSHOT" date="in SVN">
<action dev="aheritier" type="update" issue="MAVEN-1753">Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces.</action>
<action dev="aheritier" type="update">Upgrade to Junit 3.8.2.</action> <action dev="aheritier" type="update">Upgrade to Junit 3.8.2.</action>
<action dev="ltheussl" type="fix" issue="MPTEST-49"><code>test:test</code> should honour the <code>maven.test.compile.src.set</code> variable.</action> <action dev="ltheussl" type="fix" issue="MPTEST-49"><code>test:test</code> should honour the <code>maven.test.compile.src.set</code> variable.</action>
<action dev="ltheussl" type="add" issue="MPTEST-43">Set junit's <code>showoutput</code> attribute if Maven is executed in debug (-X) mode.</action> <action dev="ltheussl" type="add" issue="MPTEST-43">Set junit's <code>showoutput</code> attribute if Maven is executed in debug (-X) mode.</action>
@ -34,12 +35,7 @@
<action dev="ltheussl" type="fix" issue="MPTEST-46">Do not execute <code>test:test-resources</code> and <code>test:compile</code> unless tests will be run.</action> <action dev="ltheussl" type="fix" issue="MPTEST-46">Do not execute <code>test:test-resources</code> and <code>test:compile</code> unless tests will be run.</action>
<action dev="ltheussl" type="fix" issue="MPTEST-59"><code>test:single</code> should ignore <code>maven.test.skip=true</code>.</action> <action dev="ltheussl" type="fix" issue="MPTEST-59"><code>test:single</code> should ignore <code>maven.test.skip=true</code>.</action>
<action dev="ltheussl" type="fix" issue="MPTEST-39">Test failure doesn't halt execution of test suite.</action> <action dev="ltheussl" type="fix" issue="MPTEST-39">Test failure doesn't halt execution of test suite.</action>
<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 : <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins.</action>
<ul>
<li>xercesImpl v 2.4.0 -> v2.6.2</li>
<li>xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2</li>
</ul>
</action>
<action dev="brett" type="add" due-to="Eric Hartmann" issue="MPTEST-55">Add maven.test.excludeXmlApis property to avoid duplicated Xerces</action> <action dev="brett" type="add" due-to="Eric Hartmann" issue="MPTEST-55">Add maven.test.excludeXmlApis property to avoid duplicated Xerces</action>
</release> </release>
<release version="1.7" date="2005-08-09"> <release version="1.7" date="2005-08-09">

8
xdoc/project.xml
View File

@ -250,10 +250,10 @@
<version>0.45</version> <version>0.45</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>xerces</groupId> <groupId>xml-apis</groupId>
<artifactId>xmlParserAPIs</artifactId> <artifactId>xml-apis</artifactId>
<version>2.6.2</version> <version>1.3.03</version>
<url>http://xerces.apache.org/xerces2-j/</url> <url>http://xml.apache.org/commons/</url>
<properties> <properties>
<comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment> <comment>This library is already loaded by maven's core. Be careful to use the same version number as in the core.</comment>
</properties> </properties>

1
xdoc/xdocs/changes.xml
View File

@ -27,6 +27,7 @@
</properties> </properties>
<body> <body>
<release version="1.10-SNAPSHOT" date="in SVN"> <release version="1.10-SNAPSHOT" date="in SVN">
<action dev="aheritier" type="update" issue="MAVEN-1753">Replace the deprecated xmlParserAPIs by xml-apis 1.3.03.</action>
<action dev="ltheussl" type="add" issue="MPXDOC-192">Add a public DTD identifier for xdoc.</action> <action dev="ltheussl" type="add" issue="MPXDOC-192">Add a public DTD identifier for xdoc.</action>
<action dev="aheritier" type="update">An image can be used in the menu entry for a report.</action> <action dev="aheritier" type="update">An image can be used in the menu entry for a report.</action>
<action dev="aheritier" type="update">Item name is always displayed even if img attribute is setted. In the navigation file the new attribute 'hideName' can be used to hide the name in the link (if you want to display only the image for example).</action> <action dev="aheritier" type="update">Item name is always displayed even if img attribute is setted. In the navigation file the new attribute 'hideName' can be used to hide the name in the link (if you want to display only the image for example).</action>