storm-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bo...@apache.org
Subject [1/4] storm git commit: STORM-1534: Pick correct version of jackson-annotations jar
Date Thu, 11 Feb 2016 15:34:12 GMT
Repository: storm
Updated Branches:
  refs/heads/master 3339dae6b -> e6a7eefde


STORM-1534: Pick correct version of jackson-annotations jar


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f8ee7b89
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f8ee7b89
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f8ee7b89

Branch: refs/heads/master
Commit: f8ee7b892a8236bb7f2f11ec427549d3bf438169
Parents: 53e44ff
Author: Abhishek Agarwal <abhishek.agarwal@inmobi.com>
Authored: Tue Feb 9 21:23:07 2016 +0530
Committer: Abhishek Agarwal <abhishek.agarwal@inmobi.com>
Committed: Tue Feb 9 21:23:07 2016 +0530

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


http://git-wip-us.apache.org/repos/asf/storm/blob/f8ee7b89/external/sql/storm-sql-core/pom.xml
----------------------------------------------------------------------
diff --git a/external/sql/storm-sql-core/pom.xml b/external/sql/storm-sql-core/pom.xml
index 0ffea80..aa26762 100644
--- a/external/sql/storm-sql-core/pom.xml
+++ b/external/sql/storm-sql-core/pom.xml
@@ -80,9 +80,18 @@
                     <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>
             <scope>runtime</scope>

http://git-wip-us.apache.org/repos/asf/storm/blob/f8ee7b89/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 831059a..c76b263 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>


Mime
View raw message