Fixed bug 396087: Merge in CBI patches from 4.2.2 into 4.3 (pom changes)v20121210-135122I20121211-2000I20121211-0800I20121210-2000

for eclipse.jdt.ui

8 files changed, 19 insertions, 6 deletions

diff --git a/org.eclipse.jdt.astview.feature/pom.xml b/org.eclipse.jdt.astview.feature/pom.xml
index d44741473e..08721b8154 100644
--- a/org.eclipse.jdt.astview.feature/pom.xml
+++ b/org.eclipse.jdt.astview.feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>eclipse.jdt.ui</groupId>
   <artifactId>org.eclipse.jdt.astview.feature</artifactId>
-  <version>1.1.8</version>
+  <version>1.1.8-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.jdt.jeview.feature/pom.xml b/org.eclipse.jdt.jeview.feature/pom.xml
index 2862102821..a5bebdd0ba 100644
--- a/org.eclipse.jdt.jeview.feature/pom.xml
+++ b/org.eclipse.jdt.jeview.feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>eclipse.jdt.ui</groupId>
   <artifactId>org.eclipse.jdt.jeview.feature</artifactId>
-  <version>1.0.8</version>
+  <version>1.0.8-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/org.eclipse.jdt.junit.runtime/pom.xml b/org.eclipse.jdt.junit.runtime/pom.xml
index 3e97d0c4d7..ce07dd0957 100644
--- a/org.eclipse.jdt.junit.runtime/pom.xml
+++ b/org.eclipse.jdt.junit.runtime/pom.xml
@@ -22,4 +22,16 @@
   <artifactId>org.eclipse.jdt.junit.runtime</artifactId>
   <version>3.4.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <!-- observed BREE as of Juno -->
+          <executionEnvironment>J2SE-1.4</executionEnvironment>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/org.eclipse.jdt.text.tests/pom.xml b/org.eclipse.jdt.text.tests/pom.xml
index d14b3c3ac0..6af3bcbb06 100644
--- a/org.eclipse.jdt.text.tests/pom.xml
+++ b/org.eclipse.jdt.text.tests/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>eclipse.jdt.ui</groupId>
   <artifactId>org.eclipse.jdt.text.tests</artifactId>
-  <version>3.8.0-SNAPSHOT</version>
+  <version>3.9.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/org.eclipse.jdt.ui.tests.refactoring/pom.xml b/org.eclipse.jdt.ui.tests.refactoring/pom.xml
index 6a0e9cb11a..ff1fb6a728 100644
--- a/org.eclipse.jdt.ui.tests.refactoring/pom.xml
+++ b/org.eclipse.jdt.ui.tests.refactoring/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>eclipse.jdt.ui</groupId>
   <artifactId>org.eclipse.jdt.ui.tests.refactoring</artifactId>
-  <version>3.8.0-SNAPSHOT</version>
+  <version>3.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.jdt.ui.tests/pom.xml b/org.eclipse.jdt.ui.tests/pom.xml
index 9bb0d702d7..a0ba15a1fa 100644
--- a/org.eclipse.jdt.ui.tests/pom.xml
+++ b/org.eclipse.jdt.ui.tests/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>eclipse.jdt.ui</groupId>
   <artifactId>org.eclipse.jdt.ui.tests</artifactId>
-  <version>3.8.0-SNAPSHOT</version>
+  <version>3.9.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/org.eclipse.jdt.ui/pom.xml b/org.eclipse.jdt.ui/pom.xml
index f4dc876c2f..fb28b81591 100644
--- a/org.eclipse.jdt.ui/pom.xml
+++ b/org.eclipse.jdt.ui/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>eclipse.jdt.ui</groupId>
   <artifactId>org.eclipse.jdt.ui</artifactId>
-  <version>3.8.0-SNAPSHOT</version>
+  <version>3.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/pom.xml b/pom.xml
index 4008e32792..4d719c8004 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.jdt.ui</groupId>