some previous maven schema artifacts were wrong, now using a single artifact for...

diff --git a/maven/docbook-xml/assembly-dtd.xml b/maven/docbook-xml/assembly-dtd.xml
deleted file mode 100644 (file)
index 66239c8..0000000
--- a/maven/docbook-xml/assembly-dtd.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<assembly>\r
-  <id>dtd-resources</id>\r
-  <formats>\r
-    <format>zip</format>\r
-  </formats>\r
-  <includeBaseDirectory>false</includeBaseDirectory>\r
-  <fileSets>\r
-    <fileSet>\r
-      <directory>${project.basedir}/target/xmltmp/${docbook.xml.release}/dtd</directory>\r
-      <outputDirectory>xsd</outputDirectory>\r
-    </fileSet>\r
-    <fileSet>\r
-      <directory>${project.basedir}/target/xmltmp/${docbook.xml.release}</directory>\r
-      <includes>\r
-        <include>catalog.xml</include>\r
-      </includes>\r
-      <outputDirectory></outputDirectory>\r
-    </fileSet>\r
-  </fileSets>\r
-</assembly>\r

diff --git a/maven/docbook-xml/assembly-rng.xml b/maven/docbook-xml/assembly-rng.xml
deleted file mode 100644 (file)
index 53034ca..0000000
--- a/maven/docbook-xml/assembly-rng.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<assembly>\r
-  <id>rng-resources</id>\r
-  <formats>\r
-    <format>zip</format>\r
-  </formats>\r
-  <includeBaseDirectory>false</includeBaseDirectory>\r
-  <fileSets>\r
-    <fileSet>\r
-      <directory>${project.basedir}/target/xmltmp/${docbook.xml.release}/rng</directory>\r
-      <outputDirectory>xsd</outputDirectory>\r
-    </fileSet>\r
-    <fileSet>\r
-      <directory>${project.basedir}/target/xmltmp/${docbook.xml.release}</directory>\r
-      <includes>\r
-        <include>catalog.xml</include>\r
-      </includes>\r
-      <outputDirectory></outputDirectory>\r
-    </fileSet>\r
-  </fileSets>\r
-</assembly>\r

diff --git a/maven/docbook-xml/assembly-sch.xml b/maven/docbook-xml/assembly-sch.xml
deleted file mode 100644 (file)
index b76bd88..0000000
--- a/maven/docbook-xml/assembly-sch.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<assembly>\r
-  <id>sch-resources</id>\r
-  <formats>\r
-    <format>zip</format>\r
-  </formats>\r
-  <includeBaseDirectory>false</includeBaseDirectory>\r
-  <fileSets>\r
-    <fileSet>\r
-      <directory>${project.basedir}/target/xmltmp/${docbook.xml.release}/sch</directory>\r
-      <outputDirectory>sch</outputDirectory>\r
-    </fileSet>\r
-    <fileSet>\r
-      <directory>${project.basedir}/target/xmltmp/${docbook.xml.release}</directory>\r
-      <includes>\r
-        <include>catalog.xml</include>\r
-      </includes>\r
-      <outputDirectory></outputDirectory>\r
-    </fileSet>\r
-  </fileSets>\r
-</assembly>\r

diff --git a/maven/docbook-xml/assembly-xsd.xml b/maven/docbook-xml/assembly-xsd.xml
deleted file mode 100644 (file)
index c0aedf7..0000000
--- a/maven/docbook-xml/assembly-xsd.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<assembly>\r
-  <id>xsd-resources</id>\r
-  <formats>\r
-    <format>zip</format>\r
-  </formats>\r
-  <includeBaseDirectory>false</includeBaseDirectory>\r
-  <fileSets>\r
-    <fileSet>\r
-      <directory>${project.basedir}/target/xmltmp/${docbook.xml.release}/xsd</directory>\r
-      <outputDirectory>xsd</outputDirectory>\r
-    </fileSet>\r
-    <fileSet>\r
-      <directory>${project.basedir}/target/xmltmp/${docbook.xml.release}</directory>\r
-      <includes>\r
-        <include>catalog.xml</include>\r
-      </includes>\r
-      <outputDirectory></outputDirectory>\r
-    </fileSet>\r
-  </fileSets>\r
-</assembly>\r

diff --git a/maven/docbook-xml/pom.xml b/maven/docbook-xml/pom.xml
index 435d3617afcc6b1a229994c4f2ef7f091f768473..85cb158a5fccc6e88daa087f0864db621ab4aad2 100644 (file)
--- a/maven/docbook-xml/pom.xml
+++ b/maven/docbook-xml/pom.xml
@@ -5,7 +5,7 @@
   <artifactId>docbook-xml</artifactId>
   <name>DocBook XML</name>
   <packaging>pom</packaging>
-  <version>5.0</version>
+  <version>5.0-all</version>
   <description>Docbook XML</description>
   <url>http://www.docbook.org/</url>
 
@@ -38,7 +38,6 @@
                   <patternset>
                     <include name="${docbook.xml.release}/**"/>
                     <exclude name="${docbook.xml.release}/docs/"/>
-                    <exclude name="${docbook.xml.release}/tools/"/>
                   </patternset>
                 </unzip>
               </tasks>
@@ -54,53 +53,14 @@
 
         <executions>
           <execution>
-            <id>make docbook-xml schema resources</id>
+            <id>make docbook schemas resources</id>
             <goals>
               <goal>single</goal>
             </goals>
             <phase>package</phase>
             <configuration>
               <descriptors>
-                <descriptor>${project.basedir}/assembly-sch.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-
-          <execution>
-            <id>make docbook-xml xsd resources</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <descriptors>
-                <descriptor>${project.basedir}/assembly-xsd.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-
-          <execution>
-            <id>make docbook-xml dtd resources</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <descriptors>
-                <descriptor>${project.basedir}/assembly-dtd.xml</descriptor>
-              </descriptors>
-            </configuration>
-          </execution>
-
-          <execution>
-            <id>make docbook-xml rng resources</id>
-            <goals>
-              <goal>single</goal>
-            </goals>
-            <phase>package</phase>
-            <configuration>
-              <descriptors>
-                <descriptor>${project.basedir}/assembly-rng.xml</descriptor>
+                <descriptor>${project.basedir}/assembly-all.xml</descriptor>
               </descriptors>
             </configuration>
           </execution>