Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
gnethercutt committed Dec 2, 2014
2 parents e30ac10 + 59542c4 commit 79571f7
Show file tree
Hide file tree
Showing 699 changed files with 41,699 additions and 11,964 deletions.
30 changes: 10 additions & 20 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,27 +1,17 @@
#!/bin/bash -e
#!/bin/bash -eu

PROJECT=druid
BASE=$(cd $(dirname $0) && pwd)

DIST_DIR=dist/tar
VERSION=`cat pom.xml | grep '<version>' | head -1 | tail -1 | sed 's_.*<version>\([^<]*\)</version>.*_\1_'`

SCRIPT_DIR=`dirname $0`
pushd $SCRIPT_DIR
SCRIPT_DIR=`pwd`
popd
echo "Building Version [${VERSION}]"

VERSION=`cat pom.xml | grep version | head -4 | tail -1 | sed 's_.*<version>\([^<]*\)</version>.*_\1_'`
mvn -U -B clean package

echo Using Version[${VERSION}]
JARS=$(find "$BASE" -name "*-$VERSION-selfcontained.jar" | sed -e 's/^/ /')

mvn clean
mvn package
cat <<EOF
if [ $? -ne "0" ]; then
echo "mvn package failed"
exit 2;
fi

echo " "
echo " The following self-contained jars (and more) have been built:"
echo " "
find . -name '*-selfcontained.jar'
The following self-contained jars (and more) have been built:
$JARS
EOF
72 changes: 0 additions & 72 deletions cassandra-storage/pom.xml

This file was deleted.

Loading

0 comments on commit 79571f7

Please sign in to comment.