-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #108 from diging/develop
update dependencies
- Loading branch information
Showing
3 changed files
with
98 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| # Guidelines for Pull Requests | ||
|
|
||
| If you haven't yet read our code review guidelines, please do so, You can find them [here](https://diging.atlassian.net/wiki/spaces/DIGING/pages/2256076801/Code+Review+Guidelines). | ||
|
|
||
| Please confirm the following by adding an x for each item (turn `[ ]` into `[x]`). | ||
|
|
||
| - [ ] I have removed all code style changes that are not necessary (e.g. changing blanks across the whole file that don’t need to be changed, adding empty lines in parts other than your own code) | ||
| - [ ] I am not making any changes to files that don’t have any effect (e.g. imports added that don’t need to be added) | ||
| - [ ] I do not have any sysout statements in my code or commented out code that isn’t needed anymore | ||
| - [ ] I am not reformatting any files in the wrong format or without cause. | ||
| - [ ] I am not changing file encoding or line endings to something else than UTF-8, LF | ||
| - [ ] My pull request does not show an insane amount of files being changed although my ticket only requires a few files being changed | ||
| - [ ] I have added Javadoc/documentation where appropriate | ||
| - [ ] I have added test cases where appropriate | ||
| - [ ] I have explained any part of my code/implementation decisions that is not be self-explanatory | ||
|
|
||
| ## Please provide a brief description of your ticket | ||
| (you can copy the ticket if it hasn't changed) | ||
|
|
||
| ...Put description here... | ||
|
|
||
| ## Anything else the reviewer needs to know? | ||
|
|
||
| ... describe here; e.g. is there another pull request this pull request depends on? If so, link it here. ... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| <?xml version="1.0"?> | ||
| <!DOCTYPE module PUBLIC | ||
| "-//Puppy Crawl//DTD Check Configuration 1.3//EN" | ||
| "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd"> | ||
|
|
||
| <!-- | ||
| Checkstyle is highly configurable. Be sure to read the documentation at http://checkstyle.sf.net | ||
| --> | ||
|
|
||
| <module name = "Checker"> | ||
| <property name="charset" value="UTF-8"/> | ||
| <property name="severity" value="warning"/> | ||
| <property name="fileExtensions" value="java, properties, xml"/> | ||
| <module name="TreeWalker"> | ||
| <module name="OuterTypeFilename"/> | ||
| <module name="IllegalTokenText"> | ||
| <property name="tokens" value="STRING_LITERAL, CHAR_LITERAL"/> | ||
| <property name="format" value="\\u00(09|0(a|A)|0(c|C)|0(d|D)|22|27|5(C|c))|\\(0(10|11|12|14|15|42|47)|134)"/> | ||
| <property name="message" value="Consider using special escape sequence instead of octal value or Unicode escaped value."/> | ||
| </module> | ||
| <module name="AvoidEscapedUnicodeCharacters"> | ||
| <property name="allowEscapesForControlCharacters" value="true"/> | ||
| <property name="allowByTailComment" value="true"/> | ||
| <property name="allowNonPrintableEscapes" value="true"/> | ||
| </module> | ||
| <module name="OneTopLevelClass"/> | ||
| <module name="NoLineWrap"/> | ||
| <module name="EmptyBlock"> | ||
| <property name="option" value="TEXT"/> | ||
| <property name="tokens" value="LITERAL_TRY, LITERAL_FINALLY, LITERAL_IF, LITERAL_ELSE, LITERAL_SWITCH"/> | ||
| </module> | ||
| <module name="OneStatementPerLine"/> | ||
| <module name="MissingSwitchDefault"/> | ||
| <module name="NoFinalizer"/> | ||
| <module name="OverloadMethodsDeclarationOrder"/> | ||
| <module name="EmptyCatchBlock"> | ||
| <property name="exceptionVariableName" value="expected|ignore"/> | ||
| </module> | ||
| <module name="UpperEll"/> | ||
|
|
||
| <!-- Rules from Sun's Java Style --> | ||
| <module name="IllegalImport"/> | ||
| <module name="EmptyStatement"/> | ||
| <module name="EqualsHashCode"/> | ||
| <module name="SimplifyBooleanReturn"/> | ||
| <module name="TodoComment"> | ||
| <property name="format" value="(TODO)|(FIXME)"/> | ||
| <message key="todo.match" value="Resolve unexpected comment."/> | ||
| </module> | ||
|
|
||
| <!-- Custom --> | ||
| <module name="DefaultComesLast"> | ||
| <property name="skipIfLastAndSharedWithCase" value="true"/> | ||
| </module> | ||
| <module name="Indentation"> | ||
| <property name="basicOffset" value="4"/> | ||
| <property name="braceAdjustment" value="0"/> | ||
| <property name="caseIndent" value="4"/> | ||
| <property name="throwsIndent" value="4"/> | ||
| <property name="lineWrappingIndentation" value="4"/> | ||
| <property name="arrayInitIndent" value="4"/> | ||
| </module> | ||
| </module> | ||
| </module> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters