Skip to content

Commit 4f5f423

Browse files
marko-bekhtamarko-bekhta
committed
HV-2070 Use maven-assembly-plugin instead of copy-maven-plugin to rename the pdf documents
1 parent 252c474 commit 4f5f423

File tree

4 files changed

+75
-38
lines changed

4 files changed

+75
-38
lines changed

‎distribution/src/main/assembly/dist.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<outputDirectory>docs/api</outputDirectory>
125125
</fileSet>
126126
<fileSet>
127-
<directory>../documentation/target/asciidoctor</directory>
127+
<directory>../documentation/target/dist</directory>
128128
<outputDirectory>docs/reference</outputDirectory>
129129
</fileSet>
130130

‎documentation/pom.xml‎

Lines changed: 31 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -295,13 +295,44 @@
295295
</attributes>
296296
</configuration>
297297
</plugin>
298+
<plugin>
299+
<groupId>org.apache.maven.plugins</groupId>
300+
<artifactId>maven-assembly-plugin</artifactId>
301+
<configuration>
302+
<descriptors>
303+
<descriptor>${basedir}/src/main/assembly/dist.xml</descriptor>
304+
</descriptors>
305+
<attach>false</attach>
306+
<finalName>dist</finalName>
307+
<appendAssemblyId>false</appendAssemblyId>
308+
</configuration>
309+
<executions>
310+
<execution>
311+
<id>make-dist</id>
312+
<phase>prepare-package</phase>
313+
<goals>
314+
<goal>single</goal>
315+
</goals>
316+
</execution>
317+
</executions>
318+
</plugin>
298319
</plugins>
299320
</build>
300321
<profiles>
301322
<profile>
302323
<id>documentation-pdf</id>
303324
<build>
304325
<plugins>
326+
<plugin>
327+
<groupId>org.apache.maven.plugins</groupId>
328+
<artifactId>maven-assembly-plugin</artifactId>
329+
<configuration combine.children="append">
330+
<descriptors>
331+
<descriptor>${basedir}/src/main/assembly/dist.xml</descriptor>
332+
<descriptor>${basedir}/src/main/assembly/pdf.xml</descriptor>
333+
</descriptors>
334+
</configuration>
335+
</plugin>
305336
<plugin>
306337
<groupId>org.asciidoctor</groupId>
307338
<artifactId>asciidoctor-maven-plugin</artifactId>
@@ -329,43 +360,6 @@
329360
</execution>
330361
</executions>
331362
</plugin>
332-
<plugin>
333-
<groupId>ch.mfrey.maven.plugin</groupId>
334-
<artifactId>copy-maven-plugin</artifactId>
335-
<executions>
336-
<execution>
337-
<id>copy</id>
338-
<phase>install</phase>
339-
<goals>
340-
<goal>copy</goal>
341-
</goals>
342-
<configuration>
343-
<resources>
344-
<resource>
345-
<directory>${asciidoctor.base-output-dir}/pdf</directory>
346-
<move>true</move>
347-
<includes>
348-
<include>index.pdf</include>
349-
</includes>
350-
<paths>
351-
<path>
352-
<from>index.pdf</from>
353-
<to>hibernate_validator_reference.pdf</to>
354-
</path>
355-
</paths>
356-
</resource>
357-
</resources>
358-
</configuration>
359-
</execution>
360-
</executions>
361-
<dependencies>
362-
<dependency>
363-
<groupId>org.codehaus.plexus</groupId>
364-
<artifactId>plexus-utils</artifactId>
365-
<version>4.0.2</version>
366-
</dependency>
367-
</dependencies>
368-
</plugin>
369363
</plugins>
370364
</build>
371365
</profile>

‎documentation/src/main/assembly/dist.xml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<!--
3+
SPDX-License-Identifier: Apache-2.0
4+
Copyright Red Hat Inc. and Hibernate Authors
5+
-->
6+
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7+
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
8+
<id>dist</id>
9+
<formats>
10+
<format>dir</format>
11+
</formats>
12+
<includeBaseDirectory>false</includeBaseDirectory>
13+
14+
<fileSets>
15+
<!-- Reference documentation -->
16+
<fileSet>
17+
<directory>${asciidoctor.base-output-dir}/html_single/</directory>
18+
<outputDirectory>en-US/html_single/</outputDirectory>
19+
</fileSet>
20+
</fileSets>
21+
</assembly>

‎documentation/src/main/assembly/pdf.xml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version='1.0' encoding='UTF-8'?>
2+
<!--
3+
SPDX-License-Identifier: Apache-2.0
4+
Copyright Red Hat Inc. and Hibernate Authors
5+
-->
6+
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
7+
xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.1.0 http://maven.apache.org/xsd/assembly-2.1.0.xsd">
8+
<id>pdf</id>
9+
<formats>
10+
<format>dir</format>
11+
</formats>
12+
<includeBaseDirectory>false</includeBaseDirectory>
13+
14+
<!-- PDFs: -->
15+
<files>
16+
<file>
17+
<source>${asciidoctor.base-output-dir}/pdf/index.pdf</source>
18+
<outputDirectory>en-US/pdf/</outputDirectory>
19+
<destName>hibernate_validator_reference.pdf</destName>
20+
</file>
21+
</files>
22+
</assembly>

0 commit comments

Comments
 (0)