aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2012-01-12 17:47:23 (EST)
committerIgor Fedorenko2012-02-09 12:09:16 (EST)
commit03d4acbc2e606e68deb14cb33041ac0af2a5870f (patch)
tree234dcf659b1f713c72ab76829ce6b794e4849414
parent80cdb3007846cc55f75ca2519362eda515a740d9 (diff)
downloadeclipse.platform.releng.aggregator-03d4acbc2e606e68deb14cb33041ac0af2a5870f.zip
eclipse.platform.releng.aggregator-03d4acbc2e606e68deb14cb33041ac0af2a5870f.tar.gz
eclipse.platform.releng.aggregator-03d4acbc2e606e68deb14cb33041ac0af2a5870f.tar.bz2
pom.xml cleanup
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com> Conflicts: FROMCVS/org.eclipse.sdk.tests-feature/pom.xml FROMCVS/org.eclipse.test-feature/pom.xml
-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--TMP/org.eclipse.sdk.epp/pom.xml37
-rw-r--r--eclipse-parent/pom.xml28
7 files changed, 29 insertions, 226 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 17a675f..585b6c4 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>4.2.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 797be6c..34f69c0 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>4.2.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 da244b0..0f35739 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>4.2.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 646a866..60bf6c0 100644
--- a/TMP/org.eclipse.sdk.epp/pom.xml
+++ b/TMP/org.eclipse.sdk.epp/pom.xml
@@ -23,42 +23,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>
@@ -83,6 +47,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 e0fe296..95ee9ac 100644
--- a/eclipse-parent/pom.xml
+++ b/eclipse-parent/pom.xml
@@ -86,6 +86,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>