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

Merge branch 'jetty-9.3.x' into jetty-9.4.x

This commit is contained in:
Jesse McConnell 2016-09-02 10:57:30 -05:00
parent 83c3d6725d 96bde3263a
commit ecbac9ea55
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jetty-documentation/pom.xml
View File

@ -85,7 +85,7 @@
<htmlCustomization>${project.basedir}/src/main/docbkx-stylesheet/html/docbook.xsl</htmlCustomization>
<preProcess>
<!-- pull over the images from the source material -->
<copy todir="target/docbkx/html/index/images" flatten="true">
<copy todir="target/docbkx/html/images" flatten="true">
<fileset dir="src/main/asciidoc">
<include name="**/*.png" />
<include name="**/*.jpg" />
@ -93,16 +93,16 @@
<include name="**/*.dot" />
</fileset>
</copy>
<copy todir="target/docbkx/html/index/images">
<copy todir="target/docbkx/html/images">
<fileset dir="src/main/docbkx-resources/images" />
</copy>
<copy todir="target/docbkx/html/index/css">
<copy todir="target/docbkx/html/css">
<fileset dir="src/main/docbkx-resources/css" />
</copy>
<copy todir="target/docbkx/html/index/fonts">
<copy todir="target/docbkx/html/fonts">
<fileset dir="src/main/docbkx-resources/fonts" />
</copy>
<copy todir="target/docbkx/html/index/js">
<copy todir="target/docbkx/html/js">
<fileset dir="src/main/docbkx-resources/js" />
</copy>
</preProcess>

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

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