OpenSource/jenkins
1
0 Fork 0
mirror of https://github.com/jenkinsci/jenkins.git synced 2026-11-03 23:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Upgrade installed optional dependencies if necessary"

Browse Source 
This reverts commit eb77e5f20d.
This commit is contained in:
Devin Nusbaum committed 2017-12-18 16:35:23 -05:00
1 parent b98ba8c8ff
commit 6632aef948
1 file changed
+5 -11
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/hudson/PluginManager.java
+5 -11
View File
@@ -645,23 +645,17 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
ServletContext context = Jenkins.getActiveInstance().servletContext;
for (String dependencyToken : dependencyTokens) {
String optionalDepTokenSuffix = ";resolution:=optional";
boolean isOptional = dependencyToken.endsWith(optionalDepTokenSuffix);
if (isOptional) {
dependencyToken = dependencyToken.substring(0, dependencyToken.length() - optionalDepTokenSuffix.length());
if (dependencyToken.endsWith(";resolution:=optional")) {
// ignore optional dependencies
continue;
}
String[] artifactIdVersionPair = dependencyToken.split(":");
String artifactId = artifactIdVersionPair[0];
VersionNumber dependencyVersion = new VersionNumber(artifactIdVersionPair[1]);
PluginManager manager = Jenkins.getInstance().getPluginManager();
PluginManager manager = Jenkins.getActiveInstance().getPluginManager();
VersionNumber installedVersion = manager.getPluginVersion(manager.rootDir, artifactId);
if (isOptional && installedVersion == null) {
// Ignore uninstalled optional dependencies.
continue;
}
if (installedVersion != null && !installedVersion.isOlderThan(dependencyVersion)) {
// Do not downgrade dependencies that are already installed.
continue;