Merge pull request #53 from armfergom/JENKINS-34846

[JENKINS-34846] Migrate to 2.9 plugin pom
jenkinsci · May 28, 2016 · 116563d · 116563d
2 parents fe9dcd5 + 1c0bc91
commit 116563d
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.466</version>
+    <version>2.9</version>
   </parent>
 
   <licenses>
@@ -28,6 +28,12 @@
     <tag>HEAD</tag>
   </scm>
 
+  <properties>
+    <jenkins-test-harness.version>1.466</jenkins-test-harness.version>
+    <jenkins.version>1.466</jenkins.version>
+    <java.level>6</java.level>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
@@ -46,18 +52,8 @@
         </exclusion>
       </exclusions>
     </dependency>
-      <dependency>
-          <groupId>com.google.code.findbugs</groupId>
-          <artifactId>annotations</artifactId>
-          <version>3.0.0</version>
-      </dependency>
   </dependencies>
 
-  <properties>
-    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
-
     <repositories>
         <repository>
             <id>repo.jenkins-ci.org</id>
@@ -71,22 +67,28 @@
             <url>http://repo.jenkins-ci.org/public/</url>
         </pluginRepository>
     </pluginRepositories>
-
+    
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <version>2.5.1</version>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>3.0.1</version>
-                <configuration>
-                    <xmlOutput>true</xmlOutput>
-                    <failOnError>false</failOnError>
-                </configuration>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>display-info</id>
+                        <configuration>
+                            <rules>
+                                <bannedDependencies>
+                                    <excludes>
+                                        <exclude>log4j:log4j:*:jar:compile</exclude>
+                                        <exclude>log4j:log4j:*:jar:runtime</exclude>
+                                        <exclude>commons-logging:commons-logging:*:jar:compile</exclude>
+                                        <exclude>commons-logging:commons-logging:*:jar:runtime</exclude>
+                                    </excludes>
+                                </bannedDependencies>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>

diff --git a/src/main/java/hudson/plugins/build_timeout/BuildTimeOutStrategy.java b/src/main/java/hudson/plugins/build_timeout/BuildTimeOutStrategy.java
@@ -73,12 +73,12 @@ public void onWrite(AbstractBuild<?,?> build, byte b[], int length) {
     }
 
     /**
-     * Decides whether to call {@link BuildTimeOutStrategy.onWrite}
+     * Decides whether to call {@link #onWrite(AbstractBuild, byte[], int)}
      * 
-     * For performance reason, {@link BuildTimeOutStrategy.onWrite} is called
+     * For performance reason, {@link #onWrite(AbstractBuild, byte[], int)} is called
      * only when subclass overrides it.
      * 
-     * @return true to call {@link BuildTimeOutStrategy.onWrite}
+     * @return true to call {@link #onWrite(AbstractBuild, byte[], int)}
      */
     public boolean wantsCaptureLog() {
         try {

diff --git a/src/main/java/hudson/plugins/build_timeout/impl/DeadlineTimeOutStrategy.java b/src/main/java/hudson/plugins/build_timeout/impl/DeadlineTimeOutStrategy.java
@@ -20,7 +20,7 @@
 /**
  * If the build reaches <tt>deadlineTime</tt>, it will be terminated.
  * 
- * @author Fernando Miguélez Palomo <fernando.miguelez@gmail.com>
+ * @author Fernando Miguélez Palomo (fernando.miguelez@gmail.com)
  */
 public class DeadlineTimeOutStrategy extends BuildTimeOutStrategy {
 

diff --git a/src/main/java/hudson/plugins/build_timeout/impl/LikelyStuckTimeOutStrategy.java b/src/main/java/hudson/plugins/build_timeout/impl/LikelyStuckTimeOutStrategy.java
@@ -19,7 +19,7 @@
 /**
  * Get the time considered it stuck.
  *
- * @return 10 times as much as eta if eta is available, else 24 hours.
+ * Return 10 times as much as eta if eta is available, else 24 hours.
  * @see Executor#isLikelyStuck()
  */
 public class LikelyStuckTimeOutStrategy extends BuildTimeOutStrategy {

diff --git a/src/main/java/hudson/plugins/build_timeout/impl/NoActivityTimeOutStrategy.java b/src/main/java/hudson/plugins/build_timeout/impl/NoActivityTimeOutStrategy.java
@@ -75,7 +75,7 @@ private Object readResolve() {
     }
 
     /**
-     * @param timeoutSeconds
+     * @param timeoutSecondsString
      */
     @DataBoundConstructor
     public NoActivityTimeOutStrategy(String timeoutSecondsString) {

diff --git a/src/main/resources/index.jelly b/src/main/resources/index.jelly
@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <div>
   This plugin allows builds to be automatically terminated after the
   specified amount of time has elapsed.