Skip to content
Snippets Groups Projects
Commit ab357bc5 authored by Guylaine Prat's avatar Guylaine Prat
Browse files

Update checkstyle and jacoco versions

parent 23b8783b
No related branches found
No related tags found
No related merge requests found
...@@ -31,11 +31,12 @@ ...@@ -31,11 +31,12 @@
<module name="IllegalImport"/> <module name="IllegalImport"/>
<module name="Indentation"> <module name="Indentation">
<property name="basicOffset" value="4"/> <property name="basicOffset" value="4"/>
<property name="caseIndent" value="0"/> <property name="caseIndent" value="4"/>
</module> </module>
<module name="JavadocMethod"> <module name="JavadocMethod">
<property name="allowUndeclaredRTE" value="true"/> <property name="allowUndeclaredRTE" value="true"/>
<property name="allowMissingPropertyJavadoc" value="true"/> <property name="allowMissingPropertyJavadoc" value="true"/>
<property name="validateThrows" value="false"/>
</module> </module>
<module name="JavadocStyle"/> <module name="JavadocStyle"/>
<module name="JavadocVariable"/> <module name="JavadocVariable"/>
...@@ -71,35 +72,30 @@ ...@@ -71,35 +72,30 @@
SR_ASSIGN, STAR, STAR_ASSIGN"/> SR_ASSIGN, STAR, STAR_ASSIGN"/>
</module> </module>
<module name="FileContentsHolder"/> <module name="FileContentsHolder"/>
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE\: stop JavadocVariable check"/>
<property name="onCommentFormat" value="CHECKSTYLE\: resume JavadocVariable check"/>
<property name="checkFormat" value="JavadocVariable"/>
</module>
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE\: stop VisibilityModifierCheck"/>
<property name="onCommentFormat" value="CHECKSTYLE\: resume VisibilityModifierCheck"/>
<property name="checkFormat" value="VisibilityModifierCheck"/>
</module>
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE\: stop NoWhitespaceAfter"/>
<property name="onCommentFormat" value="CHECKSTYLE\: resume NoWhitespaceAfter"/>
<property name="checkFormat" value="NoWhitespaceAfter"/>
</module>
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE\: stop FallThrough check"/>
<property name="onCommentFormat" value="CHECKSTYLE\: resume FallThrough check"/>
<property name="checkFormat" value="FallThrough"/>
</module>
</module> </module>
<module name="RegexpHeader"> <module name="RegexpHeader">
<property name="headerFile" value="${checkstyle.header.file}" /> <property name="headerFile" value="${checkstyle.header.file}" />
</module> </module>
<module name="FileTabCharacter"/> <module name="FileTabCharacter"/>
<module name="NewlineAtEndOfFile"/> <module name="NewlineAtEndOfFile"/>
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE\: stop JavadocVariable check"/>
<property name="onCommentFormat" value="CHECKSTYLE\: resume JavadocVariable check"/>
<property name="checkFormat" value="JavadocVariable"/>
</module>
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE\: stop VisibilityModifierCheck"/>
<property name="onCommentFormat" value="CHECKSTYLE\: resume VisibilityModifierCheck"/>
<property name="checkFormat" value="VisibilityModifierCheck"/>
</module>
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE\: stop NoWhitespaceAfter"/>
<property name="onCommentFormat" value="CHECKSTYLE\: resume NoWhitespaceAfter"/>
<property name="checkFormat" value="NoWhitespaceAfter"/>
</module>
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE\: stop FallThrough check"/>
<property name="onCommentFormat" value="CHECKSTYLE\: resume FallThrough check"/>
<property name="checkFormat" value="FallThrough"/>
</module>
<module name="SuppressionCommentFilter">
<property name="offCommentFormat" value="CHECKSTYLE\: stop HiddenField check"/>
<property name="onCommentFormat" value="CHECKSTYLE\: resume HiddenField check"/>
<property name="checkFormat" value="HiddenField"/>
</module>
</module> </module>
...@@ -19,11 +19,12 @@ ...@@ -19,11 +19,12 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<rugged.findbugs-maven-plugin.version>3.0.0</rugged.findbugs-maven-plugin.version> <rugged.findbugs-maven-plugin.version>3.0.0</rugged.findbugs-maven-plugin.version>
<rugged.jacoco-maven-plugin.version>0.7.7.201606060606</rugged.jacoco-maven-plugin.version> <rugged.jacoco-maven-plugin.version>0.7.9</rugged.jacoco-maven-plugin.version>
<rugged.maven-assembly-plugin.version>2.6</rugged.maven-assembly-plugin.version> <rugged.maven-assembly-plugin.version>2.6</rugged.maven-assembly-plugin.version>
<rugged.maven-bundle-plugin.version>3.2.0</rugged.maven-bundle-plugin.version> <rugged.maven-bundle-plugin.version>3.2.0</rugged.maven-bundle-plugin.version>
<rugged.maven-changes-plugin.version>2.12</rugged.maven-changes-plugin.version> <rugged.maven-changes-plugin.version>2.12</rugged.maven-changes-plugin.version>
<rugged.maven-checkstyle-plugin.version>2.17</rugged.maven-checkstyle-plugin.version> <rugged.maven-checkstyle-plugin.version>2.17</rugged.maven-checkstyle-plugin.version>
<rugged.checkstyle.version>8.1</rugged.checkstyle.version>
<rugged.maven-clean-plugin.version>3.0.0</rugged.maven-clean-plugin.version> <rugged.maven-clean-plugin.version>3.0.0</rugged.maven-clean-plugin.version>
<rugged.maven-compiler-plugin.version>3.5.1</rugged.maven-compiler-plugin.version> <rugged.maven-compiler-plugin.version>3.5.1</rugged.maven-compiler-plugin.version>
<rugged.maven-javadoc-plugin.version>2.10.4</rugged.maven-javadoc-plugin.version> <rugged.maven-javadoc-plugin.version>2.10.4</rugged.maven-javadoc-plugin.version>
...@@ -302,6 +303,11 @@ ...@@ -302,6 +303,11 @@
<goals> <goals>
<goal>prepare-agent</goal> <goal>prepare-agent</goal>
</goals> </goals>
<configuration>
<excludes>
<exclude>fr/cs/examples/**/*.class</exclude>
</excludes>
</configuration>
</execution> </execution>
<execution> <execution>
<id>report</id> <id>report</id>
...@@ -309,6 +315,60 @@ ...@@ -309,6 +315,60 @@
<goals> <goals>
<goal>report</goal> <goal>report</goal>
</goals> </goals>
<configuration>
<excludes>
<exclude>fr/cs/examples/**/*.class</exclude>
</excludes>
</configuration>
</execution>
<execution>
<id>check</id>
<goals>
<goal>check</goal>
</goals>
<configuration>
<rules>
<rule>
<element>BUNDLE</element>
<limits>
<limit>
<counter>CLASS</counter>
<value>COVEREDRATIO</value>
<minimum>1.00</minimum>
</limit>
<limit>
<counter>INSTRUCTION</counter>
<value>COVEREDRATIO</value>
<minimum>0.90</minimum>
</limit>
<limit>
<counter>METHOD</counter>
<value>COVEREDRATIO</value>
<minimum>0.95</minimum>
</limit>
<limit>
<counter>BRANCH</counter>
<value>COVEREDRATIO</value>
<minimum>0.85</minimum>
</limit>
<limit>
<counter>COMPLEXITY</counter>
<value>COVEREDRATIO</value>
<minimum>0.85</minimum>
</limit>
<limit>
<counter>LINE</counter>
<value>COVEREDRATIO</value>
<minimum>0.90</minimum>
</limit>
</limits>
</rule>
</rules>
<haltOnFailure>false</haltOnFailure>
<excludes>
<exclude>fr/cs/examples/**/*.class</exclude>
</excludes>
</configuration>
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
...@@ -377,6 +437,13 @@ ...@@ -377,6 +437,13 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>${rugged.maven-checkstyle-plugin.version}</version> <version>${rugged.maven-checkstyle-plugin.version}</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
<version>${rugged.checkstyle.version}</version>
</dependency>
</dependencies>
<configuration> <configuration>
<configLocation>${basedir}/checkstyle.xml</configLocation> <configLocation>${basedir}/checkstyle.xml</configLocation>
<enableRulesSummary>false</enableRulesSummary> <enableRulesSummary>false</enableRulesSummary>
...@@ -456,6 +523,13 @@ ...@@ -456,6 +523,13 @@
<enableRulesSummary>false</enableRulesSummary> <enableRulesSummary>false</enableRulesSummary>
<headerLocation>${basedir}/license-header.txt</headerLocation> <headerLocation>${basedir}/license-header.txt</headerLocation>
</configuration> </configuration>
<reportSets>
<reportSet>
<reports>
<report>checkstyle</report>
</reports>
</reportSet>
</reportSets>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
...@@ -478,6 +552,7 @@ ...@@ -478,6 +552,7 @@
<version>${rugged.maven-jxr-plugin.version}</version> <version>${rugged.maven-jxr-plugin.version}</version>
<configuration> <configuration>
<linkJavadoc>false</linkJavadoc> <linkJavadoc>false</linkJavadoc>
<bottom><![CDATA[Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="http://www.c-s.fr">CS Syst&egrave;mes d&apos;information</a>. All rights reserved.]]></bottom>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
...@@ -485,6 +560,7 @@ ...@@ -485,6 +560,7 @@
<artifactId>maven-javadoc-plugin</artifactId> <artifactId>maven-javadoc-plugin</artifactId>
<version>${rugged.maven-javadoc-plugin.version}</version> <version>${rugged.maven-javadoc-plugin.version}</version>
<configuration> <configuration>
<bottom><![CDATA[Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="http://www.c-s.fr">CS Syst&egrave;mes d&apos;information</a>. All rights reserved.]]></bottom>
<links> <links>
<link>http://docs.oracle.com/javase/8/docs/api/</link> <link>http://docs.oracle.com/javase/8/docs/api/</link>
<link>http://hipparchus.org/apidocs/</link> <link>http://hipparchus.org/apidocs/</link>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment