[JENKINS-29308] Sync from upstream/master

jenkinsci · Oct 20, 2015 · 7004a6a · 7004a6a
2 parents 0c83b70 + 7cce021
commit 7004a6a
Show file tree

Hide file tree

Showing 12 changed files with 895 additions and 996 deletions.
diff --git a/pom.xml b/pom.xml
@@ -18,9 +18,7 @@
   <properties>
     <project.build.outputEncoding>UTF-8</project.build.outputEncoding>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <findbugs-maven-plugin.version>3.0.1</findbugs-maven-plugin.version>
-    <findbugs.failOnError>false</findbugs.failOnError>
-    <workflow-jenkins-plugin.version>1.4</workflow-jenkins-plugin.version>
+    <workflow-jenkins-plugin.version>1.7</workflow-jenkins-plugin.version>
   </properties>
 
   <licenses>
@@ -30,6 +28,33 @@
     </license>
   </licenses>
 
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-pmd-plugin</artifactId>
+        <version>3.5</version>
+        <configuration>
+          <targetJdk>1.6</targetJdk>
+          <rulesets>
+            <ruleset>/rulesets/basic.xml</ruleset>
+            <ruleset>/rulesets/braces.xml</ruleset>
+            <ruleset>/rulesets/clone.xml</ruleset>
+            <ruleset>/rulesets/codesize.xml</ruleset>
+            <ruleset>/rulesets/design.xml</ruleset>
+            <ruleset>/rulesets/finalizers.xml</ruleset>
+            <ruleset>/rulesets/imports.xml</ruleset>
+            <ruleset>/rulesets/j2ee.xml</ruleset>
+            <ruleset>/rulesets/optimizations.xml</ruleset>
+            <ruleset>/rulesets/strictexception.xml</ruleset>
+            <ruleset>/rulesets/strings.xml</ruleset>
+            <ruleset>/rulesets/unusedcode.xml</ruleset>
+          </rulesets>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
   <developers>
     <developer>
       <id>jborghi</id>
@@ -45,7 +70,7 @@
       <version>${workflow-jenkins-plugin.version}</version>
       <scope>test</scope>
     </dependency>
-        <dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>4.12</version>
@@ -64,15 +89,15 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.5.1</version>
+        <version>2.5.2</version>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
-        <version>${findbugs-maven-plugin.version}</version>
+        <version>3.0.2</version>
         <configuration>
           <excludeFilterFile>src/findbugs/excludesFilter.xml</excludeFilterFile>
-          <failOnError>${findbugs.failOnError}</failOnError>
+          <failOnError>false</failOnError>
           <xmlOutput>true</xmlOutput>
         </configuration>
         <executions>