| commit | ecdcce0a50cf785ce73407aae221ffee755eed2c | [log] [tgz] |
|---|---|---|
| author | Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com> | Tue Apr 14 13:16:02 2020 +0530 |
| committer | Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com> | Tue Apr 14 06:28:57 2020 -0400 |
| tree | a974694a3f3cd63667b7303db2c8e81be4f2bc71 | |
| parent | 4e1f5fc82f5157b5115daee8622a13f0df67d185 [diff] |
Bug 562089 - Comparator errors in I20200413-1800 Change-Id: I562122bf89c53de445849810d87b2f81b6c0aeb5 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF index 1fc21b6..72e0795 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.equinox.p2.reconciler.dropins;singleton:=true -Bundle-Version: 1.3.300.qualifier +Bundle-Version: 1.3.400.qualifier Bundle-Activator: org.eclipse.equinox.internal.p2.reconciler.dropins.Activator Bundle-Vendor: %providerName Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml b/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml index 013b7fc..60989e8 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/pom.xml
@@ -9,6 +9,6 @@ </parent> <groupId>org.eclipse.equinox</groupId> <artifactId>org.eclipse.equinox.p2.reconciler.dropins</artifactId> - <version>1.3.300-SNAPSHOT</version> + <version>1.3.400-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project>
diff --git a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java index 93064cd..42a5fcf 100644 --- a/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java +++ b/bundles/org.eclipse.equinox.p2.reconciler.dropins/src/org/eclipse/equinox/internal/p2/reconciler/dropins/ProfileSynchronizer.java
@@ -218,7 +218,7 @@ } // We are now creating a backup of the original request that will be used to create the final plan (where no optional magic is used) - ProfileChangeRequest finalRequest = (ProfileChangeRequest) request.clone(); + ProfileChangeRequest finalRequest = request.clone(); // otherwise collect the roots, pretend they are optional, and see // if the resulting plan affects them