Skip to content

Commit 1eb47a7

Browse files
hboutemyhboutemy
committed
updated reporting configuration
1 parent c6830ac commit 1eb47a7

File tree

3 files changed

+51
-117
lines changed

3 files changed

+51
-117
lines changed

‎jansi-website/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<parent>
2222
<groupId>org.fusesource.jansi</groupId>
2323
<artifactId>jansi-project</artifactId>
24-
<version>1.15</version>
24+
<version>1.16-SNAPSHOT</version>
2525
</parent>
2626

2727
<artifactId>jansi-website</artifactId>

‎jansi-website/src/community/site.page

-4
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ How the website works
6262
.right
6363
:markdown
6464

65-
# The site is automatically deployed by the CI builds, so you can
66-
# simply wait for the changes to be automatically pushed to the project
67-
# site.
68-
6965
The site is deployed through GitHub gh-pages branch: you can deploy the site using Maven:
7066

7167
mvn install

‎pom.xml

+50-112
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<scala-version>2.9.0-1</scala-version>
4646
</properties>
4747

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

5151
<issueManagement>
@@ -141,8 +141,8 @@
141141
<artifactId>maven-compiler-plugin</artifactId>
142142
<version>3.6.1</version>
143143
<configuration>
144-
<source>1.6</source>
145-
<target>1.6</target>
144+
<source>1.6</source><!-- parent pom 1.11 forces version instead of using maven.compiler.source property -->
145+
<target>1.6</target><!-- parent pom 1.11 forces version instead of using maven.compiler.target property -->
146146
</configuration>
147147
</plugin>
148148
<plugin>
@@ -155,10 +155,15 @@
155155
<links>
156156
<link>http://download.oracle.com/javase/6/docs/api</link>
157157
</links>
158-
<encoding>UTF-8</encoding>
159158
<locale>en_US</locale>
160159
<linksource>true</linksource>
161160
<excludePackageNames>*.internal</excludePackageNames>
161+
<notimestamp>true</notimestamp>
162+
<quiet>true</quiet>
163+
<docencoding>UTF-8</docencoding>
164+
<version>false</version>
165+
<author>true</author>
166+
<keywords>true</keywords>
162167
</configuration>
163168
</plugin>
164169
<plugin>
@@ -187,104 +192,57 @@
187192
</goals>
188193
</execution>
189194
</executions>
190-
<configuration>
191-
<reportPlugins>
192-
193-
<plugin>
194-
<groupId>org.apache.maven.plugins</groupId>
195-
<artifactId>maven-project-info-reports-plugin</artifactId>
196-
<version>2.4</version>
197-
<configuration>
198-
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
199-
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
200-
</configuration>
201-
<!-- simpler configuration without reportSets available for usual cases -->
202-
<reports>
203-
<report>index</report>
204-
<report>dependencies</report>
205-
<report>issue-tracking</report>
206-
<report>license</report>
207-
<report>mailing-list</report>
208-
<report>modules</report>
209-
<report>project-team</report>
210-
<report>plugin-management</report>
211-
<report>plugins</report>
212-
<report>scm</report>
213-
</reports>
214-
</plugin>
215-
<plugin>
216-
<groupId>org.apache.maven.plugins</groupId>
217-
<artifactId>maven-javadoc-plugin</artifactId>
218-
<configuration>
219-
<charset>UTF-8</charset>
220-
<docencoding>UTF-8</docencoding>
221-
<version>false</version>
222-
<author>true</author>
223-
<keywords>true</keywords>
224-
225-
<stylesheetfile>${project.build.directory}/javadoc-skin/stylesheet.css</stylesheetfile>
226-
<!--
227-
<resourcesArtifacts>
228-
<resourcesArtifact>
229-
<groupId>org.fusesource.mvnplugins</groupId>
230-
<artifactId>fuse-javadoc-skin</artifactId>
231-
<version>1.9</version>
232-
</resourcesArtifact>
233-
</resourcesArtifacts>
234-
-->
235-
</configuration>
195+
</plugin>
196+
</plugins>
197+
</build>
236198

237-
</plugin>
238-
239-
<plugin>
240-
<groupId>org.apache.maven.plugins</groupId>
241-
<artifactId>maven-jxr-plugin</artifactId>
242-
<version>2.3</version>
243-
<configuration>
244-
<stylesheet>fuse-jxr-skin-stylesheet.css</stylesheet>
245-
<inputEncoding>UTF-8</inputEncoding>
246-
<outputEncoding>UTF-8</outputEncoding>
247-
<linkJavadoc>true</linkJavadoc>
248-
<docTitle>${project.name} Source Xref (${project.version})</docTitle>
249-
<windowTitle>${project.name} Source Xref (${project.version})</windowTitle>
250-
</configuration>
251-
</plugin>
252-
253-
</reportPlugins>
199+
<reporting>
200+
<plugins>
201+
<plugin>
202+
<groupId>org.apache.maven.plugins</groupId>
203+
<artifactId>maven-project-info-reports-plugin</artifactId>
204+
<version>2.4</version>
205+
<configuration>
206+
<dependencyDetailsEnabled>false</dependencyDetailsEnabled>
207+
<dependencyLocationsEnabled>false</dependencyLocationsEnabled>
254208
</configuration>
209+
<reportSets>
210+
<reportSet>
211+
<reports>
212+
<report>index</report>
213+
<report>dependencies</report>
214+
<report>issue-tracking</report>
215+
<report>license</report>
216+
<report>mailing-list</report>
217+
<report>modules</report>
218+
<report>project-team</report>
219+
<report>plugin-management</report>
220+
<report>plugins</report>
221+
<report>scm</report>
222+
</reports>
223+
</reportSet>
224+
</reportSets>
255225
</plugin>
256226
<plugin>
257227
<groupId>org.apache.maven.plugins</groupId>
258-
<artifactId>maven-dependency-plugin</artifactId>
228+
<artifactId>maven-javadoc-plugin</artifactId>
229+
</plugin>
230+
<plugin>
231+
<groupId>org.apache.maven.plugins</groupId>
232+
<artifactId>maven-jxr-plugin</artifactId>
259233
<version>3.0.0</version>
260-
<executions>
261-
<execution>
262-
<id>unpack</id>
263-
<phase>generate-sources</phase>
264-
<goals>
265-
<goal>unpack</goal>
266-
</goals>
267-
<configuration>
268-
<artifactItems>
269-
<artifactItem>
270-
<groupId>org.fusesource.mvnplugins</groupId>
271-
<artifactId>fuse-javadoc-skin</artifactId>
272-
<version>1.9</version>
273-
<type>jar</type>
274-
<overWrite>false</overWrite>
275-
<outputDirectory>${project.build.directory}/javadoc-skin</outputDirectory>
276-
</artifactItem>
277-
</artifactItems>
278-
</configuration>
279-
</execution>
280-
</executions>
234+
<configuration>
235+
<linkJavadoc>true</linkJavadoc>
236+
<docTitle>${project.name} Source Xref (${project.version})</docTitle>
237+
<windowTitle>${project.name} Source Xref (${project.version})</windowTitle>
238+
</configuration>
281239
</plugin>
282240
</plugins>
283-
</build>
241+
</reporting>
242+
284243
<profiles>
285244

286-
<!-- enables extra repositories which may have some
287-
goodies that have not reached central yet -->
245+
<!-- enables extra repositories which may have some goodies that have not reached central yet -->
288246
<profile>
289247
<id>download</id>
290248
<repositories>
@@ -318,27 +276,7 @@
318276
</goals>
319277
</execution>
320278
</executions>
321-
322-
<configuration>
323-
<charset>UTF-8</charset>
324-
<docencoding>UTF-8</docencoding>
325-
<version>false</version>
326-
<author>true</author>
327-
<keywords>true</keywords>
328-
329-
<stylesheetfile>${project.build.directory}/javadoc-skin/stylesheet.css</stylesheetfile>
330-
<!--
331-
<resourcesArtifacts>
332-
<resourcesArtifact>
333-
<groupId>org.fusesource.mvnplugins</groupId>
334-
<artifactId>fuse-javadoc-skin</artifactId>
335-
<version>1.9</version>
336-
</resourcesArtifact>
337-
</resourcesArtifacts>
338-
-->
339-
</configuration>
340279
</plugin>
341-
342280
</plugins>
343281
</build>
344282
</profile>

0 commit comments

Comments
 (0)