diff --git a/changelog/project.xml b/changelog/project.xml index 104a58a3..ac032284 100644 --- a/changelog/project.xml +++ b/changelog/project.xml @@ -216,18 +216,27 @@ - xerces - xercesImpl - 2.6.2 - http://xerces.apache.org/xerces2-j/ + xml-apis + xml-apis + 1.3.03 + http://xml.apache.org/commons/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + + + + xml-resolver + xml-resolver + 1.1 + http://xml.apache.org/commons/ This library is already loaded by maven's core. Be careful to use the same version number as in the core. xerces - xmlParserAPIs - 2.6.2 + xercesImpl + 2.8.0 http://xerces.apache.org/xerces2-j/ This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/changelog/xdocs/changes.xml b/changelog/xdocs/changes.xml index 8a162a27..272adec1 100644 --- a/changelog/xdocs/changes.xml +++ b/changelog/xdocs/changes.xml @@ -25,6 +25,7 @@ + Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces. Upgrade to Junit 3.8.2. diff --git a/changes/project.xml b/changes/project.xml index 765f934a..0b9756ac 100644 --- a/changes/project.xml +++ b/changes/project.xml @@ -108,10 +108,10 @@ - xerces - xmlParserAPIs - 2.6.2 - http://xerces.apache.org/xerces2-j/ + xml-apis + xml-apis + 1.3.03 + http://xml.apache.org/commons/ This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/changes/xdocs/changes.xml b/changes/xdocs/changes.xml index f6eab07b..e6ac9ec0 100644 --- a/changes/xdocs/changes.xml +++ b/changes/xdocs/changes.xml @@ -23,7 +23,8 @@ Vincent Massol - + + Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Upgrade to commons-io 1.2. Missing changes.xml makes report fail. Add icons used by this plugin. This must be independent of the xdoc plugin. diff --git a/html2xdoc/project.xml b/html2xdoc/project.xml index 7a1bd786..bf111ec9 100644 --- a/html2xdoc/project.xml +++ b/html2xdoc/project.xml @@ -22,7 +22,7 @@ 3 maven-html2xdoc-plugin Maven Html2XDoc Plugin - 1.4 + 1.5-SNAPSHOT jakarta Creates XDoc documentation from normal HTML documentation. HTML to xdoc transformer @@ -97,10 +97,19 @@ http://www.dom4j.org/ - xerces - xmlParserAPIs - 2.6.2 - http://xerces.apache.org/xerces2-j/ + xml-apis + xml-apis + 1.3.03 + http://xml.apache.org/commons/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + + + + xml-resolver + xml-resolver + 1.1 + http://xml.apache.org/commons/ This library is already loaded by maven's core. Be careful to use the same version number as in the core. @@ -108,7 +117,7 @@ xerces xercesImpl - 2.6.2 + 2.8.0 http://xerces.apache.org/xerces2-j/ This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/html2xdoc/xdocs/changes.xml b/html2xdoc/xdocs/changes.xml index bd95899b..025106a1 100644 --- a/html2xdoc/xdocs/changes.xml +++ b/html2xdoc/xdocs/changes.xml @@ -23,6 +23,9 @@ dIon Gillard + + Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces. + Update documentation. Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : diff --git a/jalopy/project.xml b/jalopy/project.xml index 7fcae8dd..1c61a04b 100644 --- a/jalopy/project.xml +++ b/jalopy/project.xml @@ -105,10 +105,10 @@ 1.2 - xerces - xmlParserAPIs - 2.6.2 - http://xerces.apache.org/xerces2-j/ + xml-apis + xml-apis + 1.3.03 + http://xml.apache.org/commons/ 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 f3bb8be5..cb4aaf8a 100644 --- a/jalopy/xdocs/changes.xml +++ b/jalopy/xdocs/changes.xml @@ -25,6 +25,7 @@ Jalopy classes aren't found. + Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Update to jalopy 1.5b5 adding support for java 5. diff --git a/jdepend/project.xml b/jdepend/project.xml index 6902ffe0..32767ea3 100644 --- a/jdepend/project.xml +++ b/jdepend/project.xml @@ -22,7 +22,7 @@ 3 maven-jdepend-plugin Maven JDepend Plugin - 1.6.1 + 1.7-SNAPSHOT JDepend generates design quality metrics. 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. @@ -120,10 +120,19 @@ 2.9.1 - xerces - xmlParserAPIs - 2.6.2 - http://xerces.apache.org/xerces2-j/ + xml-apis + xml-apis + 1.3.03 + http://xml.apache.org/commons/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + + + + xml-resolver + xml-resolver + 1.1 + http://xml.apache.org/commons/ This library is already loaded by maven's core. Be careful to use the same version number as in the core. @@ -131,7 +140,7 @@ xerces xercesImpl - 2.6.2 + 2.8.0 http://xerces.apache.org/xerces2-j/ This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/jdepend/xdocs/changes.xml b/jdepend/xdocs/changes.xml index db80c8d1..3c2fe4e4 100644 --- a/jdepend/xdocs/changes.xml +++ b/jdepend/xdocs/changes.xml @@ -23,6 +23,9 @@ Emmanuel Venisse + + Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces. + Set maven.jdepend.componentsto empty by default for backwards compatibility. diff --git a/jellydoc/plugin.jelly b/jellydoc/plugin.jelly index 2942b476..933d2451 100644 --- a/jellydoc/plugin.jelly +++ b/jellydoc/plugin.jelly @@ -114,7 +114,8 @@ - + + diff --git a/jellydoc/project.xml b/jellydoc/project.xml index c3bf4970..ce672601 100644 --- a/jellydoc/project.xml +++ b/jellydoc/project.xml @@ -85,10 +85,19 @@ - xerces - xmlParserAPIs - 2.6.2 - http://xerces.apache.org/xerces2-j/ + xml-apis + xml-apis + 1.3.03 + http://xml.apache.org/commons/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + + + + xml-resolver + xml-resolver + 1.1 + http://xml.apache.org/commons/ This library is already loaded by maven's core. Be careful to use the same version number as in the core. @@ -96,7 +105,7 @@ xerces xercesImpl - 2.6.2 + 2.8.0 http://xerces.apache.org/xerces2-j/ This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/jellydoc/xdocs/changes.xml b/jellydoc/xdocs/changes.xml index 145c4a97..929720ce 100644 --- a/jellydoc/xdocs/changes.xml +++ b/jellydoc/xdocs/changes.xml @@ -26,6 +26,7 @@ + Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces. Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
  • commons-jelly-tags-xml v1.0 -> v1.1
    • diff --git a/pdf/plugin.jelly b/pdf/plugin.jelly index ad268325..7059f563 100644 --- a/pdf/plugin.jelly +++ b/pdf/plugin.jelly @@ -70,7 +70,6 @@ - ### Debug mode is on ### @@ -109,7 +108,6 @@ maven.jar.jaicodec = [${maven.jar.jaicodec}] === pdf internal variables === ============================== internal_pdf_workingDir = [${internal_pdf_workingDir}] -java_version = [${java_version}] maven.application.version = [${maven.application.version}] plugin.currentVersion = [${plugin.currentVersion}] @@ -228,12 +226,14 @@ plugin.currentVersion = [${plugin.currentVersion}] + + + - - - + + @@ -274,7 +274,6 @@ plugin.currentVersion = [${plugin.currentVersion}] Generating ${internal_pdf_workingDir}/${maven.pdf.pdfName} ... Config file: ${internal_pdf_workingDir}/userconfig.xml - @@ -301,11 +300,13 @@ plugin.currentVersion = [${plugin.currentVersion}] + + + - - - + + diff --git a/pdf/project.xml b/pdf/project.xml index b78e9a46..f41d1ce5 100644 --- a/pdf/project.xml +++ b/pdf/project.xml @@ -128,10 +128,19 @@ http://avalon.apache.org/framework/ - xerces - xmlParserAPIs - 2.6.2 - http://xerces.apache.org/xerces2-j/ + xml-apis + xml-apis + 1.3.03 + http://xml.apache.org/commons/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + + + + xml-resolver + xml-resolver + 1.1 + http://xml.apache.org/commons/ This library is already loaded by maven's core. Be careful to use the same version number as in the core. @@ -139,7 +148,7 @@ xerces xercesImpl - 2.6.2 + 2.8.0 http://xerces.apache.org/xerces2-j/ This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/pdf/xdocs/changes.xml b/pdf/xdocs/changes.xml index f3b4b96c..6f98098c 100644 --- a/pdf/xdocs/changes.xml +++ b/pdf/xdocs/changes.xml @@ -25,17 +25,13 @@ + Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces. An icon is added to the report entry in the navigation. Works only with the xdoc plugin 1.10 and above. The links generated in the reports list are wrong. Works only with the xdoc plugin 1.10 and above. New property maven.pdf.createBookmarks to create PDF bookmarks. Title and dates are incorrect when used with Maven 1.0.2. Identical ids in tables in different documents caused a build failure. - Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : -
      -
    • xercesImpl v 2.4.0 -> v2.6.2
      • -
    • xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2
      • -
    -     + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. An error occurs if the project logo or the company logo aren't defined. Page numbering not correct with more than 10 items in menu. New goal pdf:navigation-validate to validate the pdf navigation file. diff --git a/plugin/project.xml b/plugin/project.xml index 8161d3ec..469c0914 100644 --- a/plugin/project.xml +++ b/plugin/project.xml @@ -22,7 +22,7 @@ 3 maven-plugin-plugin Maven Plugin Plugin - 1.7 + 1.8-SNAPSHOT Maven Plugin management plugin. Maven Plugin plugin @@ -170,10 +170,19 @@ 1.0-FCS-full     - xerces - xmlParserAPIs - 2.6.2 - http://xerces.apache.org/xerces2-j/ + xml-apis + xml-apis + 1.3.03 + http://xml.apache.org/commons/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + + + + xml-resolver + xml-resolver + 1.1 + http://xml.apache.org/commons/ This library is already loaded by maven's core. Be careful to use the same version number as in the core. @@ -181,7 +190,7 @@ xerces xercesImpl - 2.6.2 + 2.8.0 http://xerces.apache.org/xerces2-j/ This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/plugin/xdocs/changes.xml b/plugin/xdocs/changes.xml index cdb7da68..2408fe05 100644 --- a/plugin/xdocs/changes.xml +++ b/plugin/xdocs/changes.xml @@ -23,6 +23,9 @@ Emmanuel Venisse + + Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces. + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated :
      diff --git a/plugins-parent/project.properties b/plugins-parent/project.properties index ee40d726..da220b74 100644 --- a/plugins-parent/project.properties +++ b/plugins-parent/project.properties @@ -79,8 +79,9 @@ maven.jar.plexus-utils=1.0.3 maven.jar.wagon-file=1.0-alpha-4 maven.jar.wagon-http=1.0-alpha-3 maven.jar.wagon-provider-api=1.0-alpha-3 -maven.jar.xercesImpl=2.6.2 -maven.jar.xmlParserAPIs=2.6.2 +maven.jar.xercesImpl=2.8.0 +maven.jar.xml-apis=1.3.03 +maven.jar.xml-resolver=1.1 maven.jar.maven = ${maven.home}/lib/maven.jar diff --git a/test/plugin.jelly b/test/plugin.jelly index a5637abc..e72b3245 100644 --- a/test/plugin.jelly +++ b/test/plugin.jelly @@ -47,7 +47,6 @@ ${_testSrcDirs} - - - + + + @@ -181,9 +181,10 @@ - - + + + @@ -247,9 +248,10 @@ - - + + + @@ -326,16 +328,16 @@ - - - + + + @@ -435,16 +437,16 @@ - - - + + + diff --git a/test/project.xml b/test/project.xml index e0e4f938..3e847529 100644 --- a/test/project.xml +++ b/test/project.xml @@ -62,10 +62,19 @@ - xerces - xmlParserAPIs - 2.6.2 - http://xerces.apache.org/xerces2-j/ + xml-apis + xml-apis + 1.3.03 + http://xml.apache.org/commons/ + + This library is already loaded by maven's core. Be careful to use the same version number as in the core. + + + + xml-resolver + xml-resolver + 1.1 + http://xml.apache.org/commons/ This library is already loaded by maven's core. Be careful to use the same version number as in the core. @@ -73,7 +82,7 @@ xerces xercesImpl - 2.6.2 + 2.8.0 http://xerces.apache.org/xerces2-j/ This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/test/xdocs/changes.xml b/test/xdocs/changes.xml index e24e6b76..aacd845c 100644 --- a/test/xdocs/changes.xml +++ b/test/xdocs/changes.xml @@ -24,6 +24,7 @@ + Upgrade to Xerces 2.8.0. Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add the xml-resolver dependency for xerces. Upgrade to Junit 3.8.2. test:test should honour the maven.test.compile.src.set variable. Set junit's showoutput attribute if Maven is executed in debug (-X) mode. @@ -34,12 +35,7 @@ Do not execute test:test-resources and test:compile unless tests will be run. test:single should ignore maven.test.skip=true. Test failure doesn't halt execution of test suite. - Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : -
        -
      • xercesImpl v 2.4.0 -> v2.6.2
        • -
      • xml-apis v 1.0.b2 -> xmlParserAPIs v2.6.2
        • -
      -       + Update dependencies to match ones in maven 1.1 core and to unify them between plugins. Add maven.test.excludeXmlApis property to avoid duplicated Xerces       diff --git a/xdoc/project.xml b/xdoc/project.xml index 904215af..e689283b 100644 --- a/xdoc/project.xml +++ b/xdoc/project.xml @@ -250,10 +250,10 @@ 0.45       - xerces - xmlParserAPIs - 2.6.2 - http://xerces.apache.org/xerces2-j/ + xml-apis + xml-apis + 1.3.03 + http://xml.apache.org/commons/ This library is already loaded by maven's core. Be careful to use the same version number as in the core. diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml index b61715d0..cd59880f 100644 --- a/xdoc/xdocs/changes.xml +++ b/xdoc/xdocs/changes.xml @@ -27,6 +27,7 @@ + Replace the deprecated xmlParserAPIs by xml-apis 1.3.03. Add a public DTD identifier for xdoc. An image can be used in the menu entry for a report. 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).