From bfc5c311c068759808ee2f188ec0ca90a349d753 Mon Sep 17 00:00:00 2001
From: Jim MacArthur <jim.macarthur@codethink.co.uk>
Date: Thu, 11 Jun 2015 11:23:07 +0000
Subject: Move java-ant from zookeeper stratum to java

Change-Id: Ia235fa69851d138a93ac02023af05ee21bec3324
---
 strata/java/java-ant.morph      | 8 ++++++++
 strata/zookeeper/java-ant.morph | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)
 create mode 100644 strata/java/java-ant.morph
 delete mode 100644 strata/zookeeper/java-ant.morph

diff --git a/strata/java/java-ant.morph b/strata/java/java-ant.morph
new file mode 100644
index 00000000..172483ab
--- /dev/null
+++ b/strata/java/java-ant.morph
@@ -0,0 +1,8 @@
+name: ant
+kind: chunk
+build-commands:
+- |
+  export JAVA_HOME=/usr/lib/java-8-openjdk
+  sh build.sh -Ddist.dir="$DESTDIR/usr/lib/ant" dist
+- mkdir -p "${DESTDIR}${PREFIX}/bin"
+- ln -sf "${PREFIX}/lib/ant/bin/ant" "${DESTDIR}${PREFIX}/bin/ant"
diff --git a/strata/zookeeper/java-ant.morph b/strata/zookeeper/java-ant.morph
deleted file mode 100644
index 37d402b0..00000000
--- a/strata/zookeeper/java-ant.morph
+++ /dev/null
@@ -1,8 +0,0 @@
-name: ant
-kind: chunk
-build-commands:
-- |
-  export JAVA_HOME=/usr/lib/jdk1.8.0_20
-  sh build.sh -Ddist.dir="$DESTDIR/usr/lib/ant" dist
-- mkdir -p "${DESTDIR}${PREFIX}/bin"
-- ln -sf "${PREFIX}/lib/ant/bin/ant" "${DESTDIR}${PREFIX}/bin/ant"
-- 
cgit v1.2.1