From 254ec5e06ec12dab872638ab01fb1e44ef2d5ca7 Mon Sep 17 00:00:00 2001
From: Christian Wulf <chw@informatik.uni-kiel.de>
Date: Tue, 16 Dec 2014 14:03:30 +0100
Subject: [PATCH] fixed NPE due to maven checkstyle plugin version
---
.checkstyle | 13 ++++++++++---
.project | 6 ++++++
.settings/edu.umd.cs.findbugs.core.prefs | 2 +-
pom.xml | 20 +-------------------
4 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/.checkstyle b/.checkstyle
index e073af44..e8ce6f32 100644
--- a/.checkstyle
+++ b/.checkstyle
@@ -1,10 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
-<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+<fileset-config file-format-version="1.2.0" simple-config="false" sync-formatter="false">
<local-check-config name="TeeTime" location="conf/quality-config/cs-conf.xml" type="project" description="">
<additional-data name="protect-config-file" value="false"/>
</local-check-config>
- <fileset name="all" enabled="true" check-config-name="TeeTime" local="true">
- <file-match-pattern match-pattern="." include-pattern="true"/>
+ <local-check-config name="maven-checkstyle-plugin default" location="file:/C:/Users/chw/Repositories/teetime/conf/quality-config/cs-conf.xml" type="remote" description="maven-checkstyle-plugin configuration default">
+ <property name="checkstyle.cache.file" value="${project_loc}/target/checkstyle-cachefile"/>
+ <property name="checkstyle.header.file" value="C:\Users\chw\Repositories\teetime\target\checkstyle-header-default.txt"/>
+ </local-check-config>
+ <fileset name="java-sources-default" enabled="true" check-config-name="maven-checkstyle-plugin default" local="true">
+ <file-match-pattern match-pattern="src/main/java/.*\.java" include-pattern="true"/>
+ <file-match-pattern match-pattern="src/test/java/.*\.java" include-pattern="true"/>
+ <file-match-pattern match-pattern="src/main/resources/.*\.properties" include-pattern="true"/>
+ <file-match-pattern match-pattern="src/test/resources/.*\.properties" include-pattern="true"/>
</fileset>
</fileset-config>
diff --git a/.project b/.project
index 9c7a3eb0..c3dde7d0 100644
--- a/.project
+++ b/.project
@@ -25,11 +25,17 @@
<arguments>
</arguments>
</buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
<nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
</projectDescription>
diff --git a/.settings/edu.umd.cs.findbugs.core.prefs b/.settings/edu.umd.cs.findbugs.core.prefs
index 272829c9..2502b238 100644
--- a/.settings/edu.umd.cs.findbugs.core.prefs
+++ b/.settings/edu.umd.cs.findbugs.core.prefs
@@ -1,5 +1,5 @@
#FindBugs User Preferences
-#Tue Nov 25 12:10:00 CET 2014
+#Tue Dec 16 14:03:06 CET 2014
detector_threshold=3
effort=max
excludefilter0=.fbExcludeFilterFile|true
diff --git a/pom.xml b/pom.xml
index 63f175d6..31092210 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,8 +160,6 @@
</executions>
</plugin>
-
-
<plugin>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
@@ -174,27 +172,11 @@
</configuration>
</plugin>
- <!-- <plugin> -->
- <!-- <groupId>org.apache.maven.plugins</groupId> -->
- <!-- <artifactId>maven-shade-plugin</artifactId> -->
- <!-- <executions> -->
- <!-- <execution> -->
- <!-- <phase>package</phase> -->
- <!-- <goals> -->
- <!-- <goal>shade</goal> -->
- <!-- </goals> -->
- <!-- </execution> -->
- <!-- </executions> -->
- <!-- <configuration> -->
- <!-- <finalName>${project.artifactId}-${project.version}-with-dependencies</finalName> -->
- <!-- </configuration> -->
- <!-- </plugin> -->
-
<!-- Checkstyle -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.13</version>
+ <version>2.12</version>
<executions>
<execution>
<phase>test</phase>
--
GitLab