REOPENED - bug 349351: fixed environment definitions
https://bugs.eclipse.org/bugs/show_bug.cgi?id=349351
diff --git a/org.eclipse.mylyn.incubator-site/pom.xml b/org.eclipse.mylyn.incubator-site/pom.xml
index 410a4ad..a2e5ae4 100644
--- a/org.eclipse.mylyn.incubator-site/pom.xml
+++ b/org.eclipse.mylyn.incubator-site/pom.xml
@@ -44,14 +44,19 @@
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
+ <version>${tycho-version}</version>
<configuration>
- <resolver>p2</resolver>
<environments>
<environment>
<os>win32</os>
+ <ws>win32</ws>
<arch>x86</arch>
</environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
</environments>
</configuration>
</plugin>
diff --git a/org.eclipse.mylyn.sandbox.search-feature/pom.xml b/org.eclipse.mylyn.sandbox.search-feature/pom.xml
index 4ab6033..abc807a 100644
--- a/org.eclipse.mylyn.sandbox.search-feature/pom.xml
+++ b/org.eclipse.mylyn.sandbox.search-feature/pom.xml
@@ -19,12 +19,17 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
- <resolver>p2</resolver>
<environments>
<environment>
<os>win32</os>
+ <ws>win32</ws>
<arch>x86</arch>
</environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
</environments>
</configuration>
</plugin>
diff --git a/org.eclipse.mylyn.sandbox.search.ui.windows/pom.xml b/org.eclipse.mylyn.sandbox.search.ui.windows/pom.xml
index 9f1ae67..ff7dd66 100644
--- a/org.eclipse.mylyn.sandbox.search.ui.windows/pom.xml
+++ b/org.eclipse.mylyn.sandbox.search.ui.windows/pom.xml
@@ -19,12 +19,17 @@
<artifactId>target-platform-configuration</artifactId>
<version>${tycho-version}</version>
<configuration>
- <resolver>p2</resolver>
<environments>
<environment>
<os>win32</os>
+ <ws>win32</ws>
<arch>x86</arch>
</environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
</environments>
</configuration>
</plugin>
diff --git a/org.eclipse.mylyn.sandbox.search.ui/pom.xml b/org.eclipse.mylyn.sandbox.search.ui/pom.xml
index 82fa2e2..7e117b0 100644
--- a/org.eclipse.mylyn.sandbox.search.ui/pom.xml
+++ b/org.eclipse.mylyn.sandbox.search.ui/pom.xml
@@ -16,20 +16,6 @@
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho-version}</version>
- <configuration>
- <resolver>p2</resolver>
- <environments>
- <environment>
- <os>win32</os>
- <arch>x86</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-source-plugin</artifactId>
</plugin>
<plugin>
