diff --git a/spring-datastore-keyvalue-parent/pom.xml b/spring-datastore-keyvalue-parent/pom.xml index 4cd52ec6a..1604f08f6 100644 --- a/spring-datastore-keyvalue-parent/pom.xml +++ b/spring-datastore-keyvalue-parent/pom.xml @@ -14,9 +14,9 @@ 4.8.1 1.2.15 - 1.5.6 + 1.6.1 1.8.4 - 1.5.10 + 1.5.8 3.0.5.RELEASE spring-datastore-keyvalue diff --git a/spring-datastore-riak/pom.xml b/spring-datastore-riak/pom.xml index 4cdf2754f..246348fc9 100644 --- a/spring-datastore-riak/pom.xml +++ b/spring-datastore-riak/pom.xml @@ -50,16 +50,17 @@ org.slf4j slf4j-api + provided org.slf4j jcl-over-slf4j - compile + provided org.slf4j slf4j-log4j12 - runtime + provided log4j @@ -82,7 +83,7 @@ jmxri - runtime + provided diff --git a/spring-datastore-riak/src/main/java/org/springframework/datastore/riak/mapreduce/ErlangMapReduceOperation.java b/spring-datastore-riak/src/main/java/org/springframework/datastore/riak/mapreduce/ErlangMapReduceOperation.java index 2c19fa800..0b9583183 100644 --- a/spring-datastore-riak/src/main/java/org/springframework/datastore/riak/mapreduce/ErlangMapReduceOperation.java +++ b/spring-datastore-riak/src/main/java/org/springframework/datastore/riak/mapreduce/ErlangMapReduceOperation.java @@ -12,6 +12,14 @@ public class ErlangMapReduceOperation implements MapReduceOperation { protected String language = "erlang"; protected Map moduleFunction = new LinkedHashMap(); + public ErlangMapReduceOperation() { + } + + public ErlangMapReduceOperation(String module, String function) { + setModule(module); + setFunction(function); + } + public void setModule(String module) { moduleFunction.put("module", module); } diff --git a/spring-datastore-riak/src/main/java/org/springframework/datastore/riak/mapreduce/MapReducePhase.java b/spring-datastore-riak/src/main/java/org/springframework/datastore/riak/mapreduce/MapReducePhase.java index 681dc27a5..d396ebffa 100644 --- a/spring-datastore-riak/src/main/java/org/springframework/datastore/riak/mapreduce/MapReducePhase.java +++ b/spring-datastore-riak/src/main/java/org/springframework/datastore/riak/mapreduce/MapReducePhase.java @@ -21,7 +21,7 @@ package org.springframework.datastore.riak.mapreduce; */ public interface MapReducePhase { - public enum Phase { + public static enum Phase { MAP, REDUCE }