You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2013/03/10 14:34:17 UTC

svn commit: r1454848 - in /webservices/axiom/trunk: devguide/src/docbkx/devguide.xml pom.xml userguide/src/docbkx/userguide.xml

Author: veithen
Date: Sun Mar 10 13:34:16 2013
New Revision: 1454848

URL: http://svn.apache.org/r1454848
Log:
Prevent docbkx-maven-plugin from downloading the Docbook DTD from the Web.

Modified:
    webservices/axiom/trunk/devguide/src/docbkx/devguide.xml
    webservices/axiom/trunk/pom.xml
    webservices/axiom/trunk/userguide/src/docbkx/userguide.xml

Modified: webservices/axiom/trunk/devguide/src/docbkx/devguide.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/devguide/src/docbkx/devguide.xml?rev=1454848&r1=1454847&r2=1454848&view=diff
==============================================================================
--- webservices/axiom/trunk/devguide/src/docbkx/devguide.xml (original)
+++ webservices/axiom/trunk/devguide/src/docbkx/devguide.xml Sun Mar 10 13:34:16 2013
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN" "http://docbook.org/xml/5.0/dtd/docbook.dtd">
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one
   ~ or more contributor license agreements. See the NOTICE file

Modified: webservices/axiom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/pom.xml?rev=1454848&r1=1454847&r2=1454848&view=diff
==============================================================================
--- webservices/axiom/trunk/pom.xml (original)
+++ webservices/axiom/trunk/pom.xml Sun Mar 10 13:34:16 2013
@@ -465,7 +465,25 @@
                 <plugin>
                     <groupId>com.agilejava.docbkx</groupId>
                     <artifactId>docbkx-maven-plugin</artifactId>
-                    <version>2.0.13</version>
+                    <version>2.0.14</version>
+                    <dependencies>
+                        <!-- Contains the catalog and DTD/Schema files. We use this to resolve the DTD locally
+                             instead of downloading it from the Web -->
+                        <dependency>
+                            <groupId>net.sf.docbook</groupId>
+                            <artifactId>docbook-xml</artifactId>
+                            <version>5.0-all</version>
+                            <classifier>resources</classifier>
+                            <type>zip</type>
+                        </dependency>
+                        <!-- Upgrade to xml-resolver 1.2. This is merely to make debugging easier (version 1.1
+                             neither has debug information nor a source JAR) -->
+                        <dependency>
+                            <groupId>xml-resolver</groupId>
+                            <artifactId>xml-resolver</artifactId>
+                            <version>1.2</version>
+                        </dependency>
+                    </dependencies>
                 </plugin>
                 <plugin>
                     <groupId>org.codehaus.mojo</groupId>

Modified: webservices/axiom/trunk/userguide/src/docbkx/userguide.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/userguide/src/docbkx/userguide.xml?rev=1454848&r1=1454847&r2=1454848&view=diff
==============================================================================
--- webservices/axiom/trunk/userguide/src/docbkx/userguide.xml (original)
+++ webservices/axiom/trunk/userguide/src/docbkx/userguide.xml Sun Mar 10 13:34:16 2013
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML 5.0//EN" "http://docbook.org/xml/5.0/dtd/docbook.dtd">
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one
   ~ or more contributor license agreements. See the NOTICE file