Bug 396094 - Merge in CBI patches from 4.2.2 into 4.3 (pom changes) forv20121210-201919I20121218-0800I20121214-0730I20121213-1200I20121212-2000I20121212-0800I20121211-2000I20121211-0800I20121210-2000

equinox.bundles

12 files changed, 106 insertions, 8 deletions

diff --git a/bundles/org.eclipse.equinox.bidi/pom.xml b/bundles/org.eclipse.equinox.bidi/pom.xml
index 440502dc3..f2dc4f452 100644
--- a/bundles/org.eclipse.equinox.bidi/pom.xml
+++ b/bundles/org.eclipse.equinox.bidi/pom.xml
@@ -21,7 +21,7 @@
   </parent>
   <groupId>org.eclipse.equinox.bundles</groupId>
   <artifactId>org.eclipse.equinox.bidi</artifactId>
-  <version>0.9.0-SNAPSHOT</version>
+  <version>0.10.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/bundles/org.eclipse.equinox.console/pom.xml b/bundles/org.eclipse.equinox.console/pom.xml
index 175f3bb34..c80e983fc 100644
--- a/bundles/org.eclipse.equinox.console/pom.xml
+++ b/bundles/org.eclipse.equinox.console/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>org.eclipse.equinox.bundles</groupId>
   <artifactId>org.eclipse.equinox.console</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.coordinator/pom.xml b/bundles/org.eclipse.equinox.coordinator/pom.xml
index 2320e0a34..4ae46f6f7 100644
--- a/bundles/org.eclipse.equinox.coordinator/pom.xml
+++ b/bundles/org.eclipse.equinox.coordinator/pom.xml
@@ -22,6 +22,6 @@
   </parent>
   <groupId>org.eclipse.equinox.bundles</groupId>
   <artifactId>org.eclipse.equinox.coordinator</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.ds.tests/pom.xml b/bundles/org.eclipse.equinox.ds.tests/pom.xml
index 02d0779af..ba1e6bdbf 100644
--- a/bundles/org.eclipse.equinox.ds.tests/pom.xml
+++ b/bundles/org.eclipse.equinox.ds.tests/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>org.eclipse.equinox.bundles</groupId>
   <artifactId>org.eclipse.equinox.ds.tests</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.2.100-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.ds/pom.xml b/bundles/org.eclipse.equinox.ds/pom.xml
index 0063f50c5..e84972c26 100644
--- a/bundles/org.eclipse.equinox.ds/pom.xml
+++ b/bundles/org.eclipse.equinox.ds/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>org.eclipse.equinox.bundles</groupId>
   <artifactId>org.eclipse.equinox.ds</artifactId>
-  <version>1.4.0-SNAPSHOT</version>
+  <version>1.4.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.event/pom.xml b/bundles/org.eclipse.equinox.event/pom.xml
index f61e174df..0123f2937 100644
--- a/bundles/org.eclipse.equinox.event/pom.xml
+++ b/bundles/org.eclipse.equinox.event/pom.xml
@@ -22,7 +22,7 @@
   </parent>
   <groupId>org.eclipse.equinox.bundles</groupId>
   <artifactId>org.eclipse.equinox.event</artifactId>
-  <version>1.2.200-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/bundles/org.eclipse.equinox.http.jetty8/pom.xml b/bundles/org.eclipse.equinox.http.jetty8/pom.xml
index 82078ea90..b6bd02e59 100644
--- a/bundles/org.eclipse.equinox.http.jetty8/pom.xml
+++ b/bundles/org.eclipse.equinox.http.jetty8/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>org.eclipse.equinox.bundles</groupId>
   <artifactId>org.eclipse.equinox.http.jetty</artifactId>
-  <version>3.0.0-SNAPSHOT</version>
+  <version>3.0.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.equinox.metatype/pom.xml b/bundles/org.eclipse.equinox.metatype/pom.xml
index f73ad6c31..27c9cbf24 100644
--- a/bundles/org.eclipse.equinox.metatype/pom.xml
+++ b/bundles/org.eclipse.equinox.metatype/pom.xml
@@ -22,7 +22,7 @@
   </parent>
   <groupId>org.eclipse.equinox.bundles</groupId>
   <artifactId>org.eclipse.equinox.metatype</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/bundles/org.eclipse.equinox.transforms.hook/pom.xml b/bundles/org.eclipse.equinox.transforms.hook/pom.xml
index 47372c96b..5c0b93cd0 100644
--- a/bundles/org.eclipse.equinox.transforms.hook/pom.xml
+++ b/bundles/org.eclipse.equinox.transforms.hook/pom.xml
@@ -23,4 +23,18 @@
   <artifactId>org.eclipse.equinox.transforms.hook</artifactId>
   <version>1.0.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <!-- workaround for build issue
+               Missing Constraint: Bundle-RequiredExecutionEnvironment: J2SE-1.5 -->
+          <executionEnvironment>J2SE-1.5</executionEnvironment>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/features/org.eclipse.equinox.core.feature/pom.xml b/features/org.eclipse.equinox.core.feature/pom.xml
index 1ab71c797..7ab076d9b 100644
--- a/features/org.eclipse.equinox.core.feature/pom.xml
+++ b/features/org.eclipse.equinox.core.feature/pom.xml
@@ -25,4 +25,46 @@
   <version>1.1.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <id>copy-resources-win32.win32.x86</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <overwrite>true</overwrite>
+              <outputDirectory>${basedir}/executables/win32.win32.x86</outputDirectory>
+              <resources>          
+                <resource>
+                  <directory>../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86</directory>
+                </resource>
+              </resources>              
+            </configuration>            
+          </execution>
+          <execution>
+            <id>copy-resources-win32.win32.x86_64</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <overwrite>true</overwrite>
+              <outputDirectory>${basedir}/executables/win32.win32.x86_64</outputDirectory>
+              <resources>          
+                <resource>
+                  <directory>../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86_64</directory>
+                </resource>
+              </resources>              
+            </configuration>            
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/features/org.eclipse.equinox.starterkit.product.feature/pom.xml b/features/org.eclipse.equinox.starterkit.product.feature/pom.xml
index 0f7693eba..033a9c5a7 100644
--- a/features/org.eclipse.equinox.starterkit.product.feature/pom.xml
+++ b/features/org.eclipse.equinox.starterkit.product.feature/pom.xml
@@ -61,6 +61,44 @@
           </environments>
         </configuration>
       </plugin>
+      <plugin>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.6</version>
+        <executions>
+          <execution>
+            <id>copy-resources-win32.win32.x86</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <overwrite>true</overwrite>
+              <outputDirectory>${basedir}/executables/win32.win32.x86</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-resources-win32.win32.x86_64</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>copy-resources</goal>
+            </goals>
+            <configuration>
+              <overwrite>true</overwrite>
+              <outputDirectory>${basedir}/executables/win32.win32.x86_64</outputDirectory>
+              <resources>
+                <resource>
+                  <directory>../../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/win32/win32/x86_64</directory>
+                </resource>
+              </resources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 
diff --git a/pom.xml b/pom.xml
index 67191e444..a3d51d0cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,10 @@
   <version>3.8.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+  <properties>
+    <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/equinox/rt.equinox.bundles.git</tycho.scmUrl>
+  </properties>
+
   <modules>
     <module>bundles/org.eclipse.equinox.security.ui</module>
     <module>features/org.eclipse.equinox.compendium.sdk</module>