aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2012-01-04 08:16:24 (EST)
committerIgor Fedorenko2012-01-04 12:53:38 (EST)
commit2ce122cffbcf965f9dac8e5f1749ff3d40d709d6 (patch)
tree8e804a5ab06f45cc64db295baf1393433bb98611
parentafea9baa175b6a30ccec46013c5e114f52d2fbf0 (diff)
downloadeclipse.platform.releng.aggregator-2ce122cffbcf965f9dac8e5f1749ff3d40d709d6.zip
eclipse.platform.releng.aggregator-2ce122cffbcf965f9dac8e5f1749ff3d40d709d6.tar.gz
eclipse.platform.releng.aggregator-2ce122cffbcf965f9dac8e5f1749ff3d40d709d6.tar.bz2
updated for recent tycho changes
Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
-rw-r--r--FROMCVS/org.eclipse.test.performance/pom.xml2
-rw-r--r--eclipse-parent/pom.xml8
m---------eclipse.jdt.core0
m---------eclipse.platform0
m---------eclipse.platform.resources0
m---------eclipse.platform.runtime0
m---------eclipse.platform.ua0
m---------rt.equinox.bundles0
m---------rt.equinox.framework0
m---------rt.equinox.p20
10 files changed, 9 insertions, 1 deletions
diff --git a/FROMCVS/org.eclipse.test.performance/pom.xml b/FROMCVS/org.eclipse.test.performance/pom.xml
index 85d56a6..0dbeab9 100644
--- a/FROMCVS/org.eclipse.test.performance/pom.xml
+++ b/FROMCVS/org.eclipse.test.performance/pom.xml
@@ -19,7 +19,7 @@
<plugins>
<plugin>
<groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
+ <artifactId>tycho-compiler-plugin</artifactId>
<configuration>
<optionalDependencies>ignore</optionalDependencies>
<extraRequirements>
diff --git a/eclipse-parent/pom.xml b/eclipse-parent/pom.xml
index cbe48e2..25ea93a 100644
--- a/eclipse-parent/pom.xml
+++ b/eclipse-parent/pom.xml
@@ -16,6 +16,7 @@
<jetty-repo.url>http://www.eclipse.org/external/jetty/updates/jetty-bundles-8.x/8.1.0.RC1/</jetty-repo.url>
<ecf-repo.url>http://download.eclipse.org/rt/ecf/3.5.3/site.p2</ecf-repo.url>
<emf-repo.url>http://download.eclipse.org/modeling/emf/emf/updates/2.8milestones/</emf-repo.url>
+ <aspectj-repo.url>http://download.eclipse.org/tools/ajdt/aspectj/update</aspectj-repo.url>
<natives-repo.url>file:///var/tmp/lts/natives</natives-repo.url>
@@ -48,6 +49,13 @@
<url>${natives-repo.url}</url>
<layout>p2</layout>
</repository>
+
+ <repository>
+ <!-- aspectj is used by some rt.equinox.bundles and is required by sdk-tests feature -->
+ <id>aspectj</id>
+ <url>${aspectj-repo.url}</url>
+ <layout>p2</layout>
+ </repository>
</repositories>
<pluginRepositories>
diff --git a/eclipse.jdt.core b/eclipse.jdt.core
-Subproject 3bba5022d9f2982b63d586041185dc1b4ae73a9
+Subproject 2ef67bbf5bc56e6ab2000f1356ccb7eb5dec82e
diff --git a/eclipse.platform b/eclipse.platform
-Subproject 71e4c9ac153f444610956a7aee605d29d56634b
+Subproject b7241402ad0ec9773349177df64cd2242215f00
diff --git a/eclipse.platform.resources b/eclipse.platform.resources
-Subproject 23248e0e661f2f2498a2ac497ff3e9f633ba658
+Subproject 0e4bc5fc930e267a5e228b74cc25d08caa6bfbb
diff --git a/eclipse.platform.runtime b/eclipse.platform.runtime
-Subproject 7082c0c18d8c3a427302adbfe2a15ac5661cff5
+Subproject 3afea6fdf9d74a7afa2f3e85a7f2cd122a473f2
diff --git a/eclipse.platform.ua b/eclipse.platform.ua
-Subproject 51471584c5aad993a1e3ec08bace827befb363a
+Subproject 44a9c18f94c965d4c65549cc6ada69188702b13
diff --git a/rt.equinox.bundles b/rt.equinox.bundles
-Subproject c06c55bd6ab358cdab3b65303849d059c93d113
+Subproject c4f2447ec87e0929fe7b3c6b558f72213563a50
diff --git a/rt.equinox.framework b/rt.equinox.framework
-Subproject d5d10c2465225073f80b7ab76aecba10aaae717
+Subproject 19831cefd15bfd3ce20086e047662d8e6c91bae
diff --git a/rt.equinox.p2 b/rt.equinox.p2
-Subproject e28bcae0a2bebcfd28ac9193c561a8234a0d954
+Subproject 02f9f53f63857a26e8aa4f51809ac06466ff6c9