From 91e8400ea1ced342c5f11a6499c91beee56542ba Mon Sep 17 00:00:00 2001 From: Vincent Latombe Date: Fri, 1 Apr 2016 15:48:18 +0200 Subject: [PATCH] [JENKINS-21486] Check Jenkins version if the flag is set And don't fail if no version can be found. --- core/src/main/java/hudson/PluginWrapper.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/hudson/PluginWrapper.java b/core/src/main/java/hudson/PluginWrapper.java index 38b5368a1cae..dd4096f3a0f3 100644 --- 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 missingDependencies = new ArrayList();