Update build scripts to no longer build maven-cbi-plugin and jarsigner

- maven-cbi-plugin and eclipse-jarsigner-plugin are no longer required
  as they are now available in repo.eclipse.org repository
- Added message to cbi_build.sh that the script is deprecated and will
  be removed in the future

2 files changed, 8 insertions, 30 deletions

diff --git a/scripts/build.sh b/scripts/build.sh
index c65f45bf5..ef60afc68 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-
 BASEDIR=$(pwd)
 LOG=$BASEDIR/log_$( date +%Y%m%d%H%M%S ).txt
 exec >$LOG 2>&1
@@ -80,28 +79,6 @@ installEclipseParent () {
     popd
 }
 
-installMavenCbi () {
-    pushd eclipse.platform.releng.aggregator
-    mvn -f maven-cbi-plugin/pom.xml \
-    clean install \
-    -Dmaven.repo.local=$LOCAL_REPO
-    popd
-}
-
-installEclipseSigner () {
-    if [ ! -d org.eclipse.cbi.maven.plugins ]; then
-	git clone -n \
-	${GIT_PREFIX}/gitroot/cbi/org.eclipse.cbi.maven.plugins.git
-    fi
-    pushd org.eclipse.cbi.maven.plugins
-    git fetch
-    git checkout eclipse-jarsigner-plugin-1.0.1
-    mvn -f eclipse-jarsigner-plugin/pom.xml \
-    clean install \
-    -Dmaven.repo.local=$LOCAL_REPO
-    popd
-}
-
 buildAggregator () {
     pushd eclipse.platform.releng.aggregator
     mvn $mavenVerbose \
@@ -119,14 +96,8 @@ if $updateAggregator; then
     cloneAggregator
 fi
 
-# if you want to sign on build.eclipse.org. you need this
-if [ ! -z "$mavenSign" ]; then
-    installEclipseSigner
-fi
-
 # pick up any changes
 installEclipseParent
-installMavenCbi
 
 # build from the aggregator root
 buildAggregator
diff --git a/scripts/cbi_build.sh b/scripts/cbi_build.sh
index 86a4e2862..fb9ee6cdf 100755
--- a/scripts/cbi_build.sh
+++ b/scripts/cbi_build.sh
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+###
+### THIS SCRIPT IS DEPRECATED, USE build.sh INSTEAD.
+###
+
+echo "WARNING: This script is deprecated and will be removed in the future, please use build.sh instead."
+
+
+
 BASE=$( cd $( dirname "$0" ) > /dev/null ; pwd )
 
 if [[ ! -e "$BASE/setup.sh" ]]; then
@@ -24,7 +32,6 @@ cmd="$1"
 case "$cmd" in
     build ) #CMD Build all the sources
         mvnWrapper -f eclipse-parent/pom.xml clean install
-        mvnWrapper -f maven-cbi-plugin/pom.xml clean install
         mvnWrapper clean install -Dmaven.test.skip=true
         echo "Build successful"
         echo "You can find the installation files in $BASE/../eclipse.platform.releng.tychoeclipsebuilder/sdk/target/products/"