Remove pom versions to pick up from parent and fix build issues. Remove deprecated checkstyle modules.
Project: http://git-wip-us.apache.org/repos/asf/commons-dbutils/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-dbutils/commit/5bc6f939 Tree: http://git-wip-us.apache.org/repos/asf/commons-dbutils/tree/5bc6f939 Diff: http://git-wip-us.apache.org/repos/asf/commons-dbutils/diff/5bc6f939 Branch: refs/heads/master Commit: 5bc6f93965cd206d8849e24d9966eaa96e94725b Parents: 0446d3f Author: Carl Hall <[email protected]> Authored: Sat Jul 15 22:04:05 2017 -0700 Committer: Carl Hall <[email protected]> Committed: Thu Jul 20 21:00:16 2017 -0700 ---------------------------------------------------------------------- checkstyle.xml | 2 -- pom.xml | 7 +++++-- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/5bc6f939/checkstyle.xml ---------------------------------------------------------------------- diff --git a/checkstyle.xml b/checkstyle.xml index 7268604..0156ad8 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -155,7 +155,6 @@ <!-- Checks for common coding problems --> <!-- See http://checkstyle.sf.net/config_coding.html --> <!-- module name="AvoidInlineConditionals"/ --> - <module name="DoubleCheckedLocking"/> <!-- MY FAVOURITE --> <module name="EmptyStatement"/> <module name="EqualsHashCode"/> <!-- module name="HiddenField"/ --> @@ -163,7 +162,6 @@ <module name="InnerAssignment"/> <module name="MagicNumber"/> <module name="MissingSwitchDefault"/> - <module name="RedundantThrows"/> <module name="SimplifyBooleanExpression"/> <module name="SimplifyBooleanReturn"/> http://git-wip-us.apache.org/repos/asf/commons-dbutils/blob/5bc6f939/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 46b377a..d3743fa 100644 --- a/pom.xml +++ b/pom.xml @@ -321,11 +321,15 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> + <configuration> + <configLocation>${basedir}/checkstyle.xml</configLocation> + <enableRulesSummary>false</enableRulesSummary> + <headerLocation>${basedir}/license-header.txt</headerLocation> + </configuration> </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>findbugs-maven-plugin</artifactId> - <version>2.5.4</version> <configuration> <threshold>Normal</threshold> <effort>Default</effort> @@ -334,7 +338,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-pmd-plugin</artifactId> - <version>3.3</version> <configuration> <targetJdk>${maven.compiler.source}</targetJdk> <rulesets>
