Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSravan Kumar Lakkimsetti2018-09-11 07:52:48 -0400
committerSravan Kumar Lakkimsetti2018-09-12 04:26:54 -0400
commit8e85123c2b8eb876bb2caff9684437ba84a0023f (patch)
tree602f7296c3795f043cb471458b4ca14810c22ce9
parent779ceaf96aee48281987b8f8b4f61b712b17f65e (diff)
downloadeclipse.platform.team-I20180922-1800.tar.gz
eclipse.platform.team-I20180922-1800.tar.xz
eclipse.platform.team-I20180922-1800.zip
Change-Id: Ib8529a10fd3ecf15a82cfc125ffa0d6c8491fdb9 Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r--bundles/org.eclipse.compare.win32/META-INF/p2.inf9
-rw-r--r--bundles/org.eclipse.compare.win32/pom.xml2
-rw-r--r--pom.xml2
3 files changed, 3 insertions, 10 deletions
diff --git a/bundles/org.eclipse.compare.win32/META-INF/p2.inf b/bundles/org.eclipse.compare.win32/META-INF/p2.inf
index d74f69946..4237061a2 100644
--- a/bundles/org.eclipse.compare.win32/META-INF/p2.inf
+++ b/bundles/org.eclipse.compare.win32/META-INF/p2.inf
@@ -1,11 +1,6 @@
# ensure that the applicable implementation fragment gets installed (bug 361901)
requires.0.namespace = org.eclipse.equinox.p2.iu
-requires.0.name = org.eclipse.swt.win32.win32.x86
+requires.0.name = org.eclipse.swt.win32.win32.x86_64
#requires.0.range = [$version$,$version$]
-requires.0.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86))
-
-requires.1.namespace = org.eclipse.equinox.p2.iu
-requires.1.name = org.eclipse.swt.win32.win32.x86_64
-#requires.1.range = [$version$,$version$]
-requires.1.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86_64))
+requires.0.filter = (&(osgi.os=win32)(osgi.ws=win32)(osgi.arch=x86_64))
diff --git a/bundles/org.eclipse.compare.win32/pom.xml b/bundles/org.eclipse.compare.win32/pom.xml
index ec473fd65..dec2e8192 100644
--- a/bundles/org.eclipse.compare.win32/pom.xml
+++ b/bundles/org.eclipse.compare.win32/pom.xml
@@ -35,7 +35,7 @@
<environment>
<os>win32</os>
<ws>win32</ws>
- <arch>x86</arch>
+ <arch>x86_64</arch>
</environment>
</environments>
</configuration>
diff --git a/pom.xml b/pom.xml
index 92b1528de..58989dc24 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,9 +74,7 @@
<module>features/org.eclipse.cvs-feature</module>
<!-- creatively located fragments -->
- <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86</module>
<module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64</module>
- <module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86</module>
<module>bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64</module>
<module>tests</module>

Back to the top