Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue #3897 remove docbook resources, update l&f and adjust assembly descriptor

This commit is contained in:
Jesse McConnell 2019-07-22 10:16:51 -05:00
parent 7a8e29856d
commit 99e3f2e813
No known key found for this signature in database
GPG Key ID: 61C3351A438A3B7D
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jetty-documentation/pom.xml
View File

@ -19,7 +19,7 @@
<asciidoctorj.epub.version>1.5.0-alpha.8.1</asciidoctorj.epub.version> <asciidoctorj.epub.version>1.5.0-alpha.8.1</asciidoctorj.epub.version>
<asciidoctorj.version>1.5.8.1</asciidoctorj.version> <asciidoctorj.version>1.5.8.1</asciidoctorj.version>
<jruby.version>1.7.27</jruby.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> <web.resources.directory>${project.build.directory}/web-resources</web.resources.directory>
<!-- old properties --> <!-- old properties -->
<html.directory>${project.build.directory}/current</html.directory> <html.directory>${project.build.directory}/current</html.directory>
@ -146,7 +146,7 @@
</goals> </goals>
<configuration> <configuration>
<backend>html5</backend> <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> <sourceDirectory>${basedir}/src/main/asciidoc/quick-start</sourceDirectory>
<sourceDocumentName>index.adoc</sourceDocumentName> <sourceDocumentName>index.adoc</sourceDocumentName>
<outputDirectory>${project.build.directory}/html/quickstart-guide</outputDirectory> <outputDirectory>${project.build.directory}/html/quickstart-guide</outputDirectory>
@ -160,7 +160,7 @@
</goals> </goals>
<configuration> <configuration>
<backend>html5</backend> <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> <sourceDirectory>${basedir}/src/main/asciidoc/distribution-guide</sourceDirectory>
<sourceDocumentName>index.adoc</sourceDocumentName> <sourceDocumentName>index.adoc</sourceDocumentName>
<outputDirectory>${project.build.directory}/html/distribution-guide</outputDirectory> <outputDirectory>${project.build.directory}/html/distribution-guide</outputDirectory>
@ -174,7 +174,7 @@
</goals> </goals>
<configuration> <configuration>
<backend>html5</backend> <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> <sourceDirectory>${basedir}/src/main/asciidoc/contribution-guide</sourceDirectory>
<sourceDocumentName>index.adoc</sourceDocumentName> <sourceDocumentName>index.adoc</sourceDocumentName>
<outputDirectory>${project.build.directory}/html/contribution-guide</outputDirectory> <outputDirectory>${project.build.directory}/html/contribution-guide</outputDirectory>
@ -188,6 +188,7 @@
</goals> </goals>
<configuration> <configuration>
<backend>html5</backend> <backend>html5</backend>
<templateDir>${web.resources.directory}/asciidoc/slim-template</templateDir>
<sourceDirectory>${basedir}/src/main/asciidoc/developer-guide</sourceDirectory> <sourceDirectory>${basedir}/src/main/asciidoc/developer-guide</sourceDirectory>
<sourceDocumentName>index.adoc</sourceDocumentName> <sourceDocumentName>index.adoc</sourceDocumentName>
<outputDirectory>${project.build.directory}/html/developer-guide</outputDirectory> <outputDirectory>${project.build.directory}/html/developer-guide</outputDirectory>

2
jetty-documentation/src/main/assembly/html.xml
View File

@ -7,7 +7,7 @@
<baseDirectory>${project.version}</baseDirectory> <baseDirectory>${project.version}</baseDirectory>
<fileSets> <fileSets>
<fileSet> <fileSet>
<directory>${project.basedir}/target/docbkx/html</directory> <directory>${project.basedir}/target/html</directory>
<outputDirectory></outputDirectory> <outputDirectory></outputDirectory>
<includes> <includes>
<include>**</include> <include>**</include>