From 286b9ab5749bb07632bf94643b05d6dc76098695 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= <greg@karekinian.com>
Date: Fri, 27 Sep 2019 11:00:01 +0200
Subject: [PATCH] Add the java cookbook, delete application_ruby

---
 Berksfile      |  3 +--
 Berksfile.lock | 11 ++++-------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/Berksfile b/Berksfile
index 2256783..fa7535c 100644
--- a/Berksfile
+++ b/Berksfile
@@ -15,11 +15,9 @@ cookbook 'composer',               '~> 2.6.1'
 cookbook 'poise-ruby-build',       '~> 1.1.0'
 cookbook 'application',            '~> 5.2.0'
 cookbook 'application_javascript', '~> 1.0.0'
-cookbook 'application_ruby',       '~> 4.1.0'
 cookbook 'application_git',        '= 1.1.0' # 1.2.0 doesn't work with knife-solo
 cookbook 'poise',                  '~> 2.8.2'
 cookbook 'poise-languages',        '~> 2.1.1'
-cookbook 'poise-ruby',             '~> 2.4.0'
 cookbook 'poise-javascript',       git: 'https://github.com/67p/poise-javascript.git',
                                    ref: 'd85078f'
 cookbook 'poise-archive',          '~> 1.5.0'
@@ -53,3 +51,4 @@ cookbook 'ipfs',
          git: 'https://github.com/67P/ipfs-cookbook.git',
          ref: 'v0.4.1'
 cookbook 'elasticsearch',          '= 4.2.0'
+cookbook 'java',                   '~> 4.3.0'
diff --git a/Berksfile.lock b/Berksfile.lock
index fab450f..baf13d7 100644
--- a/Berksfile.lock
+++ b/Berksfile.lock
@@ -3,7 +3,6 @@ DEPENDENCIES
   application (~> 5.2.0)
   application_git (= 1.1.0)
   application_javascript (~> 1.0.0)
-  application_ruby (~> 4.1.0)
   apt (~> 7.0.0)
   ark (= 3.1.0)
   build-essential (~> 8.2.1)
@@ -21,6 +20,7 @@ DEPENDENCIES
     git: https://github.com/67P/ipfs-cookbook.git
     revision: 5c31191ff8571bc8425375fbf938913ac64aa2ee
     ref: v0.4.1
+  java (~> 4.3.0)
   logrotate (= 2.2.0)
   mariadb (= 0.3.1)
   mediawiki
@@ -42,7 +42,6 @@ DEPENDENCIES
     revision: d85078fe59bd4f16d05a9ffe6e0fc449015e4440
     ref: d85078f
   poise-languages (~> 2.1.1)
-  poise-ruby (~> 2.4.0)
   poise-ruby-build (~> 1.1.0)
   poise-service (~> 1.5.2)
   postfix (= 5.0.2)
@@ -68,11 +67,6 @@ GRAPH
     poise (~> 2.0)
     poise-javascript (~> 1.0)
     poise-service (~> 1.0)
-  application_ruby (4.1.0)
-    application (~> 5.0)
-    poise (~> 2.0)
-    poise-ruby (~> 2.1)
-    poise-service (~> 1.0)
   apt (7.0.0)
   ark (3.1.0)
     build-essential (>= 0.0.0)
@@ -107,6 +101,9 @@ GRAPH
   hostsfile (2.4.5)
   ipfs (0.4.1)
     ark (>= 0.0.0)
+  java (4.3.0)
+    homebrew (>= 0.0.0)
+    windows (>= 0.0.0)
   logrotate (2.2.0)
   mariadb (0.3.1)
     apt (>= 0.0.0)