Merge branch 'master' into 4.3.x

Conflicts:
	util/getProjectRootPomParents.sh

publish/publish.sh

@@ -540,7 +540,7 @@ if [[ $ec == "0" ]] && [[ $fc == "0" ]]; then
         date
         # create folders if not already there
         if [[ ${DESTINATION##*@*:*} == "" ]]; then # user@server, do remote op
-          seg="."; for d in ${PUBLISHPATHSUFFIX/\// }; do seg=$seg/$d; echo -e "mkdir ${seg:2}" | sftp $DESTINATION/builds/nightly/; done; seg=""
+          seg="."; for d in ${PUBLISHPATHSUFFIX//\// }; do seg=$seg/$d; echo -e "mkdir ${seg:2}" | sftp $DESTINATION/builds/nightly/; done; seg=""
         else
           mkdir -p $DESTINATION/builds/nightly/${PUBLISHPATHSUFFIX}
         fi
@@ -669,7 +669,7 @@ if [[ $ec == "0" ]] && [[ $fc == "0" ]]; then
     if [[ ${PUBLISHPATHSUFFIX} ]]; then 
       # create folders if not already there
       if [[ ${DESTINATION##*@*:*} == "" ]]; then # user@server, do remote op
-        seg="."; for d in ${PUBLISHPATHSUFFIX/\// }; do seg=$seg/$d; echo -e "mkdir ${seg:2}" | sftp $DESTINATION/updates/nightly/; done; seg=""
+        seg="."; for d in ${PUBLISHPATHSUFFIX//\// }; do seg=$seg/$d; echo -e "mkdir ${seg:2}" | sftp $DESTINATION/updates/nightly/; done; seg=""
       else
         mkdir -p $DESTINATION/updates/nightly/${PUBLISHPATHSUFFIX}
       fi

util/installFromCentral.sh

@@ -25,7 +25,7 @@ if [[ $# -lt 1 ]]; then
 fi
 
 #director.xml script is used with Eclipse's AntRunner to launch p2.director
-DIRECTORXML="http://download.jboss.org/jbosstools/updates/scripted-installation/director.xml"
+DIRECTORXML="http://download.jboss.org/jbosstools/updates/scripted-install/director.xml"
 
 # read commandline args
 # NOTE: Jenkins matrix jobs require semi-colons here, but to pass to shell, must use quotes
@@ -63,7 +63,7 @@ rm -fr ${WORKSPACE}/data; mkdir -p ${WORKSPACE}/data
 # get list of sites from which to resolve IUs (based on list in INSTALL_PLAN);  and trim /*-directory.xml at the end
 SITES=${INSTALL_PLAN%/*directory.xml}/
 # trim double // at end of URL 
-SITES=${SITES%//}/ 
+SITES=${SITES%//}/
 
 # get a list of IUs to install from the JBT or JBDS update site (using p2.director -list)
 BASE_URL=${SITES%,*}
@@ -89,14 +89,14 @@ echo "BASE FEATURES INSTALLED"
 echo "--------------------------------"
 
 # get a list of IUs to install from the Central site (based on the discovery.xml -> plugin.jar -> plugin.xml)
-CENTRAL_URL=${INSTALL_PLAN#*,} # includes discovery.xml
+CENTRAL_URL=${INSTALL_PLAN#*,} # includes discovery.xml # echo CENTRAL_URL = $CENTRAL_URL
 
 if [[ $CENTRAL_URL != $INSTALL_PLAN ]]; then 
   # echo $CENTRAL_URL
   wget ${CENTRAL_URL} -q --no-check-certificate -N -O directory.xml
   PLUGINJAR=`cat ${WORKSPACE}/directory.xml | egrep "org.jboss.tools.central.discovery_|com.jboss.jbds.central.discovery_" | sed "s#.\+url=\"\(.\+\).jar\".\+#\1.jar#"`
   # echo "Got $PLUGINJAR"
-  CENTRAL_URL=${SITES#*,} # excludes discovery.xml
+  CENTRAL_URL=${SITES#*,} # excludes discovery.xml #  echo CENTRAL_URL = $CENTRAL_URL
   wget ${CENTRAL_URL}/${PLUGINJAR} -q --no-check-certificate -N -O plugin.jar
   unzip -oq plugin.jar plugin.xml
 
@@ -134,8 +134,11 @@ XSLT
   CENTRAL_IUs=""; for f in $FEATURES; do CENTRAL_IUs="${CENTRAL_IUs},${f}.feature.group"; done; CENTRAL_IUs=${CENTRAL_IUs:1}; #echo $CENTRAL_IUs
 
   # parse the list of 3rd party siteUrl values from plugin.transformed.xml; exclude jboss.discovery.site.url entries
-  EXTRA_URLS=`cat ${WORKSPACE}/plugin.transformed.xml | grep -i siteUrl | grep -v jboss.discovery.site.url | sed "s#.\+siteUrl=\"\(.\+\)\"\ *>#\1#" | sort | uniq`
-  EXTRA_SITES=""; for e in $EXTRA_URLS; do EXTRA_SITES="${EXTRA_SITES},${e}"; done; EXTRA_SITES=${EXTRA_SITES:1}; #echo $EXTRA_SITES
+  EXTRA_URLS=`cat ${WORKSPACE}/plugin.transformed.xml | grep -i siteUrl | egrep -v "jboss.discovery.site.url|jboss.discovery.earlyaccess.site.url" | sed "s#.\+siteUrl=\"\(.\+\)\"\ *>#\1#" | sort | uniq`
+  EXTRA_SITES=""; for e in $EXTRA_URLS; do 
+    if [[ ${e/http/} != ${e} ]] || [[ ${e/ftp:/} != ${e} ]]; then EXTRA_SITES="${EXTRA_SITES},${e}"; else echo "[WARN] Skip EXTRA_SITE = $e"; fi
+  done
+  EXTRA_SITES=${EXTRA_SITES:1}; # echo $EXTRA_SITES
 
   date; du -sh ${ECLIPSE}
 

util/verifyTarget.sh

@@ -68,7 +68,6 @@ fi
 # defaults
 MVN="mvn"
 includeSources="-Dmirror-target-to-repo.includeSources=true" # by default, include sources
-targetplatformutilsversion=0.21.0
 INSTALLSCRIPT=/tmp/installFromTarget.sh
 LOG_GREP_INCLUDES="BUILD FAILURE|Only one of the following|Missing requirement|Unresolved requirement|IllegalArgumentException|Could not resolve|could not be found|being installed|Cannot satisfy dependency|FAILED"
 LOG_GREP_EXCLUDES="Failed to execute goal org.jboss.tools.tycho-plugins:target-platform-utils|Checksum validation failed, no checksums available from the repository"
@@ -88,6 +87,7 @@ while [[ "$#" -gt 0 ]]; do
     '-p') PROJECTS="$PROJECTS $2"; shift 1;;
     '-m') MVN="$2"; shift 1;;
     '-x') includeSources=""; shift 0;;
+    '-V') targetplatformutilsversion="$2"; shift 1;;
        *) others="$others,$1"; shift 0;;
   esac
   shift 1
@@ -107,6 +107,11 @@ fi
 PROJECTS=${PROJECTS//,/ }
 NOW=`date +%F_%H-%M`
 
+if [[ ! $targetplatformutilsversion ]]; then
+  # eg., 0.22.1-SNAPSHOT
+  targetplatformutilsversion=`cat ${BASEDIR}/pom.xml | grep util -B2 -A2 | grep version | sed -e "s#.\+<version>\(.\+\)</version>.*#\1#"`
+fi
+
 for PROJECT in $PROJECTS; do echo "Process $PROJECT ..."
 
   if [[ -d ${BASEDIR}/${PROJECT}target ]]; then