summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2015-05-29 09:15:40 +0000
committerJonathan Maw <jonathan.maw@codethink.co.uk>2015-05-29 09:15:40 +0000
commit866590409ca35950e48b2dddd65793476a09cc75 (patch)
tree1500da7cd42b8ce022c887997e7ecec1b07f5c49
parent244e16c16aa11852706a7ab51cf6dd216e3315a8 (diff)
downloaddefinitions-866590409ca35950e48b2dddd65793476a09cc75.tar.gz
Move java out of zookeper
-rw-r--r--strata/java.morph19
-rw-r--r--strata/java/java-ant.morph (renamed from strata/zookeeper/java-ant.morph)0
-rw-r--r--strata/java/java-binary.morph (renamed from strata/zookeeper/java-binary.morph)0
-rw-r--r--strata/zookeeper.morph15
-rw-r--r--systems/zookeeper-client-x86_64.morph2
-rw-r--r--systems/zookeeper-server-x86_64.morph2
6 files changed, 24 insertions, 14 deletions
diff --git a/strata/java.morph b/strata/java.morph
new file mode 100644
index 00000000..fcf3db53
--- /dev/null
+++ b/strata/java.morph
@@ -0,0 +1,19 @@
+name: java
+kind: stratum
+description: |
+ This stratum installs java and ant
+build-depends:
+- morph: strata/core.morph
+- morph: strata/test-tools.morph
+chunks:
+- name: java-binary
+ morph: strata/java/java-binary.morph
+ repo: github:franred/gerrit-installation-binaries
+ ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e
+ unpetrify-ref: master
+- name: java-ant
+ morph: strata/java/java-ant.morph
+ repo: upstream:java/ant
+ ref: master
+ build-depends:
+ - java-binary
diff --git a/strata/zookeeper/java-ant.morph b/strata/java/java-ant.morph
index 37d402b0..37d402b0 100644
--- a/strata/zookeeper/java-ant.morph
+++ b/strata/java/java-ant.morph
diff --git a/strata/zookeeper/java-binary.morph b/strata/java/java-binary.morph
index a6c11f95..a6c11f95 100644
--- a/strata/zookeeper/java-binary.morph
+++ b/strata/java/java-binary.morph
diff --git a/strata/zookeeper.morph b/strata/zookeeper.morph
index 2baf6f58..02a39738 100644
--- a/strata/zookeeper.morph
+++ b/strata/zookeeper.morph
@@ -4,23 +4,10 @@ description: |
This stratum installs zookeeper and its dependencies.
build-depends:
- morph: strata/core.morph
-- morph: strata/test-tools.morph
+- morph: strata/java.morph
chunks:
-- name: java-binary
- morph: strata/zookeeper/java-binary.morph
- repo: github:franred/gerrit-installation-binaries
- ref: ef262c635890f19eaff8ef6bbd831ee9b0d8693e
- unpetrify-ref: master
-- name: java-ant
- morph: strata/zookeeper/java-ant.morph
- repo: upstream:java/ant
- ref: master
- build-depends:
- - java-binary
- name: zookeeper
morph: strata/zookeeper/zookeeper.morph
repo: upstream:zookeeper
ref: baserock/mikesmith/zookeeper
unpetrify-ref: trunk
- build-depends:
- - java-ant
diff --git a/systems/zookeeper-client-x86_64.morph b/systems/zookeeper-client-x86_64.morph
index a9b01cd5..e85c7646 100644
--- a/systems/zookeeper-client-x86_64.morph
+++ b/systems/zookeeper-client-x86_64.morph
@@ -13,6 +13,8 @@ strata:
morph: strata/foundation.morph
- name: bsp-x86_64-generic
morph: strata/bsp-x86_64-generic.morph
+- name: java
+ morph: strata/java.morph
- name: zookeeper
morph: strata/zookeeper.morph
- name: zookeeper-client
diff --git a/systems/zookeeper-server-x86_64.morph b/systems/zookeeper-server-x86_64.morph
index 987ba9e1..44594d87 100644
--- a/systems/zookeeper-server-x86_64.morph
+++ b/systems/zookeeper-server-x86_64.morph
@@ -13,6 +13,8 @@ strata:
morph: strata/foundation.morph
- name: bsp-x86_64-generic
morph: strata/bsp-x86_64-generic.morph
+- name: java
+ morph: strata/java.morph
- name: zookeeper
morph: strata/zookeeper.morph
- name: zookeeper-server