etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some of the plugin dependencies were'nt being properly resolved on the dependency:resolve-plugins mojo This adds a couple more dark magic sprinkles to make sure no dependencies will be downloaded at build time 

Signed-off-by: Daan Hoogland <daan@onecht.net>
This commit is contained in:
Rafael da Fonseca 2015-06-20 18:19:48 +02:00 committed by Daan Hoogland
parent 358157f57c
commit 0d671b9e54
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/travis/before_install.sh
View File

@ -97,7 +97,7 @@ done
echo -e "\nDownloading Plugin dependencies"
for ((i=0;i<$RETRY_COUNT;i++))
do
mvn org.apache.maven.plugins:maven-dependency-plugin:resolve-plugins > /dev/null
mvn org.apache.maven.plugins:maven-dependency-plugin:resolve-plugins | grep "Plugin Resolved:" | sort -u | awk '{print $4}' | tee /tmp/resolvedPlugins
if [[ $? -eq 0 ]]; then
echo -e "\nPlugin dependencies downloaded successfully"
break;

12
tools/travis/downloadDeps.sh
View File

@ -42,9 +42,15 @@ for line in $(find ../../ -name pom.xml -exec sed -n '/<dependencies>/{:a;n;/<\/
done
#For some reason, travis seems to be using surefire plugin 2.14.2
echo "<dependency><groupId>org.apache.maven.plugins</groupId><artifactId>maven-surefire-plugin</artifactId><version>2.12.4</version></dependency>" >> pom.xml
echo "<dependency><groupId>com.google.guava</groupId><artifactId>guava</artifactId><version>10.0.1</version></dependency>" >> pom.xml
#Add the resolved plugins to properly download their dependencies
while read line ; do
NAME=$(echo $line | sed -e 's/.jar$//')
VERSION=${NAME##*-}
ARTIFACT=${NAME%-*}
GROUP=$(find ~/.m2/repository -name ${NAME}.pom -exec sed -n "1,/${ARTIFACT}/p" {} \; | tac | grep -m 1 -e "<groupId>" | sed -e 's/^[[:space:]]*//' | tr -d '\r')
DATA="<dependency>${GROUP}<artifactId>${ARTIFACT}</artifactId><version>${VERSION}</version></dependency>"
echo $DATA >> pom.xml
done < /tmp/resolvedPlugins
#Finish dummy pom
echo "</dependencies></project>" >> pom.xml