Merge branch 'master' of github.com:FasterXML/jackson-databind

FasterXML · Sep 15, 2014 · 8667b6d · 8667b6d
2 parents 6cf6585 + 4865f14
commit 8667b6d
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -376,7 +376,7 @@ Main differences compared to 1.0 "mapper" jar are:
 
 # Further reading
 
-* [Documentation](https://github.com/FasterXML/jackson-databind/wiki/Documentation)
+* [Documentation](https://github.com/FasterXML/jackson-databind/wiki)
 
 Related:
 

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.fasterxml.jackson</groupId>
     <artifactId>jackson-parent</artifactId>
-    <version>2.5-SNAPSHOT</version>
+    <version>2.5-rc1</version>
   </parent>
 
   <groupId>com.fasterxml.jackson.core</groupId>

diff --git a/src/main/java/com/fasterxml/jackson/databind/DeserializationFeature.java b/src/main/java/com/fasterxml/jackson/databind/DeserializationFeature.java
@@ -246,7 +246,7 @@ public enum DeserializationFeature implements ConfigFeature
      * kinds of JSON values); if enable, empty JSON String can be taken
      * to be equivalent of JSON null.
      *<p>
-     * Feature is enabled by default.
+     * Feature is disabled by default.
      */
     ACCEPT_EMPTY_STRING_AS_NULL_OBJECT(false),
 

diff --git a/src/main/java/com/fasterxml/jackson/databind/ser/std/AsArraySerializerBase.java b/src/main/java/com/fasterxml/jackson/databind/ser/std/AsArraySerializerBase.java
@@ -1,7 +1,6 @@
 package com.fasterxml.jackson.databind.ser.std;
 
 import java.io.IOException;
-import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 
 import com.fasterxml.jackson.core.*;
@@ -15,7 +14,6 @@
 import com.fasterxml.jackson.databind.ser.ContainerSerializer;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.impl.PropertySerializerMap;
-import com.fasterxml.jackson.databind.type.TypeFactory;
 
 /**
  * Base class for serializers that will output contents as JSON