From f8ee7b892a8236bb7f2f11ec427549d3bf438169 Mon Sep 17 00:00:00 2001
From: Abhishek Agarwal <abhishek.agarwal@inmobi.com>
Date: Tue, 9 Feb 2016 21:23:07 +0530
Subject: [PATCH 1/2] STORM-1534: Pick correct version of jackson-annotations
 jar

---
 external/sql/storm-sql-core/pom.xml | 9 +++++++++
 pom.xml                             | 1 -
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/external/sql/storm-sql-core/pom.xml b/external/sql/storm-sql-core/pom.xml
index 0ffea80920a..aa26762b47b 100644
--- a/external/sql/storm-sql-core/pom.xml
+++ b/external/sql/storm-sql-core/pom.xml
@@ -80,8 +80,17 @@
                     <groupId>org.pentaho</groupId>
                     <artifactId>pentaho-aggdesigner-algorithm</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>com.fasterxml.jackson.core</groupId>
+                    <artifactId>jackson-annotations</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
diff --git a/pom.xml b/pom.xml
index 831059aba9b..c76b263932f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -231,7 +231,6 @@
         <kryo.version>2.21</kryo.version>
         <servlet.version>2.5</servlet.version>
         <joda-time.version>2.3</joda-time.version>
-        <jackson.version>2.3.1</jackson.version>
         <thrift.version>0.9.3</thrift.version>
         <junit.version>4.11</junit.version>
         <metrics-clojure.version>2.5.1</metrics-clojure.version>

From 8fe6cf7dfbdaaae84e1272af0d4cf9292138da9e Mon Sep 17 00:00:00 2001
From: Abhishek Agarwal <abhishek.agarwal@inmobi.com>
Date: Tue, 9 Feb 2016 21:23:51 +0530
Subject: [PATCH 2/2] STORM-1533: IntegerValidator for metric consumer
 parallelism hint

---
 .../src/jvm/org/apache/storm/validation/ConfigValidation.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/storm-core/src/jvm/org/apache/storm/validation/ConfigValidation.java b/storm-core/src/jvm/org/apache/storm/validation/ConfigValidation.java
index 4ec5ffda10f..edff5cfd953 100644
--- a/storm-core/src/jvm/org/apache/storm/validation/ConfigValidation.java
+++ b/storm-core/src/jvm/org/apache/storm/validation/ConfigValidation.java
@@ -473,7 +473,7 @@ public void validateField(String name, Object o) {
             }
 
             SimpleTypeValidator.validateField(name, String.class, ((Map) o).get("class"));
-            SimpleTypeValidator.validateField(name, Long.class, ((Map) o).get("parallelism.hint"));
+            new IntegerValidator().validateField(name, ((Map) o).get("parallelism.hint"));
         }
     }