You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by sr...@apache.org on 2015/08/30 17:03:28 UTC
[1/3] storm git commit: STORM-1012: Shading jackson.
Repository: storm
Updated Branches:
refs/heads/master 07e0ff2e2 -> bf5c35ba4
STORM-1012: Shading jackson.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/612b3df8
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/612b3df8
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/612b3df8
Branch: refs/heads/master
Commit: 612b3df8f3a0213e0b2f28834afc1b5f6ff399b1
Parents: 528958c
Author: Parth Brahmbhatt <br...@gmail.com>
Authored: Wed Aug 26 16:37:18 2015 -0700
Committer: Parth Brahmbhatt <br...@gmail.com>
Committed: Wed Aug 26 16:37:18 2015 -0700
----------------------------------------------------------------------
storm-core/pom.xml | 10 ++++++++++
storm-dist/binary/src/main/assembly/binary.xml | 2 ++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/612b3df8/storm-core/pom.xml
----------------------------------------------------------------------
diff --git a/storm-core/pom.xml b/storm-core/pom.xml
index 872d605..db1f1bd 100644
--- a/storm-core/pom.xml
+++ b/storm-core/pom.xml
@@ -388,11 +388,21 @@
<include>org.clojure:tools.macro</include>
<include>joda-time:joda-time</include>
<include>org.eclipse.jetty:*</include>
+ <include>com.fasterxml.jackson.core:*</include>
+ <include>com.fasterxml.jackson.dataformat:*</include>
</includes>
</artifactSet>
<relocations>
<relocation>
+ <pattern>com.fasterxml.jackson.core</pattern>
+ <shadedPattern>com.fasterxml.jackson.storm.core</shadedPattern>
+ </relocation>
+ <relocation>
+ <pattern>com.fasterxml.jackson.dataformat</pattern>
+ <shadedPattern>com.fasterxml.jackson.storm.dataformat</shadedPattern>
+ </relocation>
+ <relocation>
<pattern>org.apache.thrift</pattern>
<shadedPattern>org.apache.thrift7</shadedPattern>
</relocation>
http://git-wip-us.apache.org/repos/asf/storm/blob/612b3df8/storm-dist/binary/src/main/assembly/binary.xml
----------------------------------------------------------------------
diff --git a/storm-dist/binary/src/main/assembly/binary.xml b/storm-dist/binary/src/main/assembly/binary.xml
index bb77a0a..1cc4501 100644
--- a/storm-dist/binary/src/main/assembly/binary.xml
+++ b/storm-dist/binary/src/main/assembly/binary.xml
@@ -59,6 +59,8 @@
<exclude>org.clojure:tools.macro</exclude>
<exclude>joda-time:joda-time</exclude>
<exclude>org.eclipse.jetty:*</exclude>
+ <exclude>com.fasterxml.jackson.core:*</exclude>
+ <exclude>com.fasterxml.jackson.dataformat:*</exclude>
</excludes>
</dependencySet>
</dependencySets>
[2/3] storm git commit: Merge branch 'STORM-1012' of
http://github.com/Parth-Brahmbhatt/incubator-storm into STORM-1012
Posted by sr...@apache.org.
Merge branch 'STORM-1012' of http://github.com/Parth-Brahmbhatt/incubator-storm into STORM-1012
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/539ea98a
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/539ea98a
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/539ea98a
Branch: refs/heads/master
Commit: 539ea98a1d12d516b04b9aabf7af807cede3b632
Parents: 07e0ff2 612b3df
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Sun Aug 30 07:52:02 2015 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Sun Aug 30 07:52:02 2015 -0700
----------------------------------------------------------------------
storm-core/pom.xml | 10 ++++++++++
storm-dist/binary/src/main/assembly/binary.xml | 2 ++
2 files changed, 12 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/539ea98a/storm-dist/binary/src/main/assembly/binary.xml
----------------------------------------------------------------------
[3/3] storm git commit: Added STORM-1012 to CHANGELOG.
Posted by sr...@apache.org.
Added STORM-1012 to CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/bf5c35ba
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/bf5c35ba
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/bf5c35ba
Branch: refs/heads/master
Commit: bf5c35ba49e5653b661a28a8273e0248d50c7fdf
Parents: 539ea98
Author: Sriharsha Chintalapani <ha...@hortonworks.com>
Authored: Sun Aug 30 07:52:50 2015 -0700
Committer: Sriharsha Chintalapani <ha...@hortonworks.com>
Committed: Sun Aug 30 07:52:50 2015 -0700
----------------------------------------------------------------------
CHANGELOG.md | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/bf5c35ba/CHANGELOG.md
----------------------------------------------------------------------
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4709947..a917e3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,5 @@
## 0.11.0
+ * STORM-1012: Shading jackson.
* STORM-974: [storm-elasticsearch] Introduces Tuple -> ES document mapper to get rid of constant field mapping (source, index, type)
* STORM-978: [storm-elasticsearch] Introduces Lookup(or Query)Bolt which emits matched documents from ES
* STORM-851: Storm Solr connector