From e28a0f900ef62d22d35772aec25bee4c4a3fb68d Mon Sep 17 00:00:00 2001 From: Yuki Seki Date: Wed, 20 Jul 2016 02:39:36 +0900 Subject: [PATCH 01/12] enable environ config --- src/clj/job_streamer/control_bus/config.clj | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/clj/job_streamer/control_bus/config.clj b/src/clj/job_streamer/control_bus/config.clj index 9ec4184..c5e0180 100644 --- a/src/clj/job_streamer/control_bus/config.clj +++ b/src/clj/job_streamer/control_bus/config.clj @@ -10,6 +10,9 @@ :migration {:dbschema model/dbschema}}) (def environ - {:http {:port (some-> env :control_bus-port Integer.)} - :discoverer {:ws-port (some-> env :control_bus-port Integer.)}}) + (let [port (some-> env :control-bus-port Integer.)] + {:http {:port port} + :discoverer {:ws-port port} + :scheduler {:host "localhost" + :port port}})) From 7462efca5888954f6166e3608d0430d5feebfc4f Mon Sep 17 00:00:00 2001 From: tis304224 Date: Wed, 13 Jul 2016 16:48:39 +0900 Subject: [PATCH 02/12] enable to set args --- .../org/jobstreamer/batch/ShellBatchlet.java | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/src/java/org/jobstreamer/batch/ShellBatchlet.java b/src/java/org/jobstreamer/batch/ShellBatchlet.java index 7f8636d..72af96d 100644 --- a/src/java/org/jobstreamer/batch/ShellBatchlet.java +++ b/src/java/org/jobstreamer/batch/ShellBatchlet.java @@ -1,13 +1,5 @@ package org.jobstreamer.batch; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import javax.batch.api.AbstractBatchlet; -import javax.batch.operations.BatchRuntimeException; -import javax.batch.runtime.context.StepContext; -import javax.enterprise.inject.Any; -import javax.inject.Inject; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -19,6 +11,15 @@ import java.nio.file.Paths; import java.nio.file.StandardCopyOption; +import javax.batch.api.AbstractBatchlet; +import javax.batch.operations.BatchRuntimeException; +import javax.batch.runtime.context.StepContext; +import javax.enterprise.inject.Any; +import javax.inject.Inject; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * A builtin batchlet for running a shellscript. * @@ -47,7 +48,8 @@ private Path createTemporaryScript(URL resourceUrl, String script) throws IOExce } private String executeScript(Path script) { - ProcessBuilder pb = new ProcessBuilder(script.toAbsolutePath().toString()); + String args = stepContext.getProperties().getProperty("args"); + ProcessBuilder pb = new ProcessBuilder(script.toAbsolutePath().toString(),args); pb.redirectErrorStream(true); try { From 37f9fcf9b879f7d3503f900c9b1578c2e4f02d68 Mon Sep 17 00:00:00 2001 From: tis304224 Date: Wed, 27 Jul 2016 11:32:48 +0900 Subject: [PATCH 03/12] enable ShellBatchlet to recieve args. --- project.clj | 5 +- .../org/jobstreamer/batch/ShellBatchlet.java | 20 ++++- .../jobstreamer/batch/ShellBatchletTest.java | 86 +++++++++++++++++++ test/resources/test.bat | 2 + 4 files changed, 109 insertions(+), 4 deletions(-) create mode 100644 test/org/jobstreamer/batch/ShellBatchletTest.java create mode 100644 test/resources/test.bat diff --git a/project.clj b/project.clj index 2d8281b..fd3b8bc 100644 --- a/project.clj +++ b/project.clj @@ -63,4 +63,7 @@ :source-paths ["dev"] :repl-options {:init-ns user} :env {:port "45102"}} - :project/test {:dependencies [[junit "4.12"]]}}) + :project/test {:dependencies [[junit "4.12"] + [org.mockito/mockito-all "1.10.19"] + [org.powermock/powermock-api-mockito "1.5.4"] + [org.powermock/powermock-module-junit4 "1.5.4"]]}}) diff --git a/src/java/org/jobstreamer/batch/ShellBatchlet.java b/src/java/org/jobstreamer/batch/ShellBatchlet.java index 72af96d..18baf19 100644 --- a/src/java/org/jobstreamer/batch/ShellBatchlet.java +++ b/src/java/org/jobstreamer/batch/ShellBatchlet.java @@ -10,6 +10,9 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; import javax.batch.api.AbstractBatchlet; import javax.batch.operations.BatchRuntimeException; @@ -26,7 +29,7 @@ * @author kawasima */ public class ShellBatchlet extends AbstractBatchlet { - private static final Logger logger = LoggerFactory.getLogger(ShellBatchlet.class); + private final static Logger logger = LoggerFactory.getLogger(ShellBatchlet.class); private Process process; @Any @@ -47,9 +50,18 @@ private Path createTemporaryScript(URL resourceUrl, String script) throws IOExce return scriptFile; } - private String executeScript(Path script) { + String executeScript(Path script) { String args = stepContext.getProperties().getProperty("args"); - ProcessBuilder pb = new ProcessBuilder(script.toAbsolutePath().toString(),args); + ProcessBuilder pb = null; + String processToString = script.toAbsolutePath().toString(); + if (args == null) { + pb = new ProcessBuilder(processToString); + } else { + List processAndArgs = new ArrayList(); + processAndArgs.add(processToString); + processAndArgs.addAll(Arrays.asList(args.split(" "))); + pb = new ProcessBuilder((String[]) processAndArgs.toArray(new String[0])); + } pb.redirectErrorStream(true); try { @@ -62,6 +74,8 @@ private String executeScript(Path script) { logger.info(line); } } + } catch (Throwable e) { + e.printStackTrace(); } finally { if (process != null) { try { diff --git a/test/org/jobstreamer/batch/ShellBatchletTest.java b/test/org/jobstreamer/batch/ShellBatchletTest.java new file mode 100644 index 0000000..f4e65ce --- /dev/null +++ b/test/org/jobstreamer/batch/ShellBatchletTest.java @@ -0,0 +1,86 @@ +package org.jobstreamer.batch; + +import static org.mockito.Mockito.*; + +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.nio.file.Paths; +import java.util.Properties; + +import javax.batch.runtime.context.StepContext; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.powermock.core.classloader.annotations.PrepareForTest; +import org.powermock.modules.junit4.PowerMockRunner; + +import ch.qos.logback.classic.Logger; + +@RunWith(PowerMockRunner.class) +@PrepareForTest({ShellBatchlet.class,Logger.class}) +public class ShellBatchletTest { + private static final String BAT_FILE_PATH = "test/resources/test.bat"; + + private static final String TEST_MESSAGE = "test"; + + private final static ShellBatchlet TARGET = new ShellBatchlet(); + + private StepContext sc = mock (StepContext.class); + + Properties properties = new Properties(); + + Logger logger = Mockito.mock(Logger.class); + + @Before + public void setup() throws Throwable{ + properties = new Properties(); + Field f= TARGET.getClass().getDeclaredField("stepContext"); + f.set(TARGET, sc); + setFinalStatic(ShellBatchlet.class.getDeclaredField("logger"),logger); + + } + @Test + public void args指定なし() throws Throwable{ + when(sc.getProperties()).thenReturn(properties); + //for windows + TARGET.executeScript(Paths.get(BAT_FILE_PATH)); + //TODO:create linux version + verify(logger,never()).info(TEST_MESSAGE); + + + + + } + + @Test + public void args指定一つ() throws Throwable{ + properties.setProperty("args", TEST_MESSAGE); + when(sc.getProperties()).thenReturn(properties); + //for windows + TARGET.executeScript(Paths.get(BAT_FILE_PATH)); + //TODO:create linux version + + verify(logger,times(1)).info(TEST_MESSAGE); + } + + @Test + public void args指定複数() throws Throwable{ + properties.setProperty("args", TEST_MESSAGE + " " + TEST_MESSAGE); + when(sc.getProperties()).thenReturn(properties); + //for windows + TARGET.executeScript(Paths.get(BAT_FILE_PATH)); + //TODO:create linux version + + verify(logger,times(2)).info(TEST_MESSAGE); + } + + static void setFinalStatic(Field field, Object newValue) throws Exception { + field.setAccessible(true); + Field modifiersField = Field.class.getDeclaredField("modifiers"); + modifiersField.setAccessible(true); + modifiersField.setInt(field, field.getModifiers() & ~Modifier.FINAL); + field.set(null, newValue); + } +} diff --git a/test/resources/test.bat b/test/resources/test.bat new file mode 100644 index 0000000..bd13745 --- /dev/null +++ b/test/resources/test.bat @@ -0,0 +1,2 @@ +echo %1 +echo %2 \ No newline at end of file From f6f2ef8d01b515e113c17030e89bd2f441115334 Mon Sep 17 00:00:00 2001 From: Yuki Seki Date: Mon, 1 Aug 2016 21:08:10 +0900 Subject: [PATCH 04/12] make it can delete --- src/clj/job_streamer/control_bus/component/jobs.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/clj/job_streamer/control_bus/component/jobs.clj b/src/clj/job_streamer/control_bus/component/jobs.clj index 5838c93..0e9108f 100644 --- a/src/clj/job_streamer/control_bus/component/jobs.clj +++ b/src/clj/job_streamer/control_bus/component/jobs.clj @@ -282,7 +282,7 @@ :put! (fn [{job :edn job-id :job-id}] (d/transact datomic (edn->datoms job job-id))) :delete! (fn [{job-id :job-id app-id :app-id}] - (scheduler/unschedule job-id) + (scheduler/unschedule scheduler job-id) (d/transact datomic [[:db.fn/retractEntity job-id] [:db/retract app-id :application/jobs job-id]])) From 4cb87658b2049cf13635fd842976e12f23f508fd Mon Sep 17 00:00:00 2001 From: Yuki Seki Date: Mon, 1 Aug 2016 23:50:08 +0900 Subject: [PATCH 05/12] make it run on Linux --- .classpath | 39 +++++++++++++++++++ .project | 23 +++++++++++ .settings/org.eclipse.jdt.core.prefs | 5 +++ .settings/org.eclipse.m2e.core.prefs | 4 ++ project.clj | 4 +- .../job_streamer/control_bus/HolidayTest.java | 0 .../jobstreamer/batch/ShellBatchletTest.java | 33 +++++++--------- test/resources/test | 2 + test/resources/test.bat | 2 +- 9 files changed, 90 insertions(+), 22 deletions(-) create mode 100644 .classpath create mode 100644 .project create mode 100644 .settings/org.eclipse.jdt.core.prefs create mode 100644 .settings/org.eclipse.m2e.core.prefs rename test/{ => java}/net/unit8/job_streamer/control_bus/HolidayTest.java (100%) rename test/{ => java}/org/jobstreamer/batch/ShellBatchletTest.java (73%) create mode 100755 test/resources/test mode change 100644 => 100755 test/resources/test.bat diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..5844da4 --- /dev/null +++ b/.classpath @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..8b87aff --- /dev/null +++ b/.project @@ -0,0 +1,23 @@ + + + job-streamer-control-bus + + + + + + org.eclipse.jdt.core.javabuilder + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.jdt.core.javanature + org.eclipse.m2e.core.maven2Nature + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..ec4300d --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,5 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 +org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 0000000..f897a7f --- /dev/null +++ b/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/project.clj b/project.clj index fd3b8bc..629ce65 100644 --- a/project.clj +++ b/project.clj @@ -65,5 +65,5 @@ :env {:port "45102"}} :project/test {:dependencies [[junit "4.12"] [org.mockito/mockito-all "1.10.19"] - [org.powermock/powermock-api-mockito "1.5.4"] - [org.powermock/powermock-module-junit4 "1.5.4"]]}}) + [org.powermock/powermock-api-mockito "1.6.4"] + [org.powermock/powermock-module-junit4 "1.6.4"]]}}) diff --git a/test/net/unit8/job_streamer/control_bus/HolidayTest.java b/test/java/net/unit8/job_streamer/control_bus/HolidayTest.java similarity index 100% rename from test/net/unit8/job_streamer/control_bus/HolidayTest.java rename to test/java/net/unit8/job_streamer/control_bus/HolidayTest.java diff --git a/test/org/jobstreamer/batch/ShellBatchletTest.java b/test/java/org/jobstreamer/batch/ShellBatchletTest.java similarity index 73% rename from test/org/jobstreamer/batch/ShellBatchletTest.java rename to test/java/org/jobstreamer/batch/ShellBatchletTest.java index f4e65ce..4477006 100644 --- a/test/org/jobstreamer/batch/ShellBatchletTest.java +++ b/test/java/org/jobstreamer/batch/ShellBatchletTest.java @@ -21,17 +21,16 @@ @RunWith(PowerMockRunner.class) @PrepareForTest({ShellBatchlet.class,Logger.class}) public class ShellBatchletTest { - private static final String BAT_FILE_PATH = "test/resources/test.bat"; - + private static final String BAT_FILE_PATH = "test/resources/test.bat"; + private static final String SHELL_FILE_PATH = "test/resources/test"; private static final String TEST_MESSAGE = "test"; - private final static ShellBatchlet TARGET = new ShellBatchlet(); private StepContext sc = mock (StepContext.class); - - Properties properties = new Properties(); - - Logger logger = Mockito.mock(Logger.class); + private Properties properties = new Properties(); + private Logger logger = Mockito.mock(Logger.class); + private boolean isWindows = System.getProperty("os.name").startsWith("Windows"); + private String fileName; @Before public void setup() throws Throwable{ @@ -39,14 +38,14 @@ public void setup() throws Throwable{ Field f= TARGET.getClass().getDeclaredField("stepContext"); f.set(TARGET, sc); setFinalStatic(ShellBatchlet.class.getDeclaredField("logger"),logger); + fileName =isWindows ? BAT_FILE_PATH : SHELL_FILE_PATH; } + @Test - public void args指定なし() throws Throwable{ + public void args0() throws Throwable{ when(sc.getProperties()).thenReturn(properties); - //for windows - TARGET.executeScript(Paths.get(BAT_FILE_PATH)); - //TODO:create linux version + TARGET.executeScript(Paths.get(fileName)); verify(logger,never()).info(TEST_MESSAGE); @@ -55,23 +54,19 @@ public void setup() throws Throwable{ } @Test - public void args指定一つ() throws Throwable{ + public void args1() throws Throwable{ properties.setProperty("args", TEST_MESSAGE); when(sc.getProperties()).thenReturn(properties); - //for windows - TARGET.executeScript(Paths.get(BAT_FILE_PATH)); - //TODO:create linux version + TARGET.executeScript(Paths.get(fileName)); verify(logger,times(1)).info(TEST_MESSAGE); } @Test - public void args指定複数() throws Throwable{ + public void args2() throws Throwable{ properties.setProperty("args", TEST_MESSAGE + " " + TEST_MESSAGE); when(sc.getProperties()).thenReturn(properties); - //for windows - TARGET.executeScript(Paths.get(BAT_FILE_PATH)); - //TODO:create linux version + TARGET.executeScript(Paths.get(fileName)); verify(logger,times(2)).info(TEST_MESSAGE); } diff --git a/test/resources/test b/test/resources/test new file mode 100755 index 0000000..283fd07 --- /dev/null +++ b/test/resources/test @@ -0,0 +1,2 @@ +echo $1 +echo $2 diff --git a/test/resources/test.bat b/test/resources/test.bat old mode 100644 new mode 100755 index bd13745..365fbb4 --- a/test/resources/test.bat +++ b/test/resources/test.bat @@ -1,2 +1,2 @@ echo %1 -echo %2 \ No newline at end of file +echo %2 From 44e106debfc1dfb952418c955b04dbdfb1a38486 Mon Sep 17 00:00:00 2001 From: Yuki Seki Date: Tue, 2 Aug 2016 02:30:57 +0900 Subject: [PATCH 06/12] update develop version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0034eec..b336edf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.5.1-SNAPSHOT +0.6.0-SNAPSHOT From 2c0db7c9307b84ab368130fac5983c51eeb6f0a6 Mon Sep 17 00:00:00 2001 From: Yuki Seki Date: Thu, 4 Aug 2016 18:38:48 +0900 Subject: [PATCH 07/12] make it can proceed if content-type contains charset --- src/clj/job_streamer/control_bus/util.clj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/clj/job_streamer/control_bus/util.clj b/src/clj/job_streamer/control_bus/util.clj index 89e6262..1dad09a 100644 --- a/src/clj/job_streamer/control_bus/util.clj +++ b/src/clj/job_streamer/control_bus/util.clj @@ -3,6 +3,7 @@ [clojure.edn :as edn] [clojure.java.io :as io] [datomic.api :as d]) + (:use [ring.util.request :only [content-type]]) (:import [org.jsoup Jsoup])) (defn to-int [n default-value] @@ -34,7 +35,7 @@ job-id (or job-id (d/tempid :db.part/user)) ] (concat [{:db/id job-id :job/name (:job/name job) - :job/restartable? (get job :job/restartable? true) + :job/restartable? (get job :job/restartable? true) :job/edn-notation (pr-str job) :job/steps step-refs :job/exclusive? (get job :job/exclusive? false)}] @@ -129,7 +130,7 @@ (when (#{:put :post} (get-in context [:request :request-method])) (try (if-let [body (body-as-string context)] - (case (get-in context [:request :content-type]) + (case (content-type (:request context)) "application/edn" [false {:edn (edn/read-string body)}] "application/xml" [false {:edn (xml->edn body)}] false) From 146e1ab4ceff01ff7277577765bb3855f237fd7e Mon Sep 17 00:00:00 2001 From: Yuki Seki Date: Thu, 4 Aug 2016 20:04:03 +0900 Subject: [PATCH 08/12] apply test --- src/clj/job_streamer/control_bus/util.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/clj/job_streamer/control_bus/util.clj b/src/clj/job_streamer/control_bus/util.clj index 1dad09a..04c8cf1 100644 --- a/src/clj/job_streamer/control_bus/util.clj +++ b/src/clj/job_streamer/control_bus/util.clj @@ -130,7 +130,7 @@ (when (#{:put :post} (get-in context [:request :request-method])) (try (if-let [body (body-as-string context)] - (case (content-type (:request context)) + (case (or (content-type (:request context)) (get-in context [:request :content-type])) "application/edn" [false {:edn (edn/read-string body)}] "application/xml" [false {:edn (xml->edn body)}] false) From 762c90569964774b30879228bb65389635910243 Mon Sep 17 00:00:00 2001 From: tis304224 Date: Fri, 26 Aug 2016 14:51:20 +0900 Subject: [PATCH 09/12] remove eclipse settings and add gitignore --- .classpath | 39 ---------------------------- .gitignore | 3 +++ .project | 23 ---------------- .settings/org.eclipse.jdt.core.prefs | 5 ---- .settings/org.eclipse.m2e.core.prefs | 4 --- 5 files changed, 3 insertions(+), 71 deletions(-) delete mode 100644 .classpath delete mode 100644 .project delete mode 100644 .settings/org.eclipse.jdt.core.prefs delete mode 100644 .settings/org.eclipse.m2e.core.prefs diff --git a/.classpath b/.classpath deleted file mode 100644 index 5844da4..0000000 --- a/.classpath +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index 7d790fc..d84c6ce 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,6 @@ pom.xml *.iml /lib /rrd +.project +.classpath +.settings \ No newline at end of file diff --git a/.project b/.project deleted file mode 100644 index 8b87aff..0000000 --- a/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - job-streamer-control-bus - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index ec4300d..0000000 --- a/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,5 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 -org.eclipse.jdt.core.compiler.compliance=1.7 -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 From a225e9d77c8102d31e771210ae6239ad233f12c8 Mon Sep 17 00:00:00 2001 From: kawasima Date: Tue, 30 Aug 2016 10:41:28 +0900 Subject: [PATCH 10/12] Remove redundant code --- src/java/org/jobstreamer/batch/ShellBatchlet.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/java/org/jobstreamer/batch/ShellBatchlet.java b/src/java/org/jobstreamer/batch/ShellBatchlet.java index 18baf19..3b27aca 100644 --- a/src/java/org/jobstreamer/batch/ShellBatchlet.java +++ b/src/java/org/jobstreamer/batch/ShellBatchlet.java @@ -52,16 +52,14 @@ private Path createTemporaryScript(URL resourceUrl, String script) throws IOExce String executeScript(Path script) { String args = stepContext.getProperties().getProperty("args"); - ProcessBuilder pb = null; String processToString = script.toAbsolutePath().toString(); - if (args == null) { - pb = new ProcessBuilder(processToString); - } else { - List processAndArgs = new ArrayList(); - processAndArgs.add(processToString); - processAndArgs.addAll(Arrays.asList(args.split(" "))); - pb = new ProcessBuilder((String[]) processAndArgs.toArray(new String[0])); + List processAndArgs = new ArrayList(); + processAndArgs.add(processToString); + + if (args != null && !args.isEmpty()) { + processAndArgs.addAll(Arrays.asList(args.split("\\s+"))); } + ProcessBuilder pb = new ProcessBuilder(processAndArgs); pb.redirectErrorStream(true); try { From 9c2c11b93dd1108d03dc5fea4e277f8175cb85bb Mon Sep 17 00:00:00 2001 From: kawasima Date: Tue, 30 Aug 2016 10:46:04 +0900 Subject: [PATCH 11/12] Use instead of --- src/clj/job_streamer/control_bus/util.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/clj/job_streamer/control_bus/util.clj b/src/clj/job_streamer/control_bus/util.clj index 04c8cf1..1a8b706 100644 --- a/src/clj/job_streamer/control_bus/util.clj +++ b/src/clj/job_streamer/control_bus/util.clj @@ -2,8 +2,8 @@ (:require [clojure.tools.logging :as log] [clojure.edn :as edn] [clojure.java.io :as io] - [datomic.api :as d]) - (:use [ring.util.request :only [content-type]]) + [datomic.api :as d] + [ring.util.request :refer [content-type]]) (:import [org.jsoup Jsoup])) (defn to-int [n default-value] From 3c61f855f4256d85052ca41d0b73c2af60a642a2 Mon Sep 17 00:00:00 2001 From: kawasima Date: Tue, 30 Aug 2016 15:49:57 +0900 Subject: [PATCH 12/12] Fixed the version for the release --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b336edf..a918a2a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.6.0-SNAPSHOT +0.6.0