kemitix/kemitix-parent
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch release/1.3.0 into master

Browse source 
Upgrade checkstyle to 7.0
Upgrade maven-source-plugin to 3.0.1
Upgrade sevntucheckstyle to 1.21.0
Upgrade maven-javadoc-plugin to 2.10.4
Upgrade jacoco-maven-plugin to 0.7.7
checkstyle.xml: Remove rules from that aren't compatible with code style or with lombok
checkstyle.xml: Add sevntu's new UniformEnumValueCheck to checkstyle template
.gitignore: apply a common standard gitignore to use as template
This commit is contained in:
Paul Campbell 2016-06-28 09:55:33 +01:00
commit 8f24f4fe73
4 changed files with 68 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
.gitignore vendored
View file

@ -1 +1,49 @@
/target/ # Package Files #
*.jar
*.war
*.ear
*.zip
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
# maven build outputs
target/
# netbeans legacy
nbproject/
nbactions.xml
# eclipse legacy
.project
# intellij
.idea/libraries/
.idea/workspace.xml
.idea/uiDesigner.xml
.idea/compiler.xml
.idea/misc.xml
.idea/checkstyle.xml
.idea/artifacts/
.idea/dataSources*
.idea/tasks.xml
.idea/dictionaries/
.idea/shelf/
.idea/dynamic.xml
.idea/sqlDataSources.xml
.idea/gradle.xml
.idea/mongoSettings.xml
# Spring
spring.log
logs/
/application.properties
/bootstrap.properties
# Composer-style
vendor
# Git and temp files
*.orig
*.patch
*~

12
CHANGELOG
View file

@ -1,6 +1,18 @@
CHANGELOG CHANGELOG
========= =========
1.3.0
------
* Upgrade checkstyle to 7.0
* Upgrade maven-source-plugin to 3.0.1
* Upgrade sevntucheckstyle to 1.21.0
* Upgrade maven-javadoc-plugin to 2.10.4
* Upgrade jacoco-maven-plugin to 0.7.7
* checkstyle.xml: Remove rules from that aren't compatible with code style or with lombok
* checkstyle.xml: Add sevntu's new UniformEnumValueCheck to checkstyle template
* .gitignore: apply a common standard gitignore to use as template
1.2.0 1.2.0
------ ------

4
checkstyle.xml
View file

@ -28,7 +28,6 @@
<module name="AnnotationLocation"/> <!-- annotations should be on line by themselves --> <module name="AnnotationLocation"/> <!-- annotations should be on line by themselves -->
<module name="AnnotationUseStyle"/> <!-- annotations should only use () and named attributes when needed --> <module name="AnnotationUseStyle"/> <!-- annotations should only use () and named attributes when needed -->
<module name="AnonInnerLength"/> <!-- limits anonymous inner classes to 20 lines --> <module name="AnonInnerLength"/> <!-- limits anonymous inner classes to 20 lines -->
<module name="ArrayTrailingComma"/> <!-- arrays should have a trailing comma (unless braces are on same line)-->
<module name="ArrayTypeStyle"/> <!-- enforce Java style arrays --> <module name="ArrayTypeStyle"/> <!-- enforce Java style arrays -->
<module name="AtclauseOrder"/> <!-- enforce standard order for javadoc elements --> <module name="AtclauseOrder"/> <!-- enforce standard order for javadoc elements -->
<module name="AvoidEscapedUnicodeCharacters"> <!-- prevent use of obscure escape codes --> <module name="AvoidEscapedUnicodeCharacters"> <!-- prevent use of obscure escape codes -->
@ -69,7 +68,6 @@
<module name="ExplicitInitialization"/> <!-- avoid initializing a field twice to the same value --> <module name="ExplicitInitialization"/> <!-- avoid initializing a field twice to the same value -->
<module name="FallThrough"/> <!-- checks that each switch case fall-through is commented as such --> <module name="FallThrough"/> <!-- checks that each switch case fall-through is commented as such -->
<module name="FinalClass"/> <!-- class which has only private constructors is declared as final --> <module name="FinalClass"/> <!-- class which has only private constructors is declared as final -->
<!--<module name="FinalLocalVariable"/> &lt;!&ndash; incompatible with lombok's val - local variables that never change must be declared final &ndash;&gt;-->
<module name="FinalParameters"/> <!-- parameters that never change must be declared final --> <module name="FinalParameters"/> <!-- parameters that never change must be declared final -->
<module name="GenericWhitespace"/> <!-- generic tokens are spaced correctly --> <module name="GenericWhitespace"/> <!-- generic tokens are spaced correctly -->
<module name="HiddenField"> <module name="HiddenField">
@ -81,7 +79,6 @@
<module name="IllegalImport"/> <!-- prevent imports from the sun.* package --> <module name="IllegalImport"/> <!-- prevent imports from the sun.* package -->
<module name="IllegalThrows"/> <!-- prevent generic throws (i.e. Exception, Throwable, RuntimeException) --> <module name="IllegalThrows"/> <!-- prevent generic throws (i.e. Exception, Throwable, RuntimeException) -->
<module name="IllegalType"/> <!-- prevents variables, returns or parameters of non-interface Collections classes --> <module name="IllegalType"/> <!-- prevents variables, returns or parameters of non-interface Collections classes -->
<!--<module name="Indentation"/> &lt;!&ndash; incompatible with preferred indentation - correct indentation of Java code &ndash;&gt;-->
<module name="InnerAssignment"/> <!-- prevent assignments in subexpressions (i.e. while((line = read()){}) --> <module name="InnerAssignment"/> <!-- prevent assignments in subexpressions (i.e. while((line = read()){}) -->
<module name="InnerTypeLast"/> <!-- inner classes appear after methods and fields --> <module name="InnerTypeLast"/> <!-- inner classes appear after methods and fields -->
<module name="InterfaceIsType"/> <!-- interface must define method not just constants --> <module name="InterfaceIsType"/> <!-- interface must define method not just constants -->
@ -202,6 +199,7 @@
<module name="PublicReferenceToPrivateTypeCheck"/> <!-- prevent attempt to expose private type --> <module name="PublicReferenceToPrivateTypeCheck"/> <!-- prevent attempt to expose private type -->
<!-- sevntu/naming --> <!-- sevntu/naming -->
<module name="EnumValueNameCheck"/> <!-- validate enum value format --> <module name="EnumValueNameCheck"/> <!-- validate enum value format -->
<module name="UniformEnumConstantNameCheck"/> <!-- forces enum names to all follow the same pattern as each other -->
</module> </module>
</module> </module>

12
pom.xml
View file

@ -4,7 +4,7 @@
<groupId>net.kemitix</groupId> <groupId>net.kemitix</groupId>
<artifactId>kemitix-parent</artifactId> <artifactId>kemitix-parent</artifactId>
<version>1.2.0</version> <version>1.3.0</version>
<packaging>pom</packaging> <packaging>pom</packaging>
<name>Kemitix Parent</name> <name>Kemitix Parent</name>
@ -41,19 +41,19 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<kemitix.build.directory>target</kemitix.build.directory> <kemitix.build.directory>target</kemitix.build.directory>
<maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version> <maven-javadoc-plugin.version>2.10.4</maven-javadoc-plugin.version>
<maven-source-plugin.version>3.0.0</maven-source-plugin.version> <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version> <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version> <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version> <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
<checkstyle.version>6.19</checkstyle.version> <checkstyle.version>7.0</checkstyle.version>
<sevntu-checkstyle-maven-plugin.version>1.20.0</sevntu-checkstyle-maven-plugin.version> <sevntu-checkstyle-maven-plugin.version>1.21.0</sevntu-checkstyle-maven-plugin.version>
<maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version> <maven-compiler-plugin.version>3.5.1</maven-compiler-plugin.version>
<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version> <maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
<maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version> <maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
<maven-pmd-plugin.version>3.6</maven-pmd-plugin.version> <maven-pmd-plugin.version>3.6</maven-pmd-plugin.version>
<findbugs-maven-plugin.version>3.0.3</findbugs-maven-plugin.version> <findbugs-maven-plugin.version>3.0.3</findbugs-maven-plugin.version>
<jacoco-maven-plugin.version>0.7.6.201602180812</jacoco-maven-plugin.version> <jacoco-maven-plugin.version>0.7.7.201606060606</jacoco-maven-plugin.version>
<highwheel-maven.version>1.2</highwheel-maven.version> <highwheel-maven.version>1.2</highwheel-maven.version>
<maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version> <maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
<maven-jxr-plugin.version>2.5</maven-jxr-plugin.version> <maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>