diff options
author | Thanh Ha | 2012-12-10 10:29:52 +0000 |
---|---|---|
committer | Malgorzata Janczarska | 2012-12-10 10:29:52 +0000 |
commit | b0d7d16b09fe75928e3491fa0951bd6219e1b64f (patch) | |
tree | df06cf301c9fc6405e69f208052237cc808204e8 | |
parent | a6d945ea31e5c84c1429595917001032a50be3e3 (diff) | |
download | eclipse.platform.team-b0d7d16b09fe75928e3491fa0951bd6219e1b64f.tar.gz eclipse.platform.team-b0d7d16b09fe75928e3491fa0951bd6219e1b64f.tar.xz eclipse.platform.team-b0d7d16b09fe75928e3491fa0951bd6219e1b64f.zip |
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
-rw-r--r-- | bundles/org.eclipse.compare.core/pom.xml | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.compare/pom.xml | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.core.net/pom.xml | 14 | ||||
-rw-r--r-- | bundles/org.eclipse.team.core/pom.xml | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.team.cvs.ui/pom.xml | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.team.ui/pom.xml | 2 | ||||
-rw-r--r-- | bundles/org.eclipse.ui.net/pom.xml | 14 | ||||
-rw-r--r-- | examples/org.eclipse.compare.examples.xml/pom.xml | 14 | ||||
-rw-r--r-- | examples/org.eclipse.compare.examples/pom.xml | 14 | ||||
-rw-r--r-- | examples/org.eclipse.team.examples.filesystem/pom.xml | 14 | ||||
-rw-r--r-- | pom.xml | 1 | ||||
-rw-r--r-- | tests/org.eclipse.compare.tests/pom.xml | 2 | ||||
-rw-r--r-- | tests/org.eclipse.core.tests.net/pom.xml | 2 | ||||
-rw-r--r-- | tests/org.eclipse.jsch.tests/pom.xml | 12 | ||||
-rw-r--r-- | tests/org.eclipse.team.tests.core/pom.xml | 12 |
15 files changed, 99 insertions, 10 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> diff --git a/examples/org.eclipse.compare.examples.xml/pom.xml b/examples/org.eclipse.compare.examples.xml/pom.xml index 319e76944..519d9bdf7 100644 --- a/examples/org.eclipse.compare.examples.xml/pom.xml +++ b/examples/org.eclipse.compare.examples.xml/pom.xml @@ -21,6 +21,18 @@ </parent> <groupId>eclipse.platform.team</groupId> <artifactId>org.eclipse.compare.examples.xml</artifactId> - <version>3.3.200-SNAPSHOT</version> + <version>3.3.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <!-- observed Juno compile target --> + <executionEnvironment>J2SE-1.4</executionEnvironment> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/examples/org.eclipse.compare.examples/pom.xml b/examples/org.eclipse.compare.examples/pom.xml index cec110fa6..b97570f61 100644 --- a/examples/org.eclipse.compare.examples/pom.xml +++ b/examples/org.eclipse.compare.examples/pom.xml @@ -21,6 +21,18 @@ </parent> <groupId>eclipse.platform.team</groupId> <artifactId>org.eclipse.compare.examples</artifactId> - <version>3.1.200-SNAPSHOT</version> + <version>3.1.300-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <!-- observed Juno compile target --> + <executionEnvironment>J2SE-1.4</executionEnvironment> + </configuration> + </plugin> + </plugins> + </build> </project> diff --git a/examples/org.eclipse.team.examples.filesystem/pom.xml b/examples/org.eclipse.team.examples.filesystem/pom.xml index 04df2137f..a5436fc17 100644 --- a/examples/org.eclipse.team.examples.filesystem/pom.xml +++ b/examples/org.eclipse.team.examples.filesystem/pom.xml @@ -21,6 +21,18 @@ </parent> <groupId>eclipse.platform.team</groupId> <artifactId>org.eclipse.team.examples.filesystem</artifactId> - <version>3.4.100-SNAPSHOT</version> + <version>3.4.200-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <!-- observed Juno compile target --> + <executionEnvironment>J2SE-1.4</executionEnvironment> + </configuration> + </plugin> + </plugins> + </build> </project> @@ -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.platform.team</groupId> diff --git a/tests/org.eclipse.compare.tests/pom.xml b/tests/org.eclipse.compare.tests/pom.xml index 6ae9ac5a1..46368af56 100644 --- a/tests/org.eclipse.compare.tests/pom.xml +++ b/tests/org.eclipse.compare.tests/pom.xml @@ -21,6 +21,6 @@ </parent> <groupId>eclipse.platform.team</groupId> <artifactId>org.eclipse.compare.tests</artifactId> - <version>3.5.300-SNAPSHOT</version> + <version>3.5.400-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> </project> diff --git a/tests/org.eclipse.core.tests.net/pom.xml b/tests/org.eclipse.core.tests.net/pom.xml index 5e36d28cc..e5e77bc59 100644 --- a/tests/org.eclipse.core.tests.net/pom.xml +++ b/tests/org.eclipse.core.tests.net/pom.xml @@ -21,6 +21,6 @@ </parent> <groupId>eclipse.platform.team</groupId> <artifactId>org.eclipse.core.tests.net</artifactId> - <version>1.2.100-SNAPSHOT</version> + <version>1.3.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/tests/org.eclipse.jsch.tests/pom.xml b/tests/org.eclipse.jsch.tests/pom.xml index 4bcd53740..7076bf873 100644 --- a/tests/org.eclipse.jsch.tests/pom.xml +++ b/tests/org.eclipse.jsch.tests/pom.xml @@ -23,4 +23,16 @@ <artifactId>org.eclipse.jsch.tests</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-test-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/tests/org.eclipse.team.tests.core/pom.xml b/tests/org.eclipse.team.tests.core/pom.xml index 212c14122..e3fc9672a 100644 --- a/tests/org.eclipse.team.tests.core/pom.xml +++ b/tests/org.eclipse.team.tests.core/pom.xml @@ -23,4 +23,16 @@ <artifactId>org.eclipse.team.tests.core</artifactId> <version>3.7.0-SNAPSHOT</version> <packaging>eclipse-test-plugin</packaging> + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <configuration> + <!-- observed Juno compile target --> + <executionEnvironment>J2SE-1.4</executionEnvironment> + </configuration> + </plugin> + </plugins> + </build> </project> |