Skip to content

Commit

Permalink
WFLY-3520 Replace bundled maven with version that is downloaded from …
Browse files Browse the repository at this point in the history
…apache
  • Loading branch information
stuartwdouglas authored and ctomc committed Jun 26, 2014
1 parent 2992c80 commit 04a3b7c
Show file tree
Hide file tree
Showing 70 changed files with 30 additions and 5,591 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
# ignore Maven generated target folders
~
target
# ignore downloaded maven
tools/maven
# ignore eclipse files
.project
.classpath
Expand Down
2 changes: 2 additions & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ MAVEN_HOME=""
MAVEN_OPTS="$MAVEN_OPTS -Xmx768M"
export MAVEN_OPTS

./tools/download-maven.sh

# Default search path for maven.
MAVEN_SEARCH_PATH="\
tools
Expand Down
2 changes: 2 additions & 0 deletions integration-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ MAVEN_HOME=""
MAVEN_OPTS="$MAVEN_OPTS -Xmx512M"
export MAVEN_OPTS

./tools/download-maven.sh

# The default search path for Maven.
MAVEN_SEARCH_PATH="\
tools
Expand Down
24 changes: 24 additions & 0 deletions tools/download-maven.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/sh
MAVEN_VERSION=3.2.1
MAVEN_URL=http://www.us.apache.org/dist/maven/maven-3/3.2.1/binaries/apache-maven-3.2.1-bin.zip

if [ -d tools ]; then
#executed from root of WF install
cd tools
fi

if [ -d maven ]; then
echo "Maven already exists"
version=`./maven/bin/mvn -version | grep "Apache Maven $MAVEN_VERSION"`
if [ "$version" ]; then
echo "Maven is correct version"
exit
fi
fi

rm -rf maven
curl $MAVEN_URL >maven.zip
unzip maven.zip
rm maven.zip
mv apache-maven* maven

254 changes: 0 additions & 254 deletions tools/maven/LICENSE

This file was deleted.

8 changes: 0 additions & 8 deletions tools/maven/NOTICE

This file was deleted.

77 changes: 0 additions & 77 deletions tools/maven/README.txt

This file was deleted.

Loading

0 comments on commit 04a3b7c

Please sign in to comment.