Bug 422028 - [KeyBindings] "Standard" key binding scheme
Add e4.ui back to the e4 build.
diff --git a/cbi/eclipse-parent/pom.xml b/cbi/eclipse-parent/pom.xml
index 24b3617..9f8e776 100644
--- a/cbi/eclipse-parent/pom.xml
+++ b/cbi/eclipse-parent/pom.xml
@@ -35,6 +35,7 @@
<tycho-repo.url>https://oss.sonatype.org/content/groups/public/</tycho-repo.url>
<cbi-repo.url>https://repo.eclipse.org/content/groups/cbi/</cbi-repo.url>
<eclipse-maven-repo.url>https://repo.eclipse.org/content/repositories/releases/</eclipse-maven-repo.url>
+ <cbi-license-repo.url>http://download.eclipse.org/cbi/updates/license/</cbi-license-repo.url>
</properties>
<repositories>
@@ -74,6 +75,11 @@
<layout>p2</layout>
</repository>
<repository>
+ <id>cbi-license</id>
+ <url>${cbi-license-repo.url}</url>
+ <layout>p2</layout>
+ </repository>
+ <repository>
<id>swtbot</id>
<url>${swtbot-repo.url}</url>
<layout>p2</layout>
diff --git a/cbi/org.eclipse.e4.releng.update/pom.xml b/cbi/org.eclipse.e4.releng.update/pom.xml
index 4634e36..9f5bdee 100644
--- a/cbi/org.eclipse.e4.releng.update/pom.xml
+++ b/cbi/org.eclipse.e4.releng.update/pom.xml
@@ -55,6 +55,11 @@
<layout>p2</layout>
<!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
</repository>
+ <repository>
+ <url>file://${buildDirectory}/org.eclipse.e4.ui/build/org.eclipse.e4.ui.update/target/repository</url>
+ <layout>p2</layout>
+ <!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
+ </repository>
</source>
<!-- starting from here all configuration parameters are optional -->
diff --git a/org.eclipse.e4.builder/scripts/buildCBI.sh b/org.eclipse.e4.builder/scripts/buildCBI.sh
index 573236a..329cab4 100755
--- a/org.eclipse.e4.builder/scripts/buildCBI.sh
+++ b/org.eclipse.e4.builder/scripts/buildCBI.sh
@@ -149,6 +149,7 @@
e4_lang=file:///gitroot/e4/org.eclipse.e4.languages.git
e4_resources=file:///gitroot/e4/org.eclipse.e4.resources.git
e4_databinding=file:///gitroot/e4/org.eclipse.e4.databinding.git
+e4_ui=file:///gitroot/e4/org.eclipse.e4.ui.git
#git clone file:///gitroot/cbi/org.eclipse.cbi.maven.plugins.git
git clone $e4_releng
@@ -157,6 +158,7 @@
git clone $e4_lang
git clone $e4_resources
git clone $e4_databinding
+git clone $e4_ui
# tag first
@@ -191,6 +193,11 @@
git push origin $buildTag
popd
+pushd org.eclipse.e4.ui
+git tag $buildTag
+git push origin $buildTag
+popd
+
/bin/bash \
org.eclipse.e4.releng/org.eclipse.e4.builder/scripts/git-submission.sh \
$(pwd) \
@@ -203,6 +210,8 @@
$( echo $e4_resources | sed 's!file:///!git://git.eclipse.org/!g' ) \
$oldBuildTag $buildTag \
$( echo $e4_databinding | sed 's!file:///!git://git.eclipse.org/!g' ) \
+$oldBuildTag $buildTag \
+$( echo $e4_ui | sed 's!file:///!git://git.eclipse.org/!g' ) \
$oldBuildTag $buildTag >submission_report.txt 2>&1
mailx -s "$e4Stream Build: $buildTag submission" e4-dev@eclipse.org <submission_report.txt
@@ -270,6 +279,15 @@
-Dmaven.repo.local=$localMavenRepo
popd
+pushd org.eclipse.e4.ui
+mvn $mavenVerbose \
+clean install \
+$mavenSign \
+$mavenBREE \
+-Dmaven.test.skip=true \
+-Dmaven.repo.local=$localMavenRepo
+popd
+
pushd org.eclipse.e4.releng/cbi
mvn -f org.eclipse.e4.releng.update/pom.xml \
clean verify \
