#682 - Prepare 2.2 M1 (Moore).

This commit is contained in:
Christoph Strobl
2018-12-11 10:53:11 +01:00
parent 93ba2246e4
commit a84294b8eb
2 changed files with 28 additions and 33 deletions

View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<!--
@@ -115,7 +114,7 @@
<webbeans>2.0.8</webbeans>
<javax-annotation-api>1.3</javax-annotation-api>
<releasetrain>Moore-BUILD-SNAPSHOT</releasetrain>
<releasetrain>Moore-M1</releasetrain>
<!-- To be overridden by individual modules -->
<java-module-name/>
@@ -263,7 +262,7 @@
<dependency>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-build-resources</artifactId>
<version>2.2.0.BUILD-SNAPSHOT</version>
<version>2.2.0.M1</version>
<type>zip</type>
<optional>true</optional>
</dependency>
@@ -415,8 +414,7 @@
<copy failonerror="false" todir="${generated-asciidoc-sources.directory}/">
<fileset dir="${project.root}/src/main/asciidoc" includes="**/*.adoc"/>
</copy>
<copy failonerror="false"
todir="${generated-asciidoc-sources.directory}/images/">
<copy failonerror="false" todir="${generated-asciidoc-sources.directory}/images/">
<fileset dir="${project.root}/src/main/asciidoc/images"/>
</copy>
@@ -440,8 +438,7 @@
<target>
<!-- Copy files for the single-file HTML version -->
<copy failonerror="false"
todir="${project.root}/target/site/reference/html/images">
<copy failonerror="false" todir="${project.root}/target/site/reference/html/images">
<fileset dir="${generated-docs.directory}/images"/>
</copy>
@@ -461,16 +458,14 @@
</copy>
<copy failonerror="false" todir="${project.root}/target/site/reference/html/">
<fileset dir="${generated-docs.directory}" includes="*.html" />
<fileset dir="${generated-docs.directory}" includes="*.html"/>
</copy>
<!-- Copy and rename the Epub file -->
<copy failonerror="false" file="${generated-docs.directory}/index.pdf"
tofile="${project.root}/target/site/reference/pdf/${dist.id}-reference.pdf"/>
<copy failonerror="false" file="${generated-docs.directory}/index.pdf" tofile="${project.root}/target/site/reference/pdf/${dist.id}-reference.pdf"/>
<!-- Copy and rename the PDF file -->
<copy failonerror="false" file="${generated-docs.directory}/index.epub"
tofile="${project.root}/target/site/reference/epub/${dist.id}-reference.epub"/>
<copy failonerror="false" file="${generated-docs.directory}/index.epub" tofile="${project.root}/target/site/reference/epub/${dist.id}-reference.epub"/>
</target>
</configuration>