Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Arthorne2013-07-11 09:30:46 -0400
committerJohn Arthorne2013-07-11 09:30:46 -0400
commit2b28d8f331bbcc60a31a35a2027c3d08d493bfef (patch)
tree2277bdcb476ae25d6adc0dead6adacdf728d010e
parentd88feb633029d59adb5c06dc0dae5e7a810359c2 (diff)
downloadrt.equinox.p2-2b28d8f331bbcc60a31a35a2027c3d08d493bfef.tar.gz
rt.equinox.p2-2b28d8f331bbcc60a31a35a2027c3d08d493bfef.tar.xz
rt.equinox.p2-2b28d8f331bbcc60a31a35a2027c3d08d493bfef.zip
Bug 411623 - Unanticipated comparator errors in I20130625-0800
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/.settings/.api_filters283
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.equinox.p2.operations/pom.xml2
3 files changed, 272 insertions, 15 deletions
diff --git a/bundles/org.eclipse.equinox.p2.operations/.settings/.api_filters b/bundles/org.eclipse.equinox.p2.operations/.settings/.api_filters
index 365f96f8d..6548f0d4c 100644
--- a/bundles/org.eclipse.equinox.p2.operations/.settings/.api_filters
+++ b/bundles/org.eclipse.equinox.p2.operations/.settings/.api_filters
@@ -1,27 +1,284 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<component id="org.eclipse.equinox.p2.operations" version="2">
- <resource path="META-INF/MANIFEST.MF">
- <filter id="923795461">
+ <resource path="src/org/eclipse/equinox/internal/p2/operations/RequestFlexer.java" type="org.eclipse.equinox.internal.p2.operations.RequestFlexer">
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="640712815">
<message_arguments>
- <message_argument value="2.3.0"/>
- <message_argument value="2.2.0"/>
+ <message_argument value="IPlanner"/>
+ <message_argument value="RequestFlexer"/>
+ <message_argument value="updatesFor(IInstallableUnit, ProvisioningContext, IProgressMonitor)"/>
</message_arguments>
</filter>
</resource>
- <resource path="META-INF/MANIFEST.MF" type="org.eclipse.equinox.p2.operations.RelaxedUpdateInstallOperation">
- <filter id="305324134">
+ <resource path="src/org/eclipse/equinox/p2/operations/RemediationOperation.java" type="org.eclipse.equinox.p2.operations.RemediationOperation">
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
<message_arguments>
- <message_argument value="org.eclipse.equinox.p2.operations.RelaxedUpdateInstallOperation"/>
- <message_argument value="org.eclipse.equinox.p2.operations_2.3.0"/>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemediationOperation"/>
+ <message_argument value="bestSolutionChangingTheRequest()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemediationOperation"/>
+ <message_argument value="bestSolutionChangingWhatIsInstalled()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemediationOperation"/>
+ <message_argument value="computeProfileChangeRequest(MultiStatus, IProgressMonitor)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemediationOperation"/>
+ <message_argument value="getCurrentRemedy()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemediationOperation"/>
+ <message_argument value="getOriginalRequest()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemediationOperation"/>
+ <message_argument value="getProvisioningJob(IProgressMonitor)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemediationOperation"/>
+ <message_argument value="getProvisioningJobName()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemediationOperation"/>
+ <message_argument value="getRemedies()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemediationOperation"/>
+ <message_argument value="getRemedyConfigs()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemediationOperation"/>
+ <message_argument value="getResolutionResult()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemediationOperation"/>
+ <message_argument value="getResolveJobName()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemediationOperation"/>
+ <message_argument value="setCurrentRemedy(Remedy)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338948223">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemediationOperation"/>
+ <message_argument value="RemediationOperation(ProvisioningSession, IProfileChangeRequest)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338948223">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemediationOperation"/>
+ <message_argument value="RemediationOperation(ProvisioningSession, IProfileChangeRequest, RemedyConfig[])"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="643842064">
+ <message_arguments>
+ <message_argument value="ProfileChangeRequest"/>
+ <message_argument value="RemediationOperation"/>
+ <message_argument value="getOriginalRequest()"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/equinox/p2/operations/Remedy.java" type="org.eclipse.equinox.p2.operations.Remedy">
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.Remedy"/>
+ <message_argument value="addRemedyIUDetail(RemedyIUDetail)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.Remedy"/>
+ <message_argument value="getBeingInstalledRelaxedWeight()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.Remedy"/>
+ <message_argument value="getConfig()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.Remedy"/>
+ <message_argument value="getInstallationRelaxedWeight()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.Remedy"/>
+ <message_argument value="getIusDetails()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.Remedy"/>
+ <message_argument value="getOriginalRequest()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.Remedy"/>
+ <message_argument value="getRequest()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.Remedy"/>
+ <message_argument value="setBeingInstalledRelaxedWeight(int)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.Remedy"/>
+ <message_argument value="setConfig(RemedyConfig)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.Remedy"/>
+ <message_argument value="setInstallationRelaxedWeight(int)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.Remedy"/>
+ <message_argument value="setRequest(ProfileChangeRequest)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338948223">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.Remedy"/>
+ <message_argument value="Remedy(IProfileChangeRequest)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="643842064">
+ <message_arguments>
+ <message_argument value="ProfileChangeRequest"/>
+ <message_argument value="Remedy"/>
+ <message_argument value="getRequest()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="643846161">
+ <message_arguments>
+ <message_argument value="ProfileChangeRequest"/>
+ <message_argument value="Remedy"/>
+ <message_argument value="setRequest(ProfileChangeRequest)"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/equinox/p2/operations/RemedyConfig.java" type="org.eclipse.equinox.p2.operations.RemedyConfig">
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemedyConfig"/>
+ <message_argument value="getAllRemedyConfigs()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemedyConfig"/>
+ <message_argument value="getCheckForUpdateRemedyConfigs()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338948223">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemedyConfig"/>
+ <message_argument value="RemedyConfig()"/>
+ </message_arguments>
+ </filter>
+ </resource>
+ <resource path="src/org/eclipse/equinox/p2/operations/RemedyIUDetail.java" type="org.eclipse.equinox.p2.operations.RemedyIUDetail">
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemedyIUDetail"/>
+ <message_argument value="getBeingInstalledVersion()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemedyIUDetail"/>
+ <message_argument value="getInstalledVersion()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemedyIUDetail"/>
+ <message_argument value="getIu()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemedyIUDetail"/>
+ <message_argument value="getRequestedVersion()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemedyIUDetail"/>
+ <message_argument value="getStatus()"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemedyIUDetail"/>
+ <message_argument value="setBeingInstalledVersion(Version)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemedyIUDetail"/>
+ <message_argument value="setInstalledVersion(Version)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemedyIUDetail"/>
+ <message_argument value="setRequestedVersion(Version)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338944126">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemedyIUDetail"/>
+ <message_argument value="setStatus(int)"/>
+ </message_arguments>
+ </filter>
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="338948223">
+ <message_arguments>
+ <message_argument value="org.eclipse.equinox.p2.operations.RemedyIUDetail"/>
+ <message_argument value="RemedyIUDetail(IInstallableUnit)"/>
</message_arguments>
</filter>
</resource>
- <resource path="src/org/eclipse/equinox/p2/operations/ProfileChangeOperation.java" type="org.eclipse.equinox.p2.operations.ProfileChangeOperation">
- <filter id="338792546">
+ <resource path="src/org/eclipse/equinox/p2/operations/UpdateOperation.java" type="org.eclipse.equinox.p2.operations.UpdateOperation">
+ <filter comment="Workaround for bug 411257: .api_description files in Kepler release do not contain @noreference restrictions" id="640712815">
<message_arguments>
- <message_argument value="org.eclipse.equinox.p2.operations.ProfileChangeOperation"/>
- <message_argument value="getProfileChangeRequest()"/>
+ <message_argument value="IPlanner"/>
+ <message_argument value="UpdateOperation"/>
+ <message_argument value="updatesFor(IInstallableUnit, ProvisioningContext, IProgressMonitor)"/>
</message_arguments>
</filter>
</resource>
-</component>
+</component> \ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.p2.operations/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.operations/META-INF/MANIFEST.MF
index 322a1a4fb..03f7db699 100644
--- a/bundles/org.eclipse.equinox.p2.operations/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.p2.operations/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.equinox.p2.operations;singleton:=true
-Bundle-Version: 2.3.0.qualifier
+Bundle-Version: 2.4.0.qualifier
Bundle-Activator: org.eclipse.equinox.internal.p2.operations.Activator
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.p2.operations/pom.xml b/bundles/org.eclipse.equinox.p2.operations/pom.xml
index aba1d7163..283be76e9 100644
--- a/bundles/org.eclipse.equinox.p2.operations/pom.xml
+++ b/bundles/org.eclipse.equinox.p2.operations/pom.xml
@@ -19,6 +19,6 @@
</parent>
<groupId>org.eclipse.equinox</groupId>
<artifactId>org.eclipse.equinox.p2.operations</artifactId>
- <version>2.3.0-SNAPSHOT</version>
+ <version>2.4.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>

Back to the top