Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2017-05-17 13:58:08 -0400
committerThomas Watson2017-05-23 12:10:28 -0400
commit1c986bddd9de0ef58d3a591bc7a92c45fecff325 (patch)
treeaa2413e25b9450bdef731db78a9c18e2dec05f7d /bundles/org.eclipse.equinox.frameworkadmin.equinox
parent9cdd05fbf9fe7f19d4b7d1cff9f58385b3b3f2aa (diff)
downloadrt.equinox.p2-1c986bddd9de0ef58d3a591bc7a92c45fecff325.tar.gz
rt.equinox.p2-1c986bddd9de0ef58d3a591bc7a92c45fecff325.tar.xz
rt.equinox.p2-1c986bddd9de0ef58d3a591bc7a92c45fecff325.zip
[Bug 516827] Disable uses conflict checking while resolvingI20170524-0800I20170523-2000
Change-Id: Ib511e1a210f57473602851d9c7e98f2e3694c81d Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Diffstat (limited to 'bundles/org.eclipse.equinox.frameworkadmin.equinox')
-rw-r--r--bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java
index 5f73c62f3..f5bba50d3 100644
--- a/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java
+++ b/bundles/org.eclipse.equinox.frameworkadmin.equinox/src/org/eclipse/equinox/internal/frameworkadmin/equinox/EquinoxBundlesState.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2015 IBM Corporation and others.
+ * Copyright (c) 2007, 2017 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -638,6 +638,8 @@ public class EquinoxBundlesState implements BundlesState {
}
}
}
+ // TODO ignore uses directive for resolution here
+ platformProperties.put("osgi.resolver.usesMode", "ignore"); //$NON-NLS-1$ //$NON-NLS-2$
state.setPlatformProperties(platformProperties);
}

Back to the top