Skip to content

Commit 6ac1270

Browse files
Rick Larsenlessarderic
Rick Larsen
authored andcommitted
DDF-1910: Corrected javadoc configuration. (codice#698)
1 parent a1fd5d4 commit 6ac1270

File tree

3 files changed

+62
-1
lines changed

3 files changed

+62
-1
lines changed

distribution/docs/pom.xml

+7
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,13 @@
394394
</execution>
395395
</executions>
396396
</plugin>
397+
<plugin>
398+
<groupId>org.jacoco</groupId>
399+
<artifactId>jacoco-maven-plugin</artifactId>
400+
<configuration>
401+
<skip>true</skip>
402+
</configuration>
403+
</plugin>
397404
</plugins>
398405
</build>
399406
</profile>

javadoc-descriptor.xml

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright (c) Codice Foundation
5+
*
6+
* This is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either
7+
* version 3 of the License, or any later version.
8+
*
9+
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
10+
* See the GNU Lesser General Public License for more details. A copy of the GNU Lesser General Public License is distributed along with this program and can be found at
11+
* <http://www.gnu.org/licenses/lgpl.html>.
12+
*
13+
**/
14+
-->
15+
<assembly
16+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
17+
xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
18+
xsi:schemaLocation="
19+
http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2
20+
http://maven.apache.org/xsd/assembly-1.1.2.xsd">
21+
<id>javadoc-aggregate</id>
22+
<formats>
23+
<format>zip</format>
24+
</formats>
25+
<fileSets>
26+
<fileSet>
27+
<fileMode>0644</fileMode>
28+
<directoryMode>0755</directoryMode>
29+
<directory>${project.build.directory}/site/project-info/api</directory>
30+
<includes>
31+
<include>**</include>
32+
</includes>
33+
<outputDirectory>api</outputDirectory>
34+
</fileSet>
35+
</fileSets>
36+
</assembly>

pom.xml

+19-1
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,7 @@
426426
<additionalparam>
427427
-Xdoclint:none
428428
</additionalparam>
429+
<outputDirectory>${project.build.directory}</outputDirectory>
429430
</configuration>
430431
</plugin>
431432
<plugin>
@@ -683,7 +684,9 @@
683684
<profile>
684685
<id>javadoc</id>
685686
<activation>
686-
<activeByDefault>false</activeByDefault>
687+
<file>
688+
<exists>javadoc-descriptor.xml</exists>
689+
</file>
687690
</activation>
688691
<build>
689692
<plugins>
@@ -709,6 +712,21 @@
709712
</execution>
710713
</executions>
711714
</plugin>
715+
<plugin>
716+
<artifactId>maven-assembly-plugin</artifactId>
717+
<executions>
718+
<execution>
719+
<configuration>
720+
<descriptor>javadoc-descriptor.xml</descriptor>
721+
</configuration>
722+
<id>package-javadoc</id>
723+
<phase>site</phase>
724+
<goals>
725+
<goal>single</goal>
726+
</goals>
727+
</execution>
728+
</executions>
729+
</plugin>
712730
</plugins>
713731
</build>
714732
<reporting>

0 commit comments

Comments
 (0)