diff --git a/pom.xml b/pom.xml index 088f1e75c0e76108700605f74d5d70c8f55e12e1..c28aeb82e90a10a8e54e3f893bdebff5ed92a91d 100644 --- a/pom.xml +++ b/pom.xml @@ -124,7 +124,13 @@ <dependency> <groupId>com.github.JCTools</groupId> <artifactId>JCTools</artifactId> - <version>3e1afaa505</version> <!-- SNAPSHOT master version --> + <!-- SNAPSHOT master version --> + <version>ea6ac4c4b7</version> + </dependency> + <dependency> + <groupId>com.puppycrawl.tools</groupId> + <artifactId>checkstyle</artifactId> + <version>6.5</version> </dependency> <dependency> @@ -217,29 +223,29 @@ </configuration> </plugin> - <!-- Checkstyle --> - <!-- <plugin> --> - <!-- <groupId>org.apache.maven.plugins</groupId> --> - <!-- <artifactId>maven-checkstyle-plugin</artifactId> --> - <!-- <version>2.12</version> --> - <!-- <executions> --> - <!-- <execution> --> - <!-- <phase>test</phase> --> - <!-- <goals> --> - <!-- <goal>check</goal> --> - <!-- </goals> --> - <!-- <configuration> --> - <!-- <configLocation>${project.basedir}/conf/quality-config/cs-conf.xml</configLocation> --> - <!-- <includeTestSourceDirectory>true</includeTestSourceDirectory> --> - <!-- <encoding>UTF-8</encoding> --> - <!-- <consoleOutput>true</consoleOutput> --> - <!-- <failsOnError>false</failsOnError> --> - <!-- <failOnViolation>false</failOnViolation> --> - <!-- <linkXRef>false</linkXRef> --> - <!-- </configuration> --> - <!-- </execution> --> - <!-- </executions> --> - <!-- </plugin> --> +<!-- Checkstyle --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>2.12</version> + <executions> + <execution> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> + <configuration> + <configLocation>${project.basedir}/conf/quality-config/cs-conf.xml</configLocation> + <includeTestSourceDirectory>true</includeTestSourceDirectory> + <encoding>UTF-8</encoding> + <consoleOutput>true</consoleOutput> + <failsOnError>false</failsOnError> + <failOnViolation>false</failOnViolation> + <linkXRef>false</linkXRef> + </configuration> + </execution> + </executions> + </plugin> <!-- Findbugs --> <plugin> diff --git a/src/site/markdown/wiki b/src/site/markdown/wiki index 162510ff4d2f04011498ba6920aae0c78347c6c8..0e4474577e1f49bc96e734c286b2d9e0363895e8 160000 --- a/src/site/markdown/wiki +++ b/src/site/markdown/wiki @@ -1 +1 @@ -Subproject commit 162510ff4d2f04011498ba6920aae0c78347c6c8 +Subproject commit 0e4474577e1f49bc96e734c286b2d9e0363895e8