From 99e3f2e8137ac510135516c2111c0004f3814ddd Mon Sep 17 00:00:00 2001
From: Jesse McConnell <jesse.mcconnell@gmail.com>
Date: Mon, 22 Jul 2019 10:16:51 -0500
Subject: [PATCH] Issue #3897 remove docbook resources, update l&f and adjust
 assembly descriptor

---
 jetty-documentation/pom.xml                    | 9 +++++----
 jetty-documentation/src/main/assembly/html.xml | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/jetty-documentation/pom.xml b/jetty-documentation/pom.xml
index 1a5f77c9f63..e9ee7788e85 100644
--- a/jetty-documentation/pom.xml
+++ b/jetty-documentation/pom.xml
@@ -19,7 +19,7 @@
     <asciidoctorj.epub.version>1.5.0-alpha.8.1</asciidoctorj.epub.version>
     <asciidoctorj.version>1.5.8.1</asciidoctorj.version>
     <jruby.version>1.7.27</jruby.version>
-    <web.resources.version>1.0-SNAPSHOT</web.resources.version>
+    <web.resources.version>1.0</web.resources.version>
     <web.resources.directory>${project.build.directory}/web-resources</web.resources.directory>
     <!-- old properties -->
     <html.directory>${project.build.directory}/current</html.directory>
@@ -146,7 +146,7 @@
             </goals>
             <configuration>
               <backend>html5</backend>
-              <!--<templateDir>${web.resources.directory}/asciidoc/template</templateDir>-->
+              <templateDir>${web.resources.directory}/asciidoc/slim-template</templateDir>
               <sourceDirectory>${basedir}/src/main/asciidoc/quick-start</sourceDirectory>
               <sourceDocumentName>index.adoc</sourceDocumentName>
               <outputDirectory>${project.build.directory}/html/quickstart-guide</outputDirectory>
@@ -160,7 +160,7 @@
             </goals>
             <configuration>
               <backend>html5</backend>
-              <!--<<templateDir>${web.resources.directory}/asciidoc/template</templateDir>-->
+              <templateDir>${web.resources.directory}/asciidoc/slim-template</templateDir>
               <sourceDirectory>${basedir}/src/main/asciidoc/distribution-guide</sourceDirectory>
               <sourceDocumentName>index.adoc</sourceDocumentName>
               <outputDirectory>${project.build.directory}/html/distribution-guide</outputDirectory>
@@ -174,7 +174,7 @@
             </goals>
             <configuration>
               <backend>html5</backend>
-              <!--<<templateDir>${web.resources.directory}/asciidoc/template</templateDir>-->
+              <templateDir>${web.resources.directory}/asciidoc/slim-template</templateDir>
               <sourceDirectory>${basedir}/src/main/asciidoc/contribution-guide</sourceDirectory>
               <sourceDocumentName>index.adoc</sourceDocumentName>
               <outputDirectory>${project.build.directory}/html/contribution-guide</outputDirectory>
@@ -188,6 +188,7 @@
             </goals>
             <configuration>
               <backend>html5</backend>
+              <templateDir>${web.resources.directory}/asciidoc/slim-template</templateDir>
               <sourceDirectory>${basedir}/src/main/asciidoc/developer-guide</sourceDirectory>
               <sourceDocumentName>index.adoc</sourceDocumentName>
               <outputDirectory>${project.build.directory}/html/developer-guide</outputDirectory>
diff --git a/jetty-documentation/src/main/assembly/html.xml b/jetty-documentation/src/main/assembly/html.xml
index 6c0dcf7c8b4..aa7f4cb9dec 100644
--- a/jetty-documentation/src/main/assembly/html.xml
+++ b/jetty-documentation/src/main/assembly/html.xml
@@ -7,7 +7,7 @@
   <baseDirectory>${project.version}</baseDirectory>
   <fileSets>
     <fileSet>
-      <directory>${project.basedir}/target/docbkx/html</directory>
+      <directory>${project.basedir}/target/html</directory>
       <outputDirectory></outputDirectory>
       <includes>
         <include>**</include>