Try to unfuck merge from merge that was based on master. Oh git. I do not understand you. At all.
diff --git a/pom.xml b/pom.xml
index 2a5b80e..f90ae1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.9.0-SNAPSHOT</version>
+ <version>2.8.3-SNAPSHOT</version>
<name>jackson-databind</name>
<packaging>bundle</packaging>
<description>General data-binding functionality for Jackson: works on core streaming API</description>
@@ -25,11 +25,9 @@
</scm>
<properties>
- <!-- With Jackson 2.9 we will require JDK 7 (except for annotations/streaming),
+ <!-- With Jackson 2.8 we will require JDK 7 (except for annotations/streaming),
and new language features (diamond pattern) may be used.
- JDK classes are still loaded dynamically since there isn't much downside
- (small number of types); this allows use on JDK 6 platforms still (including
- Android)
+ Whether JDK dependencies are directly used is an open question as of Feb-2016
-->
<javac.src.version>1.7</javac.src.version>
<javac.target.version>1.7</javac.target.version>