Bug 396085 - Merge in CBI patches from 4.2.2 into 4.3 (pom changes) forv20121210-204723

jdt.debug

6 files changed, 10 insertions, 25 deletions

diff --git a/org.eclipse.jdt.debug.tests/pom.xml b/org.eclipse.jdt.debug.tests/pom.xml
index a614cd119..a8c6c3f49 100644
--- a/org.eclipse.jdt.debug.tests/pom.xml
+++ b/org.eclipse.jdt.debug.tests/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>eclipse.jdt.debug</groupId>
   <artifactId>org.eclipse.jdt.debug.tests</artifactId>
-  <version>3.8.0-SNAPSHOT</version>
+  <version>3.8.100-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/org.eclipse.jdt.debug.ui/pom.xml b/org.eclipse.jdt.debug.ui/pom.xml
index 4adfa7282..7cd769428 100644
--- a/org.eclipse.jdt.debug.ui/pom.xml
+++ b/org.eclipse.jdt.debug.ui/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>eclipse.jdt.debug</groupId>
   <artifactId>org.eclipse.jdt.debug.ui</artifactId>
-  <version>3.6.100-SNAPSHOT</version>
+  <version>3.6.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/org.eclipse.jdt.debug/pom.xml b/org.eclipse.jdt.debug/pom.xml
index 921b7ba1b..ccd58fb5e 100644
--- a/org.eclipse.jdt.debug/pom.xml
+++ b/org.eclipse.jdt.debug/pom.xml
@@ -21,26 +21,6 @@
   </parent>
   <groupId>eclipse.jdt.debug</groupId>
   <artifactId>org.eclipse.jdt.debug</artifactId>
-  <version>3.7.100-SNAPSHOT</version>
+  <version>3.8.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-compiler-plugin</artifactId>
-        <configuration>
-          <!--
-          JDT compiler seems to have troubles with overridden Collection.add(Object) when compiling
-          against java 1.5+ libraries. The "right" solution is to compile against java 1.4, but there is no such
-          thing for osx 10.6. 
-           -->
-           <!-- 
-          <source>1.5</source>
-          <target>jst14</target>
-           -->
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>
diff --git a/org.eclipse.jdt.launching.macosx/pom.xml b/org.eclipse.jdt.launching.macosx/pom.xml
index 209646be6..1c888de2e 100644
--- a/org.eclipse.jdt.launching.macosx/pom.xml
+++ b/org.eclipse.jdt.launching.macosx/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>eclipse.jdt.debug</groupId>
   <artifactId>org.eclipse.jdt.launching.macosx</artifactId>
-  <version>3.2.100-SNAPSHOT</version>
+  <version>3.2.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/org.eclipse.jdt.launching.ui.macosx/pom.xml b/org.eclipse.jdt.launching.ui.macosx/pom.xml
index ed8589f56..ad4efc90e 100644
--- a/org.eclipse.jdt.launching.ui.macosx/pom.xml
+++ b/org.eclipse.jdt.launching.ui.macosx/pom.xml
@@ -35,6 +35,11 @@
             <environment>
               <os>macosx</os>
               <ws>cocoa</ws>
+              <arch>x86_64</arch>
+            </environment>
+            <environment>
+              <os>macosx</os>
+              <ws>cocoa</ws>
               <arch>x86</arch>
             </environment>
           </environments>
diff --git a/org.eclipse.jdt.launching/pom.xml b/org.eclipse.jdt.launching/pom.xml
index 53183897d..c03bc722a 100644
--- a/org.eclipse.jdt.launching/pom.xml
+++ b/org.eclipse.jdt.launching/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>eclipse.jdt.debug</groupId>
   <artifactId>org.eclipse.jdt.launching</artifactId>
-  <version>3.6.100-SNAPSHOT</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>