Merge pull request #900 from metamx/build-fixes

Build fixes

build.sh

@@ -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`
+echo "Building Version [${VERSION}]"
-pushd $SCRIPT_DIR
-SCRIPT_DIR=`pwd`
-popd
 
-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
+cat <<EOF
-mvn package
 
-if [ $? -ne "0" ]; then
+The following self-contained jars (and more) have been built:
-    echo "mvn package failed"
+$JARS
-    exit 2;
+EOF
-fi
-
-echo " "
-echo "        The following self-contained jars (and more) have been built:"
-echo " "
-find . -name '*-selfcontained.jar'

services/pom.xml

@@ -32,9 +32,17 @@
   </parent>
 
   <dependencies>
+    <!-- include druid-common to prevent older versions of dependencies
+    from being pulled in by airline and dependencies of druid-server -->
     <dependency>
-      <groupId>io.airlift</groupId>
+      <groupId>io.druid</groupId>
-      <artifactId>airline</artifactId>
+      <artifactId>druid-common</artifactId>
+      <version>${project.parent.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.druid</groupId>
+      <artifactId>druid-server</artifactId>
+      <version>${project.parent.version}</version>
     </dependency>
     <dependency>
       <groupId>io.druid</groupId>
@@ -47,9 +55,8 @@
       <version>${project.parent.version}</version>
     </dependency>
     <dependency>
-      <groupId>io.druid</groupId>
+      <groupId>io.airlift</groupId>
-      <artifactId>druid-server</artifactId>
+      <artifactId>airline</artifactId>
-      <version>${project.parent.version}</version>
     </dependency>
   </dependencies>