Bug 409575 - Failure in SFS build, missing org.junit
diff --git a/cbi/org.eclipse.e4.releng.update/pom.xml b/cbi/org.eclipse.e4.releng.update/pom.xml
index d05e188..5dde37d 100644
--- a/cbi/org.eclipse.e4.releng.update/pom.xml
+++ b/cbi/org.eclipse.e4.releng.update/pom.xml
@@ -45,11 +45,10 @@
<layout>p2</layout>
<!-- supported layouts are "p2-metadata", "p2-artifacts", and "p2" (for joint repositories; default) -->
</repository>
- <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>
+ </repository-->
<repository>
<url>file://${buildDirectory}/org.eclipse.e4.databinding/build/org.eclipse.e4.databinding.update/target/repository</url>
<layout>p2</layout>
diff --git a/org.eclipse.e4.builder/scripts/buildCBI.sh b/org.eclipse.e4.builder/scripts/buildCBI.sh
index 77aac67..06381ef 100755
--- a/org.eclipse.e4.builder/scripts/buildCBI.sh
+++ b/org.eclipse.e4.builder/scripts/buildCBI.sh
@@ -155,7 +155,7 @@
git clone $e4_tools
git clone $e4_search
git clone $e4_lang
-git clone $e4_resources
+#git clone $e4_resources
git clone $e4_databinding
# tag first
@@ -181,10 +181,10 @@
git push origin $buildTag
popd
-pushd org.eclipse.e4.resources
-git tag $buildTag
-git push origin $buildTag
-popd
+#pushd org.eclipse.e4.resources
+#git tag $buildTag
+#git push origin $buildTag
+#popd
pushd org.eclipse.e4.databinding
git tag $buildTag
@@ -200,11 +200,14 @@
$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 \
$( echo $e4_databinding | sed 's!file:///!git://git.eclipse.org/!g' ) \
$oldBuildTag $buildTag >submission_report.txt 2>&1
+#$( echo $e4_resources | sed 's!file:///!git://git.eclipse.org/!g' ) \
+#$oldBuildTag $buildTag \
+#
+
+
mailx -s "$e4Stream Build: $buildTag submission" e4-dev@eclipse.org <submission_report.txt
@@ -252,14 +255,14 @@
-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.resources
+#mvn $mavenVerbose \
+#clean install \
+#$mavenSign \
+#$mavenBREE \
+#-Dmaven.test.skip=true \
+#-Dmaven.repo.local=$localMavenRepo
+#popd
pushd org.eclipse.e4.databinding
mvn $mavenVerbose \
