Skip to content

Commit

Permalink
Merge pull request #81 from hboutemy/reporting
Browse files Browse the repository at this point in the history 
updated reporting configuration
  • Loading branch information
@gnodet
gnodet committed Apr 28, 2017
2 parents c6830ac + 1eb47a7 commit 708591c
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 117 deletions.
2 changes: 1 addition & 1 deletion jansi-website/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<parent>
<groupId>org.fusesource.jansi</groupId>
<artifactId>jansi-project</artifactId>
<version>1.15</version>
<version>1.16-SNAPSHOT</version>
</parent>

<artifactId>jansi-website</artifactId>
Expand Down
4 changes: 0 additions & 4 deletions jansi-website/src/community/site.page
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,6 @@ How the website works
.right
:markdown

# The site is automatically deployed by the CI builds, so you can
# simply wait for the changes to be automatically pushed to the project
# site.

The site is deployed through GitHub gh-pages branch: you can deploy the site using Maven:

mvn install
Expand Down
162 changes: 50 additions & 112 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
<scala-version>2.9.0-1</scala-version>
</properties>

<url>http://${forge-project-id}.fusesource.org</url>
<url>http://fusesource.github.io/${forge-project-id}</url>
<inceptionYear>2009</inceptionYear>

<issueManagement>
Expand Down Expand Up @@ -141,8 +141,8 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>3.6.1</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
<source>1.6</source><!-- parent pom 1.11 forces version instead of using maven.compiler.source property -->
<target>1.6</target><!-- parent pom 1.11 forces version instead of using maven.compiler.target property -->
</configuration>
</plugin>
<plugin>
Expand All @@ -155,10 +155,15 @@
<links>
<link>http://download.oracle.com/javase/6/docs/api</link>
</links>
<encoding>UTF-8</encoding>
<locale>en_US</locale>
<linksource>true</linksource>
<excludePackageNames>*.internal</excludePackageNames>
<notimestamp>true</notimestamp>
<quiet>true</quiet>
<docencoding>UTF-8</docencoding>
<version>false</version>
<author>true</author>
<keywords>true</keywords>
</configuration>
</plugin>
<plugin>
Expand Down Expand Up @@ -187,104 +192,57 @@
</goals>
</execution>
</executions>
<configuration>
<reportPlugins>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.4</version>
<configuration>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
<!-- simpler configuration without reportSets available for usual cases -->
<reports>
<report>index</report>
<report>dependencies</report>
<report>issue-tracking</report>
<report>license</report>
<report>mailing-list</report>
<report>modules</report>
<report>project-team</report>
<report>plugin-management</report>
<report>plugins</report>
<report>scm</report>
</reports>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<charset>UTF-8</charset>
<docencoding>UTF-8</docencoding>
<version>false</version>
<author>true</author>
<keywords>true</keywords>

<stylesheetfile>${project.build.directory}/javadoc-skin/stylesheet.css</stylesheetfile>
<!--
<resourcesArtifacts>
<resourcesArtifact>
<groupId>org.fusesource.mvnplugins</groupId>
<artifactId>fuse-javadoc-skin</artifactId>
<version>1.9</version>
</resourcesArtifact>
</resourcesArtifacts>
-->
</configuration>
</plugin>
</plugins>
</build>

</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>2.3</version>
<configuration>
<stylesheet>fuse-jxr-skin-stylesheet.css</stylesheet>
<inputEncoding>UTF-8</inputEncoding>
<outputEncoding>UTF-8</outputEncoding>
<linkJavadoc>true</linkJavadoc>
<docTitle>${project.name} Source Xref (${project.version})</docTitle>
<windowTitle>${project.name} Source Xref (${project.version})</windowTitle>
</configuration>
</plugin>

</reportPlugins>
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-project-info-reports-plugin</artifactId>
<version>2.4</version>
<configuration>
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
</configuration>
<reportSets>
<reportSet>
<reports>
<report>index</report>
<report>dependencies</report>
<report>issue-tracking</report>
<report>license</report>
<report>mailing-list</report>
<report>modules</report>
<report>project-team</report>
<report>plugin-management</report>
<report>plugins</report>
<report>scm</report>
</reports>
</reportSet>
</reportSets>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jxr-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>unpack</id>
<phase>generate-sources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.fusesource.mvnplugins</groupId>
<artifactId>fuse-javadoc-skin</artifactId>
<version>1.9</version>
<type>jar</type>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}/javadoc-skin</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
<configuration>
<linkJavadoc>true</linkJavadoc>
<docTitle>${project.name} Source Xref (${project.version})</docTitle>
<windowTitle>${project.name} Source Xref (${project.version})</windowTitle>
</configuration>
</plugin>
</plugins>
</build>
</reporting>

<profiles>

<!-- enables extra repositories which may have some
goodies that have not reached central yet -->
<!-- enables extra repositories which may have some goodies that have not reached central yet -->
<profile>
<id>download</id>
<repositories>
Expand Down Expand Up @@ -318,27 +276,7 @@
</goals>
</execution>
</executions>

<configuration>
<charset>UTF-8</charset>
<docencoding>UTF-8</docencoding>
<version>false</version>
<author>true</author>
<keywords>true</keywords>

<stylesheetfile>${project.build.directory}/javadoc-skin/stylesheet.css</stylesheetfile>
<!--
<resourcesArtifacts>
<resourcesArtifact>
<groupId>org.fusesource.mvnplugins</groupId>
<artifactId>fuse-javadoc-skin</artifactId>
<version>1.9</version>
</resourcesArtifact>
</resourcesArtifacts>
-->
</configuration>
</plugin>

</plugins>
</build>
</profile>
Expand Down

0 comments on commit 708591c

Please sign in to comment.