Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release/v1.101.6 #8

Merged
merged 8 commits into from
Mar 18, 2019
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,13 @@ language: java
sudo: false

jdk:
- oraclejdk11
- oraclejdk9
- oraclejdk8
- oraclejdk7
- openjdk7
- openjdk11
- openjdk10
- openjdk9
- openjdk8

cache:
directories:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ JarabraDix Changelog
## WIP
Released on 20XX-XX-XX

## v1.101.6
Released on 2019-03-19
- responding to checkstyle security issue CVE-2019-9658

## v1.101.4
Released on 2017-06-22
- correspond to Maven 3.5
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ let's try **DoubDabC**.

## How to build ##

* JarabraDix needs to use [Maven 3.0.1+](https://maven.apache.org/)
and JDK 1.7+ to be built.
* JarabraDix needs to use [Maven 3.3.9+](https://maven.apache.org/)
and JDK 1.8+ to be built.

* JarabraDix runtime does not depend on any other library at all.
Just compile Java sources under `src/main/java/` if you don't use Maven.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,21 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>

<!DOCTYPE suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd">

<!--
Checkstyle suppressions
for Checkstyle 6.19(7.4) or later
for Checkstyle 8.18 or later

[ http://checkstyle.sourceforge.net/ ]
[ https://checkstyle.org/ ]

Copyright(c) 2017 olyutorskii
Copyright(c) 2010 olyutorskii
-->


<suppressions>

<!-- Annotations -->
<suppress files="" checks="AnnotationOnSameLine" />

<!-- Class Design -->
<suppress files="" checks="DesignForExtension" />

Expand Down
51 changes: 34 additions & 17 deletions checkstyle.xml → config/checkstyle/checkstyle.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<?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//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">

<!--
Checkstyle modules
for Checkstyle 6.19(7.4) or later
for Checkstyle 8.18 or later

[ http://checkstyle.sourceforge.net/ ]
[ https://checkstyle.org/ ]

Copyright(c) 2017 olyutorskii
Copyright(c) 2010 olyutorskii
-->


Expand All @@ -26,10 +26,9 @@

<!-- Filters -->
<module name="SeverityMatchFilter" />
<module name="SuppressionCommentFilter" />
<module name="SuppressionFilter" />
<!--module name="SuppressionFilter" /-->
<module name="SuppressWarningsFilter" />
<module name="SuppressWithNearbyCommentFilter" />
<module name="SuppressWithPlainTextCommentFilter" />


<!-- Headers -->
Expand Down Expand Up @@ -78,15 +77,31 @@
<module name="FileTabCharacter" />


<module name="BeforeExecutionExclusionFileFilter">
<property name="fileNamePattern" value="module\-info\.java$" />
</module>


<module name="TreeWalker">

<property name="tabWidth" value="8"/>
<property name="fileExtensions" value="java"/>
<property name="tabWidth" value="8" />
<property name="fileExtensions" value="java" />

<module name="SuppressWarningsHolder" />


<!-- Filters -->

<module name="SuppressionCommentFilter" />
<module name="SuppressWithNearbyCommentFilter" />
<!--module name="SuppressionXpathFilter" /-->
<!--module name="SuppressionXpathSingleFilter" /-->


<!-- Annotations -->

<module name="AnnotationLocation" />
<module name="AnnotationOnSameLine" />
<module name="AnnotationUseStyle" />
<module name="MissingDeprecated" />
<module name="MissingOverride" />
Expand Down Expand Up @@ -182,7 +197,7 @@
<module name="AvoidStaticImport" />
<module name="CustomImportOrder" />
<module name="IllegalImport" />
<module name="ImportControl" />
<!--module name="ImportControl" /-->
<module name="ImportOrder" />
<module name="RedundantImport" />
<module name="UnusedImports" />
Expand Down Expand Up @@ -225,14 +240,13 @@

<module name="ArrayTypeStyle" />
<module name="AvoidEscapedUnicodeCharacters">
<property name="allowEscapesForControlCharacters" value="true"/>
<property name="allowByTailComment" value="true"/>
<property name="allowIfAllCharactersEscaped" value="true"/>
<property name="allowNonPrintableEscapes" value="true"/>
<property name="allowEscapesForControlCharacters" value="true" />
<property name="allowByTailComment" value="true" />
<property name="allowIfAllCharactersEscaped" value="true" />
<property name="allowNonPrintableEscapes" value="true" />
</module>
<module name="CommentsIndentation" />
<module name="DescendantToken" />
<module name="FileContentsHolder" />
<module name="FinalParameters" />
<module name="Indentation">
<property name="caseIndent" value="0" />
Expand All @@ -248,6 +262,8 @@

<!-- Modifiers -->

<module name="ClassMemberImpliedModifier" />
<module name="InterfaceMemberImpliedModifier" />
<module name="ModifierOrder" />
<module name="RedundantModifier" />

Expand All @@ -260,6 +276,7 @@
<module name="ClassTypeParameterName" />
<module name="ConstantName" />
<module name="InterfaceTypeParameterName" />
<module name="LambdaParameterName" />
<module name="LocalFinalVariableName" />
<module name="LocalVariableName" />
<module name="MemberName" />
Expand Down Expand Up @@ -332,7 +349,7 @@
<module name="SingleSpaceSeparator" />
<module name="TypecastParenPad" />
<module name="WhitespaceAfter" >
<property name="tokens" value="COMMA, SEMI,"/>
<property name="tokens" value="COMMA, SEMI," />
</module>
<module name="WhitespaceAround">
<property
Expand Down
79 changes: 79 additions & 0 deletions config/pmd/pmdrules.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="UTF-8" ?>

<!--
Custom rule set
for PMD [ https://pmd.github.io/ ] 6.8.0 or later

Copyright(c) 2016 olyutorskii
-->

<ruleset
xmlns="http://pmd.sourceforge.net/ruleset/2.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://pmd.sourceforge.net/ruleset/2.0.0
http://pmd.sourceforge.net/ruleset_2_0_0.xsd"
name="Custom ruleset"
>

<description>
custom rulesets
</description>

<rule ref="category/java/bestpractices.xml" />

<rule ref="category/java/codestyle.xml" >
<exclude name="CommentDefaultAccessModifier" />
<exclude name="DefaultPackage" />
<exclude name="LocalVariableCouldBeFinal" />
<exclude name="MethodArgumentCouldBeFinal" />
<exclude name="OnlyOneReturn" />
<exclude name="ShortVariable" />
<exclude name="UnnecessaryLocalBeforeReturn" />
<exclude name="UnnecessaryReturn" />
</rule>
<rule ref="category/java/codestyle.xml/ControlStatementBraces" >
<properties>
<property name="checkIfElseStmt" value="false"/>
<property name="checkSingleIfStmt" value="false"/>
</properties>
</rule>

<rule ref="category/java/design.xml" >
<exclude name="LawOfDemeter" />
<exclude name="LoosePackageCoupling" />
</rule>

<rule ref="category/java/documentation.xml" />
<rule ref="category/java/documentation.xml/CommentRequired" >
<properties>
<property name="fieldCommentRequirement" value="Ignored"/>
</properties>
</rule>
<rule ref="category/java/documentation.xml/CommentSize" >
<properties>
<property name="maxLines" value="25"/>
</properties>
</rule>

<rule ref="category/java/errorprone.xml" >
<exclude name="AvoidLiteralsInIfCondition" />
<exclude name="BeanMembersShouldSerialize" />
<exclude name="DataflowAnomalyAnalysis" />
</rule>

<rule ref="category/java/multithreading.xml" />

<rule ref="category/java/performance.xml" >
<exclude name="ConsecutiveAppendsShouldReuse" />
<exclude name="RedundantFieldInitializer" />
</rule>

<rule ref="category/java/security.xml" />

<!--rule ref="category/pom/errorprone.xml" /-->

<!--rule ref="category/xml/errorprone.xml" /-->

</ruleset>

<!-- EOF -->
113 changes: 0 additions & 113 deletions pmdrules.xml

This file was deleted.