You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@johnzon.apache.org by sa...@apache.org on 2016/03/28 21:28:44 UTC
incubator-johnzon git commit: fix travis build for java 6+7
Repository: incubator-johnzon
Updated Branches:
refs/heads/master 1caed4391 -> a460da4a2
fix travis build for java 6+7
Project: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/commit/a460da4a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/tree/a460da4a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-johnzon/diff/a460da4a
Branch: refs/heads/master
Commit: a460da4a22c475118c09454c3181fad3b0eee5fb
Parents: 1caed43
Author: Hendrik Saly <he...@gmail.com>
Authored: Mon Mar 28 21:28:42 2016 +0200
Committer: Hendrik Saly <he...@gmail.com>
Committed: Mon Mar 28 21:28:42 2016 +0200
----------------------------------------------------------------------
pom.xml | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-johnzon/blob/a460da4a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 14b6e18..cabcc97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,6 +49,8 @@
<bnd.version.policy>[$(version;==;$(@)),$(version;+;$(@)))</bnd.version.policy>
<java-compile.version>1.6</java-compile.version>
<cxf.version>3.0.0</cxf.version>
+ <javadoc.params></javadoc.params> <!-- for java 8 set disable doclint (by profile) -->
+ <checkstyle.version>2.15</checkstyle.version> <!-- checkstyle > 2.15 version do not support java 6 -->
</properties>
<modules>
@@ -161,7 +163,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.17</version>
+ <version>${checkstyle.version}</version>
<executions>
<execution>
<id>verify-style</id>
@@ -284,7 +286,7 @@
</goals>
<configuration>
<show>private</show>
- <additionalparam>-Xdoclint:none</additionalparam> <!-- maven plugin generated a HelpMojo with malformed javadoc -->
+ <additionalparam>${javadoc.params}</additionalparam> <!-- maven plugin generated a HelpMojo with malformed javadoc -->
</configuration>
</execution>
</executions>
@@ -292,6 +294,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.19.1</version>
<configuration>
<args>-Dfile.encoding=UTF-8</args>
</configuration>
@@ -415,7 +418,7 @@
<configuration>
<notimestamp>true</notimestamp>
<show>private</show>
- <additionalparam>-Xdoclint:none</additionalparam> <!-- maven plugin generated a HelpMojo with malformed javadoc -->
+ <additionalparam>${javadoc.params}</additionalparam> <!-- maven plugin generated a HelpMojo with malformed javadoc -->
</configuration>
<reportSets>
<reportSet>
@@ -434,7 +437,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.17</version>
+ <version>2.19.1</version>
<configuration>
<aggregate>true</aggregate>
</configuration>
@@ -453,7 +456,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.13</version>
+ <version>${checkstyle.version}</version>
<reportSets>
<reportSet>
<reports>
@@ -654,6 +657,9 @@
<modules>
<module>johnzon-websocket</module>
</modules>
+ <properties>
+ <checkstyle.version>2.17</checkstyle.version>
+ </properties>
</profile>
<profile>
<!-- jsonb module needs java 1.8 or higher -->
@@ -665,6 +671,10 @@
<module>jsonb-api</module>
<module>johnzon-jsonb</module>
</modules>
+ <properties>
+ <checkstyle.version>2.17</checkstyle.version>
+ <javadoc.params>-Xdoclint:none</javadoc.params>
+ </properties>
</profile>
</profiles>
</project>