This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch support-2-3 in repository https://gitbox.apache.org/repos/asf/struts.git
The following commit(s) were added to refs/heads/support-2-3 by this push: new a89b7c1 Uses the new docs site to build assembly a89b7c1 is described below commit a89b7c11afba247f31f905b84e87aed1120f34ad Author: Lukasz Lenart <lukaszlen...@apache.org> AuthorDate: Thu Jul 12 09:29:25 2018 +0200 Uses the new docs site to build assembly --- assembly/pom.xml | 20 ++++++++------------ assembly/src/main/assembly/docs.xml | 2 +- assembly/src/main/resources/docs-urls.txt | 6 ++++++ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/assembly/pom.xml b/assembly/pom.xml index fd136b7..261d7fb 100644 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -82,33 +82,29 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <id>cwiki-docs</id> + <id>docs</id> <phase>prepare-package</phase> <goals> <goal>run</goal> </goals> <configuration> - <tasks> - <mkdir dir="${project.build.directory}/cwiki/" /> + <target> + <mkdir dir="${project.build.directory}/docs/" /> <exec executable="wget"> <arg value="-erobots=off" /> <arg value="-nH" /> - <arg value="--cut-dirs=3" /> + <arg value="-x" /> <arg value="-nv" /> <arg value="-E" /> <arg value="-L" /> - <arg value="-l 0" /> <arg value="-np" /> - <arg value="--directory-prefix=${project.build.directory}/cwiki" /> + <arg value="--directory-prefix=${project.build.directory}/docs" /> <arg value="--no-check-certificate" /> <arg value="-r" /> - <arg value="http://struts.apache.org/docs/" /> + <arg value="-i" /> + <arg value="src/main/resources/docs-urls.txt" /> </exec> - <delete> - <fileset dir="${project.build.directory}/cwiki/" includes="**/index.*" /> - </delete> - <copy file="${project.build.directory}/cwiki/home.html" tofile="${project.build.directory}/cwiki/index.html" /> - </tasks> + </target> </configuration> </execution> </executions> diff --git a/assembly/src/main/assembly/docs.xml b/assembly/src/main/assembly/docs.xml index cb025e5..60b3c94 100644 --- a/assembly/src/main/assembly/docs.xml +++ b/assembly/src/main/assembly/docs.xml @@ -49,7 +49,7 @@ <!-- Include the Confluence docs in the assembly --> <fileSet> - <directory>target/cwiki</directory> + <directory>target/docs</directory> <outputDirectory>docs/docs</outputDirectory> </fileSet> diff --git a/assembly/src/main/resources/docs-urls.txt b/assembly/src/main/resources/docs-urls.txt new file mode 100644 index 0000000..845dab8 --- /dev/null +++ b/assembly/src/main/resources/docs-urls.txt @@ -0,0 +1,6 @@ +http://struts.apache.org/getting-started/ +http://struts.apache.org/security/ +http://struts.apache.org/core-developers/ +http://struts.apache.org/tag-developers/ +http://struts.apache.org/maven-archetypes/ +http://struts.apache.org/plugins/