Browse Source

Merge pull request #1974 from sagenschneider/maven_latest

Using later maven version (for Aether support)
Mike Smith 9 years ago
parent
commit
fad3b95b62
1 changed files with 11 additions and 4 deletions
  1. 11 4
      toolset/setup/linux/systools/maven.sh

+ 11 - 4
toolset/setup/linux/systools/maven.sh

@@ -2,11 +2,18 @@
 
 
 RETCODE=$(fw_exists ${IROOT}/maven.installed)
 RETCODE=$(fw_exists ${IROOT}/maven.installed)
 [ ! "$RETCODE" == 0 ] || { \
 [ ! "$RETCODE" == 0 ] || { \
-  source $IROOT/maven.installed
-  return 0; }
+source $IROOT/maven.installed
+return 0; }
+
+sudo add-apt-repository "deb http://ppa.launchpad.net/natecarlson/maven3/ubuntu precise main"
+sudo apt-get update
+sudo apt-get -y --force-yes install maven3
+if [ -e /usr/bin/mvn ]
+then
+    sudo rm -f /usr/bin/mvn
+fi
+sudo ln -s /usr/share/maven3/bin/mvn /usr/bin/mvn
 
 
-# TODO: Someday remove apt-get
-sudo apt-get -y install maven
 mvn -version
 mvn -version
 
 
 touch $IROOT/maven.installed
 touch $IROOT/maven.installed