aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanh Ha2012-12-10 08:04:02 (EST)
committerPaul Webster2012-12-10 08:04:02 (EST)
commitb8a6d5a3ece283c168a55dbf47cd1de586e4c935 (patch)
tree56e001386ad5527a20d2d49358b495531b3c13c9
parenta1a526dbb6e1c68cc5659b4acadb259336054d92 (diff)
downloadeclipse.platform-b8a6d5a3ece283c168a55dbf47cd1de586e4c935.zip
eclipse.platform-b8a6d5a3ece283c168a55dbf47cd1de586e4c935.tar.gz
eclipse.platform-b8a6d5a3ece283c168a55dbf47cd1de586e4c935.tar.bz2
Bug 396095 - Merge in CBI patches from 4.2.2 into 4.3 (pom changes) for eclipse.platformv20121210-130402
-rw-r--r--ant/org.eclipse.ant.launching/pom.xml2
-rw-r--r--ant/org.eclipse.ant.tests.core/pom.xml2
-rw-r--r--ant/org.eclipse.ant.tests.ui/pom.xml2
-rw-r--r--ant/org.eclipse.ant.ui/pom.xml2
-rw-r--r--platform/org.eclipse.platform/pom.xml40
-rw-r--r--platform/org.eclipse.sdk/pom.xml40
-rw-r--r--pom.xml10
-rw-r--r--update/org.eclipse.update.configurator/pom.xml12
-rw-r--r--update/org.eclipse.update.core/pom.xml20
9 files changed, 117 insertions, 13 deletions
diff --git a/ant/org.eclipse.ant.launching/pom.xml b/ant/org.eclipse.ant.launching/pom.xml
index 159beec..40cbc62 100644
--- a/ant/org.eclipse.ant.launching/pom.xml
+++ b/ant/org.eclipse.ant.launching/pom.xml
@@ -21,6 +21,6 @@
</parent>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.ant.launching</artifactId>
- <version>1.0.200-SNAPSHOT</version>
+ <version>1.0.300-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/ant/org.eclipse.ant.tests.core/pom.xml b/ant/org.eclipse.ant.tests.core/pom.xml
index fbe10cb..541d774 100644
--- a/ant/org.eclipse.ant.tests.core/pom.xml
+++ b/ant/org.eclipse.ant.tests.core/pom.xml
@@ -21,6 +21,6 @@
</parent>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.ant.tests.core</artifactId>
- <version>3.3.0-SNAPSHOT</version>
+ <version>3.3.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/ant/org.eclipse.ant.tests.ui/pom.xml b/ant/org.eclipse.ant.tests.ui/pom.xml
index 85961f9..cb1b83f 100644
--- a/ant/org.eclipse.ant.tests.ui/pom.xml
+++ b/ant/org.eclipse.ant.tests.ui/pom.xml
@@ -21,6 +21,6 @@
</parent>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.ant.tests.ui</artifactId>
- <version>3.8.0-SNAPSHOT</version>
+ <version>3.8.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/ant/org.eclipse.ant.ui/pom.xml b/ant/org.eclipse.ant.ui/pom.xml
index 5906a97..b9469e6 100644
--- a/ant/org.eclipse.ant.ui/pom.xml
+++ b/ant/org.eclipse.ant.ui/pom.xml
@@ -21,6 +21,6 @@
</parent>
<groupId>org.eclipse.platform</groupId>
<artifactId>org.eclipse.ant.ui</artifactId>
- <version>3.5.300-SNAPSHOT</version>
+ <version>3.5.400-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/platform/org.eclipse.platform/pom.xml b/platform/org.eclipse.platform/pom.xml
index e01c1df..55c14ab 100644
--- a/platform/org.eclipse.platform/pom.xml
+++ b/platform/org.eclipse.platform/pom.xml
@@ -23,4 +23,44 @@
<artifactId>org.eclipse.platform</artifactId>
<version>4.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <format>'v${maven.build.timestamp}'</format>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>update-branding-plugins</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <configuration>
+ <tasks>
+ <replace file="about.mappings"
+ token="@build@" value="${buildId}" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/platform/org.eclipse.sdk/pom.xml b/platform/org.eclipse.sdk/pom.xml
index c962365..4a24ff2 100644
--- a/platform/org.eclipse.sdk/pom.xml
+++ b/platform/org.eclipse.sdk/pom.xml
@@ -23,4 +23,44 @@
<artifactId>org.eclipse.sdk</artifactId>
<version>4.3.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-packaging-plugin</artifactId>
+ <version>${tycho.version}</version>
+ <configuration>
+ <format>'v${maven.build.timestamp}'</format>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>update-branding-plugins</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>process-resources</phase>
+ <configuration>
+ <tasks>
+ <replace file="about.mappings"
+ token="@build@" value="${buildId}" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
diff --git a/pom.xml b/pom.xml
index 82a7aef..c6ecb2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,15 +26,13 @@
<version>3.8.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <properties>
+ <tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/platform/eclipse.platform.git</tycho.scmUrl>
+ </properties>
+
<modules>
<module>update/org.eclipse.update.configurator</module>
<module>update/org.eclipse.update.core</module>
- <module>update/org.eclipse.update.core.linux</module>
- <module>update/org.eclipse.update.core.win32</module>
- <module>update/org.eclipse.update.examples</module>
- <module>update/org.eclipse.update.tests.core</module>
- <module>update/org.eclipse.update.scheduler</module>
- <module>update/org.eclipse.update.ui</module>
<module>ant/org.eclipse.ant.core</module>
<module>ant/org.eclipse.ant.launching</module>
<module>ant/org.eclipse.ant.ui</module>
diff --git a/update/org.eclipse.update.configurator/pom.xml b/update/org.eclipse.update.configurator/pom.xml
index 4892edc..ac656f9 100644
--- a/update/org.eclipse.update.configurator/pom.xml
+++ b/update/org.eclipse.update.configurator/pom.xml
@@ -24,4 +24,16 @@
<artifactId>org.eclipse.update.configurator</artifactId>
<version>3.3.200-SNAPSHOT</version>
<packaging>eclipse-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/update/org.eclipse.update.core/pom.xml b/update/org.eclipse.update.core/pom.xml
index dd8679e..203107b 100644
--- a/update/org.eclipse.update.core/pom.xml
+++ b/update/org.eclipse.update.core/pom.xml
@@ -10,9 +10,8 @@
Igor Fedorenko - initial implementation
-->
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
- xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>eclipse.platform</artifactId>
@@ -24,4 +23,19 @@
<artifactId>org.eclipse.update.core</artifactId>
<version>3.2.600-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>