Bug 396093 - Merge in CBI patches from 4.2.2 into 4.3 (pom changes) forv20121210-201226I20130108-0800I20130101-0800I20121225-1600I20121225-0800I20121218-1600I20121218-0800I20121214-0730I20121213-1200I20121212-2000I20121212-0800I20121211-2000I20121211-0800I20121210-2000

equinox.framework

5 files changed, 12 insertions, 8 deletions

diff --git a/bundles/org.eclipse.equinox.executable/pom.xml b/bundles/org.eclipse.equinox.executable/pom.xml
index c30a13647..d6acc5d45 100644
--- a/bundles/org.eclipse.equinox.executable/pom.xml
+++ b/bundles/org.eclipse.equinox.executable/pom.xml
@@ -45,7 +45,7 @@
                 <phase>generate-resources</phase>
                 <configuration>
                   <target>
-                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse_cbi" />
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse" />
                   </target>
                 </configuration>
                 <goals>
@@ -98,7 +98,7 @@
                 <phase>generate-resources</phase>
                 <configuration>
                   <target>
-                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse_cbi" />
+                    <ant antfile="build.xml" dir="library/gtk/" target="build_eclipse" />
                   </target>
                 </configuration>
                 <goals>
@@ -151,7 +151,7 @@
                 <phase>generate-resources</phase>
                 <configuration>
                   <target>
-                    <ant antfile="build.xml" dir="library/win32/" target="build_eclipse_cbi" />
+                    <ant antfile="build.xml" dir="library/win32/" target="build_eclipse" />
                   </target>
                 </configuration>
                 <goals>
@@ -204,7 +204,7 @@
                 <phase>generate-resources</phase>
                 <configuration>
                   <target>
-                    <ant antfile="build.xml" dir="library/win32/" target="build_eclipse_cbi" />
+                    <ant antfile="build.xml" dir="library/win32/" target="build_eclipse" />
                   </target>
                 </configuration>
                 <goals>
@@ -257,7 +257,7 @@
                 <phase>generate-resources</phase>
                 <configuration>
                   <target>
-                    <ant antfile="build.xml" dir="library/carbon/" target="build_eclipse_cbi" />
+                    <ant antfile="build.xml" dir="library/carbon/" target="build_eclipse" />
                   </target>
                 </configuration>
                 <goals>
diff --git a/bundles/org.eclipse.osgi.tests/pom.xml b/bundles/org.eclipse.osgi.tests/pom.xml
index b46c8e27a..73e71a414 100644
--- a/bundles/org.eclipse.osgi.tests/pom.xml
+++ b/bundles/org.eclipse.osgi.tests/pom.xml
@@ -22,7 +22,7 @@
   </parent>
   <groupId>org.eclipse.equinox.framework</groupId>
   <artifactId>org.eclipse.osgi.tests</artifactId>
-  <version>3.8.0-SNAPSHOT</version>
+  <version>3.9.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <build>
diff --git a/bundles/org.eclipse.osgi/pom.xml b/bundles/org.eclipse.osgi/pom.xml
index 6312f97c9..83358a29f 100644
--- a/bundles/org.eclipse.osgi/pom.xml
+++ b/bundles/org.eclipse.osgi/pom.xml
@@ -22,7 +22,7 @@
   </parent>
   <groupId>org.eclipse.equinox.framework</groupId>
   <artifactId>org.eclipse.osgi</artifactId>
-  <version>3.8.1-SNAPSHOT</version>
+  <version>3.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <build>
     <plugins>
diff --git a/bundles/org.eclipse.osgi/supplement/pom.xml b/bundles/org.eclipse.osgi/supplement/pom.xml
index 791924e91..38c9681e7 100644
--- a/bundles/org.eclipse.osgi/supplement/pom.xml
+++ b/bundles/org.eclipse.osgi/supplement/pom.xml
@@ -24,7 +24,7 @@
 
   <groupId>org.eclipse.equinox.framework</groupId>
   <artifactId>org.eclipse.equinox.supplement</artifactId>
-  <version>1.4.100-SNAPSHOT</version>
+  <version>1.5.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 9fe5bc2cc..26aa835d6 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.framework.git</tycho.scmUrl>
+  </properties>
+
   <modules>
     <module>bundles/org.eclipse.osgi</module>
     <module>bundles/org.eclipse.osgi.services</module>