Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 41 additions & 0 deletions checkstyle.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">

<!--
Checkstyle-Configuration: CommandHelper
Description: A checkstyle configuration for CommandHelper.
Author: P.J.S. Kools
-->
<module name="Checker">
<property name="severity" value="error"/>
<module name="TreeWalker">

<!-- Line length <= 120 characters. -->
<module name="LineLength">
<property name="severity" value="ignore"/> <!-- TODO: Change to "error" once the >7000 violations have been resolved. -->
<property name="max" value="120"/>
</module>

<!-- Indent must use tab characters. -->
<module name="RegexpSinglelineJava">
<property name="format" value="^\t* ([^\*]|$)"/> <!-- Javadoc and multiline comments have a single leading whitespace, so allow " *". -->
<property name="message" value="Indent must use tab characters"/>
<property name="ignoreComments" value="false"/>
</module>

<!-- Disallow package.* imports. -->
<module name="AvoidStarImport"/>

<!-- Disallow whitespaces after '(' and before ')'. -->
<module name="ParenPad"/>

</module>

<!-- Disallow trailing whitespaces/tabs. -->
<module name="RegexpSingleline">
<property name="severity" value="error"/>
<property name="format" value="(?&lt;! \*)\s+$"/> <!-- Empty javadoc and multiline comment lines have a single trailing whitespace, so allow " * ". -->
<property name="message" value="Line has trailing whitespaces/tabs."/>
<metadata name="net.sf.eclipsecs.core.lastEnabledSeverity" value="inherit"/>
</module>
</module>
89 changes: 59 additions & 30 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -198,12 +198,14 @@
</dependency>

<!-- Used for IRC hooks -->
<!--<dependency> NOT READY YET
<groupId>org.jibble</groupId>
<artifactId>pircbot</artifactId>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>-->
<!-- NOT READY YET
<dependency>
<groupId>org.jibble</groupId>
<artifactId>pircbot</artifactId>
<version>1.5.0</version>
<scope>compile</scope>
</dependency>
-->

<!-- Profiling library -->
<dependency>
Expand Down Expand Up @@ -278,17 +280,17 @@

<!-- Evil-y things (currently not used) -->
<!--<dependency>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.2.2</version>
<scope>compile</scope>
<type>jar</type>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
<version>2.2.2</version>
<scope>compile</scope>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.15.0-GA</version>
<type>jar</type>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.15.0-GA</version>
<type>jar</type>
</dependency>-->
<!-- Embedded SSH Client -->
<dependency>
Expand All @@ -305,13 +307,13 @@
<artifactId>jchardet</artifactId>
<version>1.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.oltu.oauth2/org.apache.oltu.oauth2.client -->
<dependency>
<!-- Apache License 2.0 -->
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>1.0.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.apache.oltu.oauth2/org.apache.oltu.oauth2.client -->
<dependency>
<!-- Apache License 2.0 -->
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId>
<version>1.0.2</version>
</dependency>
<!-- Test libraries -->
<!-- Hamcrest must come before powermock -->
<dependency>
Expand Down Expand Up @@ -488,7 +490,7 @@
</manifestEntries>
</archive>
</configuration>
</plugin>
</plugin>

<!-- Shade plugin -->
<plugin>
Expand All @@ -503,13 +505,13 @@
<goal>shade</goal>
</goals>
<configuration>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>full</shadedClassifierName>
<minimizeJar>false</minimizeJar>
<!-- To add a new shaded dependency, there are three steps.
1. Add a reference to the artifact set
2. Add a relocation tag (usually recommended, though not always)
3. Add it to the filter list
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>full</shadedClassifierName>
<minimizeJar>false</minimizeJar>
<!-- To add a new shaded dependency, there are three steps.
1. Add a reference to the artifact set
2. Add a relocation tag (usually recommended, though not always)
3. Add it to the filter list

You can copy existing structures over, and change the parameters on them.
-->
Expand Down Expand Up @@ -912,6 +914,33 @@
</execution>
</executions>
</plugin>

<!-- Checkstyle plugin -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>validate</id>
<phase>validate</phase>
<configuration>
<sourceDirectories>${project.compileSourceRoots}</sourceDirectories>
<testSourceDirectories>${project.testCompileSourceRoots}</testSourceDirectories>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<configLocation>${basedir}/checkstyle.xml</configLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
</configuration>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
</plugin>

</plugins>
</build>
<profiles>
Expand Down
Loading