Bug 396210 - [releng] add a maven build to e4 resources
Add to buildCBI.sh and e4.releng update site.
diff --git a/cbi/org.eclipse.e4.releng.update/pom.xml b/cbi/org.eclipse.e4.releng.update/pom.xml
index 380f4e6..2f7d5f7 100644
--- a/cbi/org.eclipse.e4.releng.update/pom.xml
+++ b/cbi/org.eclipse.e4.releng.update/pom.xml
@@ -47,6 +47,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.resources/build/org.eclipse.e4.resources.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 9378f96..acd997e 100755
--- a/org.eclipse.e4.builder/scripts/buildCBI.sh
+++ b/org.eclipse.e4.builder/scripts/buildCBI.sh
@@ -144,12 +144,14 @@
e4_tools=file:///gitroot/e4/org.eclipse.e4.tools.git
e4_search=file:///gitroot/e4/org.eclipse.e4.search.git
e4_lang=file:///gitroot/e4/org.eclipse.e4.languages.git
+e4_resources=file:///gitroot/e4/org.eclipse.e4.resources.git
git clone file:///gitroot/cbi/org.eclipse.cbi.maven.plugins.git
git clone $e4_releng
git clone $e4_tools
git clone $e4_search
git clone $e4_lang
+git clone $e4_resources
# tag first
@@ -174,6 +176,11 @@
git push origin $buildTag
popd
+pushd org.eclipse.e4.resources
+git tag $buildTag
+git push origin $buildTag
+popd
+
/bin/bash \
org.eclipse.e4.releng/org.eclipse.e4.builder/scripts/git-submission.sh \
$(pwd) \
@@ -182,6 +189,8 @@
$( echo $e4_search | sed 's!file:///!git://git.eclipse.org/!g' ) \
$oldBuildTag $buildTag \
$( echo $e4_lang | sed 's!file:///!git://git.eclipse.org/!g' ) \
+$oldBuildTag $buildTag \
+$( echo $e4_resources | 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
@@ -230,6 +239,15 @@
-Dmaven.repo.local=$localMavenRepo
popd
+pushd org.eclipse.e4.resources
+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 \
