Bug 396108 - Merge in CBI patches from 4.2.2 into 4.3 (pom changes) forv20121210-102952I20121212-0800I20121211-2000I20121211-0800I20121210-2000I20121210-0800

eclipse.platform.team

7 files changed, 33 insertions, 5 deletions

diff --git a/bundles/org.eclipse.compare.core/pom.xml b/bundles/org.eclipse.compare.core/pom.xml
index 05889ef96..9487d38cb 100644
--- a/bundles/org.eclipse.compare.core/pom.xml
+++ b/bundles/org.eclipse.compare.core/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>eclipse.platform.team</groupId>
   <artifactId>org.eclipse.compare.core</artifactId>
-  <version>3.5.200-SNAPSHOT</version>
+  <version>3.5.300-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.compare/pom.xml b/bundles/org.eclipse.compare/pom.xml
index a85ecdfc8..f3de77554 100644
--- a/bundles/org.eclipse.compare/pom.xml
+++ b/bundles/org.eclipse.compare/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>eclipse.platform.team</groupId>
   <artifactId>org.eclipse.compare</artifactId>
-  <version>3.5.300-SNAPSHOT</version>
+  <version>3.5.400-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.core.net/pom.xml b/bundles/org.eclipse.core.net/pom.xml
index 7e06b63fb..902c0707e 100644
--- a/bundles/org.eclipse.core.net/pom.xml
+++ b/bundles/org.eclipse.core.net/pom.xml
@@ -23,4 +23,18 @@
   <artifactId>org.eclipse.core.net</artifactId>
   <version>1.2.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <!--
+            dependency on org.eclipse.equinox.security requires at least J2SE-1.4
+           -->
+          <executionEnvironment>J2SE-1.4</executionEnvironment>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/bundles/org.eclipse.team.core/pom.xml b/bundles/org.eclipse.team.core/pom.xml
index 3c4f6980c..41e7ce2a2 100644
--- a/bundles/org.eclipse.team.core/pom.xml
+++ b/bundles/org.eclipse.team.core/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>eclipse.platform.team</groupId>
   <artifactId>org.eclipse.team.core</artifactId>
-  <version>3.6.100-SNAPSHOT</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.team.cvs.ui/pom.xml b/bundles/org.eclipse.team.cvs.ui/pom.xml
index 5545ed983..74426be77 100644
--- a/bundles/org.eclipse.team.cvs.ui/pom.xml
+++ b/bundles/org.eclipse.team.cvs.ui/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>eclipse.platform.team</groupId>
   <artifactId>org.eclipse.team.cvs.ui</artifactId>
-  <version>3.3.500-SNAPSHOT</version>
+  <version>3.3.600-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.team.ui/pom.xml b/bundles/org.eclipse.team.ui/pom.xml
index aaa53608d..6a992bd24 100644
--- a/bundles/org.eclipse.team.ui/pom.xml
+++ b/bundles/org.eclipse.team.ui/pom.xml
@@ -21,6 +21,6 @@
   </parent>
   <groupId>eclipse.platform.team</groupId>
   <artifactId>org.eclipse.team.ui</artifactId>
-  <version>3.6.200-SNAPSHOT</version>
+  <version>3.7.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/bundles/org.eclipse.ui.net/pom.xml b/bundles/org.eclipse.ui.net/pom.xml
index 93c811802..2255ee17d 100644
--- a/bundles/org.eclipse.ui.net/pom.xml
+++ b/bundles/org.eclipse.ui.net/pom.xml
@@ -23,4 +23,18 @@
   <artifactId>org.eclipse.ui.net</artifactId>
   <version>1.2.200-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <configuration>
+          <!--
+            dependency on org.eclipse.equinox.security requires at least J2SE-1.4
+           -->
+          <executionEnvironment>J2SE-1.4</executionEnvironment>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>