From 3b27301088fd099e401048ff16834c3aaf2c6da2 Mon Sep 17 00:00:00 2001
From: Thanh Ha
Date: Mon, 10 Dec 2012 14:12:26 -0600
Subject: Bug 396093 - Merge in CBI patches from 4.2.2 into 4.3 (pom changes)
for equinox.framework
---
bundles/org.eclipse.equinox.executable/pom.xml | 10 +++++-----
bundles/org.eclipse.osgi.tests/pom.xml | 2 +-
bundles/org.eclipse.osgi/pom.xml | 2 +-
bundles/org.eclipse.osgi/supplement/pom.xml | 2 +-
pom.xml | 4 ++++
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 @@
generate-resources
-
+
@@ -98,7 +98,7 @@
generate-resources
-
+
@@ -151,7 +151,7 @@
generate-resources
-
+
@@ -204,7 +204,7 @@
generate-resources
-
+
@@ -257,7 +257,7 @@
generate-resources
-
+
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 @@
org.eclipse.equinox.framework
org.eclipse.osgi.tests
- 3.8.0-SNAPSHOT
+ 3.9.0-SNAPSHOT
eclipse-test-plugin
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 @@
org.eclipse.equinox.framework
org.eclipse.osgi
- 3.8.1-SNAPSHOT
+ 3.9.0-SNAPSHOT
eclipse-plugin
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 @@
org.eclipse.equinox.framework
org.eclipse.equinox.supplement
- 1.4.100-SNAPSHOT
+ 1.5.0-SNAPSHOT
eclipse-plugin
diff --git a/pom.xml b/pom.xml
index 9fe5bc2cc..26aa835d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,6 +27,10 @@
3.8.0-SNAPSHOT
pom
+
+ scm:git:git://git.eclipse.org/gitroot/equinox/rt.equinox.framework.git
+
+
bundles/org.eclipse.osgi
bundles/org.eclipse.osgi.services
--
cgit v1.2.3