aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThanh Ha2012-05-10 13:42:52 (EDT)
committerThanh Ha2012-05-10 13:42:52 (EDT)
commitf08a71313b323e2c0dcee79260102f0a0a8d955e (patch)
tree316a46f97237894a2fdf5038b1f80a84cede4628
parent099bce9417d254574c4e1eb10133c5517ad746e5 (diff)
downloadeclipse.platform.releng.aggregator-f08a71313b323e2c0dcee79260102f0a0a8d955e.zip
eclipse.platform.releng.aggregator-f08a71313b323e2c0dcee79260102f0a0a8d955e.tar.gz
eclipse.platform.releng.aggregator-f08a71313b323e2c0dcee79260102f0a0a8d955e.tar.bz2
Rebase to Juno M7.
-rw-r--r--.gitmodules9
-rw-r--r--eclipse-parent/pom.xml12
m---------eclipse.jdt0
m---------eclipse.jdt.core0
m---------eclipse.jdt.core.binaries0
m---------eclipse.jdt.debug0
m---------eclipse.jdt.ui0
m---------eclipse.pde.build0
m---------eclipse.pde.ui0
m---------eclipse.platform0
m---------eclipse.platform.common0
m---------eclipse.platform.debug0
m---------eclipse.platform.releng0
m---------eclipse.platform.resources0
m---------eclipse.platform.runtime0
m---------eclipse.platform.swt0
m---------eclipse.platform.swt.binaries0
m---------eclipse.platform.team0
m---------eclipse.platform.text0
m---------eclipse.platform.ua0
m---------eclipse.platform.ui0
m---------eclipse.platform_e40
-rw-r--r--pom.xml1
m---------rt.equinox.bundles0
m---------rt.equinox.framework0
m---------rt.equinox.p20
26 files changed, 15 insertions, 7 deletions
diff --git a/.gitmodules b/.gitmodules
index f64343a..e295499 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,9 +25,6 @@
[submodule "eclipse.platform"]
path = eclipse.platform
url = ../eclipse.platform
-[submodule "eclipse.platform_e4"]
- path = eclipse.platform_e4
- url = ../eclipse.platform
[submodule "eclipse.platform.common"]
path = eclipse.platform.common
url = ../eclipse.platform.common
@@ -64,3 +61,9 @@
[submodule "eclipse.platform.releng"]
path = eclipse.platform.releng
url = ../eclipse.platform.releng.git
+[submodule "eclipse.platform.swt"]
+ path = eclipse.platform.swt
+ url = ../eclipse.platform.swt.git
+[submodule "eclipse.platform.swt.binaries"]
+ path = eclipse.platform.swt.binaries
+ url = ../eclipse.platform.swt.binaries.git
diff --git a/eclipse-parent/pom.xml b/eclipse-parent/pom.xml
index 6f7d48c..fc5fe6c 100644
--- a/eclipse-parent/pom.xml
+++ b/eclipse-parent/pom.xml
@@ -24,11 +24,12 @@
<tycho.version>0.14.1</tycho.version>
<tycho-extras.version>0.14.0</tycho-extras.version>
- <orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/S20120308061416/repository/</orbit-repo.url>
- <jetty-repo.url>http://www.eclipse.org/external/jetty/updates/jetty-bundles-8.x/8.1.1.v20120215/</jetty-repo.url>
- <ecf-repo.url>http://download.eclipse.org/rt/ecf/3.5.4/site.p2</ecf-repo.url>
+ <orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/S20120428190502/repository/</orbit-repo.url>
+ <jetty-repo.url>http://www.eclipse.org/external/jetty/updates/jetty-bundles-8.x/8.1.3.v20120416/</jetty-repo.url>
+ <ecf-repo.url>http://download.eclipse.org/rt/ecf/3.5.5/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>
+ <egit-repo.url>http://download.eclipse.org/egit/updates</egit-repo.url>
<natives-repo.url>file:///var/tmp/lts/natives</natives-repo.url>
@@ -57,6 +58,11 @@
<layout>p2</layout>
</repository>
<repository>
+ <id>egit</id>
+ <url>${egit-repo.url}</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
<id>natives</id>
<url>${natives-repo.url}</url>
<layout>p2</layout>
diff --git a/eclipse.jdt b/eclipse.jdt
-Subproject 67050349afd8c14ca8c49b6c54e306a3a1fc4ff
+Subproject c26786892f3bc9854d62d12dd5fd16dc4f4329e
diff --git a/eclipse.jdt.core b/eclipse.jdt.core
-Subproject 1af8c120c2533c030854a8a06f841cf5368d740
+Subproject eac115f5732e51dd2590f9ef0c7a783adb68e89
diff --git a/eclipse.jdt.core.binaries b/eclipse.jdt.core.binaries
-Subproject e6cadadd2bb5e7e12bf7ef8b5b1e38e1973135f
+Subproject 0a0c72ec2bdd18532570ad50c389c416ab3b07b
diff --git a/eclipse.jdt.debug b/eclipse.jdt.debug
-Subproject a29804a0289babbb5f5eeb3373d476c1bb95c21
+Subproject 0649bd192e42ccc6445ba64493ea5231c44acce
diff --git a/eclipse.jdt.ui b/eclipse.jdt.ui
-Subproject 14160b3c4e9f91d4a16710076dd2c74c9e0612e
+Subproject cf6ef63ff941c49afd2c140dd9a0e021cd2e1d5
diff --git a/eclipse.pde.build b/eclipse.pde.build
-Subproject 9faf7ec396c05ac7fdfde824d42defe44f166ea
+Subproject 94144068a20785f1641a0b4c392306532d75e39
diff --git a/eclipse.pde.ui b/eclipse.pde.ui
-Subproject 5824372014c203d2aca0a198e6a5f135224b12d
+Subproject 7d3daea2940cb63e514c4533a08997d411bea9f
diff --git a/eclipse.platform b/eclipse.platform
-Subproject 721b7e9a150eb5708da0825479e71c20ddc8c83
+Subproject bb0a3d27d006bc4713f5de9e65324657fad40b6
diff --git a/eclipse.platform.common b/eclipse.platform.common
-Subproject 09367d4c3a0f72043e9a8e24690e666ff6d24f8
+Subproject 2f13a88b275f8738490a205efd969a01236d977
diff --git a/eclipse.platform.debug b/eclipse.platform.debug
-Subproject db520138c53baaee22c80b65b1eaa8f3eef9d42
+Subproject 99c9c60310e59d06138c92883bbd32b75b51ead
diff --git a/eclipse.platform.releng b/eclipse.platform.releng
-Subproject 523a0829bab089299eb2be882a1fa0165cfe081
+Subproject 406e75e82cb5f3dbd54cc78e27db3044b49a3f4
diff --git a/eclipse.platform.resources b/eclipse.platform.resources
-Subproject f84eaf75d58717213cd1a2fb66e6d18e79f89f9
+Subproject dab52922410810c1f723c41fbe6e52fde146b17
diff --git a/eclipse.platform.runtime b/eclipse.platform.runtime
-Subproject ba68f5a7f56a004ef608f183a54f5ae4a924b5b
+Subproject f9c30472e7928290061d69ebe920fc30cccc876
diff --git a/eclipse.platform.swt b/eclipse.platform.swt
new file mode 160000
+Subproject 788ffcc0de6be595cccd30753077285dea2eab1
diff --git a/eclipse.platform.swt.binaries b/eclipse.platform.swt.binaries
new file mode 160000
+Subproject bc5d5ce4be4b94979c260a1dd854a3adfdcb1b4
diff --git a/eclipse.platform.team b/eclipse.platform.team
-Subproject 9ad8f21a1e7f6b9ec8985c78d9a3e5eb1d606e7
+Subproject d4fa9c73a0727027fd93fd95bcc110a2281ece9
diff --git a/eclipse.platform.text b/eclipse.platform.text
-Subproject 1ff3572af8fef2005f9393b2e7dbcac1274fe63
+Subproject 7bb26acab0318283c490f3f1a870eebfc784016
diff --git a/eclipse.platform.ua b/eclipse.platform.ua
-Subproject d75e13ec11bc3aad432433f2e3090a1568e9c4f
+Subproject febc0e45da0b6f7489dd46b2becdcb126782048
diff --git a/eclipse.platform.ui b/eclipse.platform.ui
-Subproject b582659fc35fe3d3d47cc3672e29ebf117ae7e4
+Subproject 2f8e7e4cfa6f2ac13e124bde2240353a361d335
diff --git a/eclipse.platform_e4 b/eclipse.platform_e4
deleted file mode 160000
-Subproject 003df9c9fc609a991e9547c28f1b3297a2c240e
diff --git a/pom.xml b/pom.xml
index 4e64524..b0cb4e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,6 @@
<module>eclipse.pde.ui</module>
<module>eclipse.platform</module>
- <module>eclipse.platform_e4</module>
<module>eclipse.platform.ui</module>
diff --git a/rt.equinox.bundles b/rt.equinox.bundles
-Subproject 0505e8453bbbf860a80f1f5e78a03481510ef2b
+Subproject 36c58deb5ddf9c8883e4ff9354b388520875f7b
diff --git a/rt.equinox.framework b/rt.equinox.framework
-Subproject daf3a3a86f4e47959983a48baaf8c5e06b88c96
+Subproject ce2c070a3fec4708a8873de700cb1aa842d4b98
diff --git a/rt.equinox.p2 b/rt.equinox.p2
-Subproject f975b56709c98eb2fc146f83604825aee077027
+Subproject 88056631ffeac6ba742216977f9e78405354d32