[JENKINS-21486] Check Jenkins version if the flag is set

And don't fail if no version can be found.
jenkinsci · Apr 1, 2016 · 91e8400 · 91e8400
1 parent 57e73a3
commit 91e8400
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java
@@ -549,12 +549,14 @@ public boolean hasLicensesXml() {
      *             thrown if one or several mandatory dependencies doesn't exists.
      */
     /*package*/ void resolvePluginDependencies() throws IOException {
-        String requiredCoreVersion = getRequiredCoreVersion();
-        if (requiredCoreVersion == null) {
-            throw new IOException(shortName + " doesn't declare required core version.");
-        } else {
-            if (Jenkins.getVersion().isOlderThan(new VersionNumber(requiredCoreVersion))) {
-                throw new IOException(shortName + " requires a more recent core version (" + requiredCoreVersion + ") than the current (" + Jenkins.getVersion() + ").");
+        if (ENABLE_PLUGIN_DEPENDENCIES_VERSION_CHECK) {
+            String requiredCoreVersion = getRequiredCoreVersion();
+            if (requiredCoreVersion == null) {
+                LOGGER.warning(shortName + " doesn't declare required core version.");
+            } else {
+                if (Jenkins.getVersion().isOlderThan(new VersionNumber(requiredCoreVersion))) {
+                    throw new IOException(shortName + " requires a more recent core version (" + requiredCoreVersion + ") than the current (" + Jenkins.getVersion() + ").");
+                }
             }
         }
         List<String> missingDependencies = new ArrayList<String>();