Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Webster2012-10-26 23:29:22 +0000
committerPaul Webster2012-10-26 23:29:22 +0000
commit524f66942795644ec4a2deb2b425dd5f6d46d114 (patch)
tree6f17a3a36b4c69edcfae129c52383cc2e9ac35c9
parent903e54076db6aed77a44fb4d6c215f18e4828d26 (diff)
downloadeclipse.platform.releng.aggregator-524f66942795644ec4a2deb2b425dd5f6d46d114.tar.gz
eclipse.platform.releng.aggregator-524f66942795644ec4a2deb2b425dd5f6d46d114.tar.xz
eclipse.platform.releng.aggregator-524f66942795644ec4a2deb2b425dd5f6d46d114.zip
Create initial master/Kepler branch
Still needs some work
-rw-r--r--eclipse-parent/pom.xml6
m---------eclipse.jdt6
m---------eclipse.jdt.core0
m---------eclipse.jdt.core.binaries0
m---------eclipse.jdt.debug0
m---------eclipse.jdt.ui0
m---------eclipse.pde0
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.team0
m---------eclipse.platform.text0
m---------eclipse.platform.ua0
m---------eclipse.platform.ui0
m---------rt.equinox.bundles0
m---------rt.equinox.framework0
m---------rt.equinox.incubator0
m---------rt.equinox.p20
-rwxr-xr-xscripts/build.sh2
-rw-r--r--scripts/submodule_pull_master.sh24
-rw-r--r--scripts/submodule_pull_r42x.sh24
26 files changed, 34 insertions, 28 deletions
diff --git a/eclipse-parent/pom.xml b/eclipse-parent/pom.xml
index ac7e4fb63..96c1b94c0 100644
--- a/eclipse-parent/pom.xml
+++ b/eclipse-parent/pom.xml
@@ -21,9 +21,9 @@
<packaging>pom</packaging>
<properties>
- <comparator.repo>http://download.eclipse.org/eclipse/updates/4.2-M-builds</comparator.repo>
- <tycho.version>0.16.0-SNAPSHOT</tycho.version>
- <tycho-extras.version>0.16.0-SNAPSHOT</tycho-extras.version>
+ <comparator.repo>http://download.eclipse.org/eclipse/updates/4.3-I-builds</comparator.repo>
+ <tycho.version>0.16.0</tycho.version>
+ <tycho-extras.version>0.16.0</tycho-extras.version>
<orbit-repo.url>http://download.eclipse.org/tools/orbit/downloads/drops/R20120526062928/repository/</orbit-repo.url>
<jetty-repo.url>http://www.eclipse.org/external/jetty/updates/jetty-bundles-8.x/8.1.3.v20120522/</jetty-repo.url>
diff --git a/eclipse.jdt b/eclipse.jdt
-Subproject 0b74ae4e5652e97cc1a3c975a4274206ca86d4e
+Subproject 716f4980d792825bf0cb2a06e1ddcca602b9618
diff --git a/eclipse.jdt.core b/eclipse.jdt.core
-Subproject 13317b2b1755b588d7df0fb146a9d7c029ecd47
+Subproject e4a41b6da3d155b705d714aa43b8dc000cebc21
diff --git a/eclipse.jdt.core.binaries b/eclipse.jdt.core.binaries
-Subproject 7329db639e09ca6fbe1a362d672d3444205ea17
+Subproject d4439cb5c0e8a9724624f9ae7a501cbadcb13f2
diff --git a/eclipse.jdt.debug b/eclipse.jdt.debug
-Subproject 6b63def1e5bceac8ae1e848cab66893e2283475
+Subproject 446a70bae405a9bb5cbc26e762ad61d87b3a4c5
diff --git a/eclipse.jdt.ui b/eclipse.jdt.ui
-Subproject 79ecdae4451afc322b35a5b6f85ff85bcfdbcde
+Subproject f027a632c1e6497d659daacb60ea924a2a76586
diff --git a/eclipse.pde b/eclipse.pde
-Subproject 6abc5f7fecf5b0a51e670f2075233e4ccb6ab47
+Subproject 8d635c845a67316ce6be171611c9dd8555f71a8
diff --git a/eclipse.pde.build b/eclipse.pde.build
-Subproject c4e3f0ebcc1951a7726d49e4f7724d56fd036fd
+Subproject c7521e49a7a8786ce78c229d2379713a55e719f
diff --git a/eclipse.pde.ui b/eclipse.pde.ui
-Subproject 6b5d949eb9f7dbb85c8cb3f4e0d09e3460558ea
+Subproject 0a800b5841a9fa37539870f6e5be4c6afcd81e0
diff --git a/eclipse.platform b/eclipse.platform
-Subproject 0a6a432bbf967dcafb80eefefa377357d91d775
+Subproject d843dd78f3068432b07c6ed35793c229321ddc5
diff --git a/eclipse.platform.common b/eclipse.platform.common
-Subproject 3bbfc5f5b3100649ddf073e39b7c65ab377f553
+Subproject 8b17a25f31782201cfcb1029e54b81bfd757097
diff --git a/eclipse.platform.debug b/eclipse.platform.debug
-Subproject 1c84b6c9a3bcf2b640277dc3fc29f04a47df8bf
+Subproject 46ac49f4848a639b0bdb8ac029b6debd9b9c367
diff --git a/eclipse.platform.releng b/eclipse.platform.releng
-Subproject 946e6b994ecebef57ad85f07b1fbb1519310dad
+Subproject 4e718aaea142c7055ba017dc5c8c7894dd99b93
diff --git a/eclipse.platform.resources b/eclipse.platform.resources
-Subproject e26c7dee097a4a40d3dcb5936fb95ea26b48fa0
+Subproject 57cff33713bfa2d6865ef368c9e22acabfb4c81
diff --git a/eclipse.platform.runtime b/eclipse.platform.runtime
-Subproject e418dfc33aae81aff5fcd522393ac2ee89db871
+Subproject 64127a67cbfbac1225a1bc73d56a87406648de1
diff --git a/eclipse.platform.team b/eclipse.platform.team
-Subproject c5861f01b8753ae67e1cda3052f7c37b4d9e541
+Subproject 05a620a4e1a5d0775399d5b589b3f473767a95e
diff --git a/eclipse.platform.text b/eclipse.platform.text
-Subproject 9c0dc7cf894a5c8b794d8daad2c9ec0159f5f80
+Subproject 6d8d25ceafc477087e85ed3340bddf46ef92bc8
diff --git a/eclipse.platform.ua b/eclipse.platform.ua
-Subproject 130c1318d85b2a4a375da144d848572f8f223d4
+Subproject 00d991835994a92e822e6d0dbb214359a45336e
diff --git a/eclipse.platform.ui b/eclipse.platform.ui
-Subproject abf300588cdfe261ef1784eb855b6e1e4f3803b
+Subproject a9d0a325a117ebce5a17637cf80980e53d0546c
diff --git a/rt.equinox.bundles b/rt.equinox.bundles
-Subproject bf1e14b2b8027cd80f1dbb02b9e280e374c2e30
+Subproject 3d32621b5ef0bb863049d06f9af4859d3fcbcec
diff --git a/rt.equinox.framework b/rt.equinox.framework
-Subproject f3fd7f13c36d5badb7d16eeaef644c87c8a43dc
+Subproject 7d9580eb4c4448d1ac54e4ecb3ce952b7684048
diff --git a/rt.equinox.incubator b/rt.equinox.incubator
-Subproject a94d73961d019993863eb7a5a5e81bd64742b74
+Subproject a16de9d2be7a04f8541f7ad0dbbd4957a510f08
diff --git a/rt.equinox.p2 b/rt.equinox.p2
-Subproject b8de21462aa2b430af7911ae04be4df3aece248
+Subproject 215fa4de1803474efed31be0d5e8357339d0cc5
diff --git a/scripts/build.sh b/scripts/build.sh
index 479a8cac8..c65f45bf5 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -5,7 +5,7 @@ BASEDIR=$(pwd)
LOG=$BASEDIR/log_$( date +%Y%m%d%H%M%S ).txt
exec >$LOG 2>&1
-BRANCH=R4_2_maintenance
+BRANCH=master
GIT_PREFIX=ssh://git.eclipse.org
javaHome=/opt/local/jdk1.7.0_07
mvnPath=/opt/pwebster/git/cbi/apache-maven-3.0.4/bin
diff --git a/scripts/submodule_pull_master.sh b/scripts/submodule_pull_master.sh
new file mode 100644
index 000000000..6369ad3ca
--- /dev/null
+++ b/scripts/submodule_pull_master.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+# for master
+echo rt.equinox.bundles ; cd rt.equinox.bundles ; git checkout master ; git pull ; cd ..
+echo rt.equinox.framework ; cd rt.equinox.framework ; git checkout master ; git pull ; cd ..
+echo rt.equinox.incubator ; cd rt.equinox.incubator ; git checkout master ; git pull ; cd ..
+echo rt.equinox.p2 ; cd rt.equinox.p2 ; git checkout master ; git pull ; cd ..
+echo eclipse.jdt.core.binaries ; cd eclipse.jdt.core.binaries ; git checkout master ; git pull ; cd ..
+echo eclipse.jdt.core ; cd eclipse.jdt.core ; git checkout master ; git pull ; cd ..
+echo eclipse.jdt.debug ; cd eclipse.jdt.debug ; git checkout master ; git pull ; cd ..
+echo eclipse.jdt ; cd eclipse.jdt ; git checkout master ; git pull ; cd ..
+echo eclipse.jdt.ui ; cd eclipse.jdt.ui ; git checkout master ; git pull ; cd ..
+echo eclipse.pde ; cd eclipse.pde ; git checkout master ; git pull ; cd ..
+echo eclipse.pde.build ; cd eclipse.pde.build ; git checkout master ; git pull ; cd ..
+echo eclipse.pde.ui ; cd eclipse.pde.ui ; git checkout master ; git pull ; cd ..
+echo eclipse.platform.debug ; cd eclipse.platform.debug ; git checkout master ; git pull ; cd ..
+echo eclipse.platform.resources ; cd eclipse.platform.resources ; git checkout master ; git pull ; cd ..
+echo eclipse.platform ; cd eclipse.platform ; git checkout master ; git pull ; cd ..
+echo eclipse.platform.common ; cd eclipse.platform.common ; git checkout master ; git pull ; cd ..
+echo eclipse.platform.releng ; cd eclipse.platform.releng ; git checkout master ; git pull ; cd ..
+echo eclipse.platform.runtime ; cd eclipse.platform.runtime ; git checkout master ; git pull ; cd ..
+echo eclipse.platform.team ; cd eclipse.platform.team ; git checkout master ; git pull ; cd ..
+echo eclipse.platform.text ; cd eclipse.platform.text ; git checkout master ; git pull ; cd ..
+echo eclipse.platform.ua ; cd eclipse.platform.ua ; git checkout master ; git pull ; cd ..
+echo eclipse.platform.ui ; cd eclipse.platform.ui ; git checkout master ; git pull ; cd ..
diff --git a/scripts/submodule_pull_r42x.sh b/scripts/submodule_pull_r42x.sh
deleted file mode 100644
index abdd3d19d..000000000
--- a/scripts/submodule_pull_r42x.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-# for R4_2_maintenance
-echo rt.equinox.bundles ; cd rt.equinox.bundles ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo rt.equinox.framework ; cd rt.equinox.framework ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo rt.equinox.incubator ; cd rt.equinox.incubator ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo rt.equinox.p2 ; cd rt.equinox.p2 ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo eclipse.jdt.core.binaries ; cd eclipse.jdt.core.binaries ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo eclipse.jdt.core ; cd eclipse.jdt.core ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo eclipse.jdt.debug ; cd eclipse.jdt.debug ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo eclipse.jdt ; cd eclipse.jdt ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo eclipse.jdt.ui ; cd eclipse.jdt.ui ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo eclipse.pde ; cd eclipse.pde ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo eclipse.pde.build ; cd eclipse.pde.build ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo eclipse.pde.ui ; cd eclipse.pde.ui ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo eclipse.platform.debug ; cd eclipse.platform.debug ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo eclipse.platform.resources ; cd eclipse.platform.resources ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo eclipse.platform ; cd eclipse.platform ; git checkout R4_2_maintenance ; git pull ; cd ..
-echo eclipse.platform.common ; cd eclipse.platform.common ; git checkout R4_2_maintenance ; git pull ; cd ..
-echo eclipse.platform.releng ; cd eclipse.platform.releng ; git checkout R4_2_maintenance ; git pull ; cd ..
-echo eclipse.platform.runtime ; cd eclipse.platform.runtime ; git checkout R4_2_maintenance ; git pull ; cd ..
-echo eclipse.platform.team ; cd eclipse.platform.team ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo eclipse.platform.text ; cd eclipse.platform.text ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo eclipse.platform.ua ; cd eclipse.platform.ua ; git checkout R3_8_maintenance ; git pull ; cd ..
-echo eclipse.platform.ui ; cd eclipse.platform.ui ; git checkout R4_2_maintenance ; git pull ; cd ..

Back to the top