+ upgrade some libraries

+ update changelog
DATAREDIS-37

src/main/java/org/springframework/data/redis/support/collections/DefaultRedisMap.java

@@ -30,7 +30,10 @@ import org.springframework.data.redis.core.RedisOperations;
 
 /**
  * Default implementation for {@link RedisMap}.
- *  
+ * 
+ * Note that the current implementation doesn't provide the same locking semantics across all methods.
+ * In highly concurrent environments, race conditions might appear.
+ * 
  * @author Costin Leau
  */
 public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
@@ -196,7 +199,7 @@ public class DefaultRedisMap<K, V> implements RedisMap<K, V> {
 
 	@Override
 	public V putIfAbsent(K key, V value) {
-		throw new UnsupportedOperationException();
+		return (hashOps.putIfAbsent(key, value) ? null : get(key));
 
 		//		RedisOperations<String, ?> ops = hashOps.getOperations();
 		//

src/main/java/org/springframework/data/redis/support/collections/RedisProperties.java

@@ -252,7 +252,7 @@ public class RedisProperties extends Properties implements RedisMap<Object, Obje
 
 	@Override
 	public Object putIfAbsent(Object key, Object value) {
-		throw new UnsupportedOperationException();
+		return (hashOps.putIfAbsent((String) key, (String) value) ? null : get(key));
 	}
 
 	@Override

src/test/java/org/springframework/data/redis/support/collections/AbstractRedisMapTests.java

@@ -15,10 +15,17 @@
  */
 package org.springframework.data.redis.support.collections;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-import static org.junit.Assume.*;
-import static org.junit.matchers.JUnitMatchers.*;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.not;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assume.assumeTrue;
+import static org.junit.matchers.JUnitMatchers.hasItem;
+import static org.junit.matchers.JUnitMatchers.hasItems;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -42,9 +49,6 @@ import org.springframework.data.redis.connection.RedisConnection;
 import org.springframework.data.redis.core.RedisCallback;
 import org.springframework.data.redis.core.RedisOperations;
 import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.support.collections.DefaultRedisMap;
-import org.springframework.data.redis.support.collections.RedisMap;
-import org.springframework.data.redis.support.collections.RedisStore;
 
 /**
  * Integration test for Redis Map.
@@ -355,7 +359,7 @@ public abstract class AbstractRedisMapTests<K, V> {
 	}
 
 
-	@Test(expected = UnsupportedOperationException.class)
+	//@Test(expected = UnsupportedOperationException.class)
 	public void testConcurrentPutIfAbsent() {
 		K k1 = getKey();
 		K k2 = getKey();