Bug 396104 - Merge in CBI patches from 4.2.2 into 4.3 (pom changes) for eclipse.swt

12 files changed, 53 insertions, 15 deletions

diff --git a/bundles/org.eclipse.swt.tools/pom.xml b/bundles/org.eclipse.swt.tools/pom.xml
index 4763c6a561..985f8a8b88 100644
--- a/bundles/org.eclipse.swt.tools/pom.xml
+++ b/bundles/org.eclipse.swt.tools/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>eclipse.platform.swt</groupId>
   <artifactId>org.eclipse.swt.tools</artifactId>
-  <version>3.100.0-SNAPSHOT</version>
+  <version>3.101.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.swt/pom.xml b/bundles/org.eclipse.swt/pom.xml
index 7e35ce5835..8424f1bbaa 100644
--- a/bundles/org.eclipse.swt/pom.xml
+++ b/bundles/org.eclipse.swt/pom.xml
@@ -8,10 +8,12 @@
  
   Contributors:
      Igor Fedorenko - initial implementation
+     Krzysztof Daniel, Red Hat, Inc. - building native SWT parts.
 -->
 
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project 
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+  xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <artifactId>eclipse.platform.swt</artifactId>
@@ -21,6 +23,19 @@
   </parent>
   <groupId>eclipse.platform.swt</groupId>
   <artifactId>org.eclipse.swt</artifactId>
-  <version>3.100.0-SNAPSHOT</version>
+  <version>3.101.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <dependency-resolution>
+            <optionalDependencies>ignore</optionalDependencies>
+          </dependency-resolution>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/examples/org.eclipse.swt.examples.browser.demos/pom.xml b/examples/org.eclipse.swt.examples.browser.demos/pom.xml
index 304bc38ae7..c73f03649c 100644
--- a/examples/org.eclipse.swt.examples.browser.demos/pom.xml
+++ b/examples/org.eclipse.swt.examples.browser.demos/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>eclipse.platform.swt</groupId>
   <artifactId>org.eclipse.swt.examples.browser.demos</artifactId>
-  <version>3.1.200-SNAPSHOT</version>
+  <version>3.101.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/examples/org.eclipse.swt.examples.browser/pom.xml b/examples/org.eclipse.swt.examples.browser/pom.xml
index ce134d02fd..8f3d4f0449 100644
--- a/examples/org.eclipse.swt.examples.browser/pom.xml
+++ b/examples/org.eclipse.swt.examples.browser/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>eclipse.platform.swt</groupId>
   <artifactId>org.eclipse.swt.examples.browser</artifactId>
-  <version>3.1.100-SNAPSHOT</version>
+  <version>3.101.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/examples/org.eclipse.swt.examples.controls/pom.xml b/examples/org.eclipse.swt.examples.controls/pom.xml
index 18ea9db0ed..a2e3a9ab1d 100644
--- a/examples/org.eclipse.swt.examples.controls/pom.xml
+++ b/examples/org.eclipse.swt.examples.controls/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>eclipse.platform.swt</groupId>
   <artifactId>org.eclipse.swt.examples.controls</artifactId>
-  <version>3.1.100-SNAPSHOT</version>
+  <version>3.101.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/examples/org.eclipse.swt.examples.launcher/pom.xml b/examples/org.eclipse.swt.examples.launcher/pom.xml
index 62fbeb5efa..0576567584 100644
--- a/examples/org.eclipse.swt.examples.launcher/pom.xml
+++ b/examples/org.eclipse.swt.examples.launcher/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>eclipse.platform.swt</groupId>
   <artifactId>org.eclipse.swt.examples.launcher</artifactId>
-  <version>3.1.100-SNAPSHOT</version>
+  <version>3.101.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/examples/org.eclipse.swt.examples.layouts/pom.xml b/examples/org.eclipse.swt.examples.layouts/pom.xml
index 92567bd7c7..0d4fd1a105 100644
--- a/examples/org.eclipse.swt.examples.layouts/pom.xml
+++ b/examples/org.eclipse.swt.examples.layouts/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>eclipse.platform.swt</groupId>
   <artifactId>org.eclipse.swt.examples.layouts</artifactId>
-  <version>3.1.100-SNAPSHOT</version>
+  <version>3.101.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/examples/org.eclipse.swt.examples.ole.win32/pom.xml b/examples/org.eclipse.swt.examples.ole.win32/pom.xml
index c3fbd511b2..4127ab4e36 100644
--- a/examples/org.eclipse.swt.examples.ole.win32/pom.xml
+++ b/examples/org.eclipse.swt.examples.ole.win32/pom.xml
@@ -21,6 +21,30 @@
   </parent>
   <groupId>eclipse.platform.swt</groupId>
   <artifactId>org.eclipse.swt.examples.ole.win32</artifactId>
-  <version>3.1.100-SNAPSHOT</version>
+  <version>3.101.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <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>
+    </plugins>
+  </build>
 </project>
diff --git a/examples/org.eclipse.swt.examples.paint/pom.xml b/examples/org.eclipse.swt.examples.paint/pom.xml
index 793e594549..e1ac16d1ea 100644
--- a/examples/org.eclipse.swt.examples.paint/pom.xml
+++ b/examples/org.eclipse.swt.examples.paint/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>eclipse.platform.swt</groupId>
   <artifactId>org.eclipse.swt.examples.paint</artifactId>
-  <version>3.1.100-SNAPSHOT</version>
+  <version>3.101.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/examples/org.eclipse.swt.examples/pom.xml b/examples/org.eclipse.swt.examples/pom.xml
index 0da4669b70..d61497b60c 100644
--- a/examples/org.eclipse.swt.examples/pom.xml
+++ b/examples/org.eclipse.swt.examples/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>eclipse.platform.swt</groupId>
   <artifactId>org.eclipse.swt.examples</artifactId>
-  <version>3.100.0-SNAPSHOT</version>
+  <version>3.101.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/pom.xml b/pom.xml
index 11314cd953..00237862e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,6 +19,7 @@
     <groupId>org.eclipse</groupId>
     <artifactId>eclipse-parent</artifactId>
     <version>1.0.0-SNAPSHOT</version>
+    <relativePath>../eclipse-parent</relativePath>
   </parent>
 
   <groupId>eclipse.platform.swt</groupId>
@@ -31,7 +32,6 @@
   </properties>
 
   <modules>
-<!-- 
     <module>bundles/org.eclipse.swt</module>
     <module>bundles/org.eclipse.swt.opengl</module>
     <module>bundles/org.eclipse.swt.tools</module>
@@ -43,7 +43,6 @@
     <module>examples/org.eclipse.swt.examples.layouts</module>
     <module>examples/org.eclipse.swt.examples.ole.win32</module>
     <module>examples/org.eclipse.swt.examples.paint</module>
- -->
     <module>tests/org.eclipse.swt.tests</module>
   </modules>
 </project>
diff --git a/tests/org.eclipse.swt.tests/pom.xml b/tests/org.eclipse.swt.tests/pom.xml
index 416fb3a2dd..0469fee4ff 100644
--- a/tests/org.eclipse.swt.tests/pom.xml
+++ b/tests/org.eclipse.swt.tests/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>eclipse.platform.swt</groupId>
   <artifactId>org.eclipse.swt.tests</artifactId>
-  <version>3.100.0-SNAPSHOT</version>
+  <version>3.101.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>