Merge pull request #2 from varyvol/JENKINS-39612

[JENKINS-39612] Update to 2.17 parent POM
jenkinsci · Nov 25, 2016 · 695e874 · 695e874
2 parents b974548 + ce553ca
commit 695e874
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
     <!-- Baseline Jenkins version you use to build and test the plugin. Users must have this version or newer to run. -->
-    <version>1.580.1</version>
+    <version>2.17</version>
     <relativePath />
   </parent>
   <artifactId>variant</artifactId>
@@ -63,4 +63,8 @@
         </plugin>
       </plugins>
     </build>
+  <properties>
+    <jenkins.version>1.580.1</jenkins.version>
+    <java.level>6</java.level>
+  </properties>
 </project>
diff --git a/src/main/java/org/jenkinsci/plugins/variant/OptionalExtensionProcessor.java b/src/main/java/org/jenkinsci/plugins/variant/OptionalExtensionProcessor.java
@@ -3,6 +3,7 @@
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Member;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import hudson.ExtensionFinder.GuiceExtensionAnnotation;
 import hudson.PluginWrapper;
@@ -39,7 +40,7 @@ protected boolean isOptional(OptionalExtension annotation) {
     }
 
     /**
-     * Go up the scope chain (method > class > package > ...)
+     * Go up the scope chain (method &gt; class &gt; package &gt; ...)
      * and make sure any {@link OptionalExtension}s we encounter
      * are satisified.
      */
@@ -74,6 +75,7 @@ protected boolean isActive(AnnotatedElement e) {
         return true;
     }
 
+    @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
     // this function and isActive(OptionalPackage) should be kept identical
     private boolean isActive(OptionalExtension a) {
         try {
@@ -97,6 +99,7 @@ private boolean isActive(OptionalExtension a) {
         return true;
     }
 
+    @SuppressFBWarnings("NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE")
     // this function and isActive(OptionalExtension) should be kept identical
     private boolean isActive(OptionalPackage a) {
         try {