aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanh Ha2012-12-10 08:51:22 (EST)
committerDani Megert2012-12-10 08:51:22 (EST)
commit5f7bb57b8210eb2cc852a72b647615ef084808bc (patch)
tree8eedb93ba64712abdbbc953f60ff991cd865e2a1
parenta8f98a632cf00d890d4bd3e91b2f143c5c51d3b9 (diff)
downloadeclipse.jdt.ui-5f7bb57b8210eb2cc852a72b647615ef084808bc.zip
eclipse.jdt.ui-5f7bb57b8210eb2cc852a72b647615ef084808bc.tar.gz
eclipse.jdt.ui-5f7bb57b8210eb2cc852a72b647615ef084808bc.tar.bz2
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
-rw-r--r--org.eclipse.jdt.astview.feature/pom.xml2
-rw-r--r--org.eclipse.jdt.jeview.feature/pom.xml2
-rw-r--r--org.eclipse.jdt.junit.runtime/pom.xml12
-rw-r--r--org.eclipse.jdt.text.tests/pom.xml2
-rw-r--r--org.eclipse.jdt.ui.tests.refactoring/pom.xml2
-rw-r--r--org.eclipse.jdt.ui.tests/pom.xml2
-rw-r--r--org.eclipse.jdt.ui/pom.xml2
-rw-r--r--pom.xml1
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 d447414..08721b8 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 2862102..a5bebdd 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 3e97d0c..ce07dd0 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 d14b3c3..6af3bcb 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 6a0e9cb..ff1fb6a 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 9bb0d70..a0ba15a 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 f4dc876..fb28b81 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 4008e32..4d719c8 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>