aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2012-01-12 17:47:23 (EST)
committerIgor Fedorenko2012-01-12 17:47:23 (EST)
commitd8c180b0debe5c7b4f9209dc47f448e5f6b13832 (patch)
treebb9b56c6576ca47ff03cf62b1b2f7401c429001c
parenteed8e1d1ee3abc6d794fd26e0613b8d8108c92dc (diff)
downloadeclipse.platform.releng.aggregator-d8c180b0debe5c7b4f9209dc47f448e5f6b13832.zip
eclipse.platform.releng.aggregator-d8c180b0debe5c7b4f9209dc47f448e5f6b13832.tar.gz
eclipse.platform.releng.aggregator-d8c180b0debe5c7b4f9209dc47f448e5f6b13832.tar.bz2
pom.xml cleanup
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
-rw-r--r--FROMCVS/org.eclipse.cvs-feature/pom.xml38
-rw-r--r--FROMCVS/org.eclipse.help-feature/pom.xml38
-rw-r--r--FROMCVS/org.eclipse.platform-feature/pom.xml38
-rw-r--r--FROMCVS/org.eclipse.rcp-feature/pom.xml38
-rw-r--r--FROMCVS/org.eclipse.sdk-feature/pom.xml38
-rw-r--r--FROMCVS/org.eclipse.sdk.tests-feature/pom.xml38
-rw-r--r--FROMCVS/org.eclipse.test-feature/pom.xml38
-rw-r--r--TMP/org.eclipse.sdk.epp/pom.xml37
-rw-r--r--eclipse-parent/pom.xml28
m---------eclipse.jdt0
m---------eclipse.jdt.core0
m---------rt.equinox.framework0
12 files changed, 29 insertions, 302 deletions
diff --git a/FROMCVS/org.eclipse.cvs-feature/pom.xml b/FROMCVS/org.eclipse.cvs-feature/pom.xml
index bc46ed1..656c9d0 100644
--- a/FROMCVS/org.eclipse.cvs-feature/pom.xml
+++ b/FROMCVS/org.eclipse.cvs-feature/pom.xml
@@ -14,42 +14,4 @@
<artifactId>org.eclipse.cvs</artifactId>
<version>1.3.100-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/FROMCVS/org.eclipse.help-feature/pom.xml b/FROMCVS/org.eclipse.help-feature/pom.xml
index 700001d..26c672b 100644
--- a/FROMCVS/org.eclipse.help-feature/pom.xml
+++ b/FROMCVS/org.eclipse.help-feature/pom.xml
@@ -14,42 +14,4 @@
<artifactId>org.eclipse.help</artifactId>
<version>1.3.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/FROMCVS/org.eclipse.platform-feature/pom.xml b/FROMCVS/org.eclipse.platform-feature/pom.xml
index 116f729..f0d7c83 100644
--- a/FROMCVS/org.eclipse.platform-feature/pom.xml
+++ b/FROMCVS/org.eclipse.platform-feature/pom.xml
@@ -14,42 +14,4 @@
<artifactId>org.eclipse.platform</artifactId>
<version>3.8.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/FROMCVS/org.eclipse.rcp-feature/pom.xml b/FROMCVS/org.eclipse.rcp-feature/pom.xml
index 1267eae..42b7bcf 100644
--- a/FROMCVS/org.eclipse.rcp-feature/pom.xml
+++ b/FROMCVS/org.eclipse.rcp-feature/pom.xml
@@ -14,42 +14,4 @@
<artifactId>org.eclipse.rcp</artifactId>
<version>3.8.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/FROMCVS/org.eclipse.sdk-feature/pom.xml b/FROMCVS/org.eclipse.sdk-feature/pom.xml
index 8678f75..c6e3fff 100644
--- a/FROMCVS/org.eclipse.sdk-feature/pom.xml
+++ b/FROMCVS/org.eclipse.sdk-feature/pom.xml
@@ -14,42 +14,4 @@
<artifactId>org.eclipse.sdk</artifactId>
<version>3.8.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/FROMCVS/org.eclipse.sdk.tests-feature/pom.xml b/FROMCVS/org.eclipse.sdk.tests-feature/pom.xml
index 8151b90..528d1d5 100644
--- a/FROMCVS/org.eclipse.sdk.tests-feature/pom.xml
+++ b/FROMCVS/org.eclipse.sdk.tests-feature/pom.xml
@@ -14,42 +14,4 @@
<artifactId>org.eclipse.sdk.tests</artifactId>
<version>3.7.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/FROMCVS/org.eclipse.test-feature/pom.xml b/FROMCVS/org.eclipse.test-feature/pom.xml
index d60eb27..e52aa91 100644
--- a/FROMCVS/org.eclipse.test-feature/pom.xml
+++ b/FROMCVS/org.eclipse.test-feature/pom.xml
@@ -14,42 +14,4 @@
<artifactId>org.eclipse.test</artifactId>
<version>3.5.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/TMP/org.eclipse.sdk.epp/pom.xml b/TMP/org.eclipse.sdk.epp/pom.xml
index ed0bce0..e6a80de 100644
--- a/TMP/org.eclipse.sdk.epp/pom.xml
+++ b/TMP/org.eclipse.sdk.epp/pom.xml
@@ -16,42 +16,6 @@
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <configuration>
- <resolver>p2</resolver>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
-
-
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-director-plugin</artifactId>
<executions>
<execution>
@@ -76,6 +40,7 @@
</goals>
<configuration>
<formats>
+ <win32>zip</win32>
<linux>tar.gz</linux>
<macosx>tar.gz</macosx>
</formats>
diff --git a/eclipse-parent/pom.xml b/eclipse-parent/pom.xml
index 6658da6..b021794 100644
--- a/eclipse-parent/pom.xml
+++ b/eclipse-parent/pom.xml
@@ -80,6 +80,34 @@
build since many platform bundles directly or indirectly depend on org.eclipse.equinox.security.
-->
<executionEnvironment>?J2SE-1.4</executionEnvironment>
+
+ <environments>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>linux</os>
+ <ws>gtk</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86</arch>
+ </environment>
+ <environment>
+ <os>win32</os>
+ <ws>win32</ws>
+ <arch>x86_64</arch>
+ </environment>
+ <environment>
+ <os>macosx</os>
+ <ws>cocoa</ws>
+ <arch>x86_64</arch>
+ </environment>
+ </environments>
</configuration>
</plugin>
diff --git a/eclipse.jdt b/eclipse.jdt
-Subproject 8d1e717641444fc7346691730e84b2ca51196ea
+Subproject aa8b02dd97b3c9b9bdae5fc316641da50be748f
diff --git a/eclipse.jdt.core b/eclipse.jdt.core
-Subproject 04ed2b984855d463adb02ab5b31c553d77cf631
+Subproject 0abba943c7b53c553060dad23c53becd80ea000
diff --git a/rt.equinox.framework b/rt.equinox.framework
-Subproject e8cec563ba4fe37b5131ffc291094346974ee23
+Subproject 1e2cb6d29f96c8648d030daea92af33c04d189c