Skip to content

Commit

Permalink
Merge pull request reficio#186 from bmarwell/fix-warnings-and-site
Browse files Browse the repository at this point in the history 
[reficio#179] remove warnings by using the reporting section for the site pl…
  • Loading branch information
@sparsick
sparsick authored Feb 17, 2021
2 parents 61e73dc + 6c6dba8 commit 8b135e0
Show file tree
Hide file tree
Showing 2 changed files with 78 additions and 57 deletions.
129 changes: 73 additions & 56 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@

<clover.version>3.3.0</clover.version>
<clover.license>/private/reficio/clover.license</clover.license>
<plugin.maven.javadoc.version>3.2.0</plugin.maven.javadoc.version>
</properties>

<licenses>
Expand Down Expand Up @@ -288,6 +289,11 @@
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.22.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.9.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
Expand Down Expand Up @@ -411,7 +417,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<version>${plugin.maven.javadoc.version}</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand Down Expand Up @@ -440,61 +446,7 @@
</dependency>
</dependencies>
<configuration>
<reportPlugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.2</version>
<configuration>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
<reports>
<report>index</report>
<report>project-team</report>
<report>help</report>
<report>cim</report>
<report>issue-tracking</report>
<report>license</report>
<report>scm</report>
<report>summary</report>
</reports>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.8.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.2</version>
<configuration>
<linkJavadoc>true</linkJavadoc>
<aggregate>true</aggregate>
</configuration>
<reportSets>
<reportSet>
<reports>
<report>jxr</report>
<report>test-jxr</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
<configuration>
<generateHtml>true</generateHtml>
<generateXml>true</generateXml>
<excludes>
<exclude>**/Logger.java</exclude>
</excludes>
<licenseLocation>${clover.license}</licenseLocation>
</configuration>
</plugin>
</reportPlugins>

</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -740,4 +692,69 @@
</repository>
</distributionManagement>

<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>3.1.1</version>
<configuration>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
<reportSets>
<reportSet>
<reports>
<report>index</report>
<report>team</report>
<report>ci-management</report>
<report>issue-management</report>
<report>licenses</report>
<report>scm</report>
<report>summary</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>${plugin.maven.javadoc.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>3.0.0</version>
<configuration>
<linkJavadoc>true</linkJavadoc>
<aggregate>true</aggregate>
</configuration>
<reportSets>
<reportSet>
<reports>
<report>jxr</report>
<report>test-jxr</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
<configuration>
<generateHtml>true</generateHtml>
<generateXml>true</generateXml>
<excludes>
<exclude>**/Logger.java</exclude>
</excludes>
<licenseLocation>${clover.license}</licenseLocation>
</configuration>
</plugin>
</plugins>
</reporting>

</project>
6 changes: 5 additions & 1 deletion src/site/site.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,17 @@
<project xmlns="http://maven.apache.org/DECORATION/1.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
<!--
<skin>
<groupId>org.reficio</groupId>
<artifactId>maven-skin</artifactId>
<version>1.0.0</version>
</skin>
-->

<body>
<head>
<![CDATA[
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.5/jquery.min.js">
</script>
Expand Down Expand Up @@ -110,6 +113,7 @@
})();
</script>
]]>
</head>

<menu name="Overview">
Expand All @@ -118,7 +122,7 @@
<item name="FAQ" href="faq.html"/>
</item>
</menu>
$reports
<menu ref="reports"/>
</body>

</project>

0 comments on commit 8b135e0

Please sign in to comment.