Repository: flink
Updated Branches:
  refs/heads/master 40be172e4 -> 8e429ced2


http://git-wip-us.apache.org/repos/asf/flink/blob/8e429ced/flink-contrib/src/main/resources/HashTagTweetSample.json
----------------------------------------------------------------------
diff --git a/flink-contrib/src/main/resources/HashTagTweetSample.json 
b/flink-contrib/src/main/resources/HashTagTweetSample.json
new file mode 100644
index 0000000..e17999c
--- /dev/null
+++ b/flink-contrib/src/main/resources/HashTagTweetSample.json
@@ -0,0 +1,4 @@
+{"created_at":"Wed Aug 20 21:58:34 +0000 
2014","id":502213125421412352,"id_str":"502213125421412352","text":"Cooler than 
a wine glass. Witcho fine ass \ud83d\ude0c 
http:\/\/t.co\/uSJwfwRYNk","source":"\u003ca 
href=\"http:\/\/twitter.com\/download\/iphone\" rel=\"nofollow\"\u003eTwitter 
for 
iPhone\u003c\/a\u003e","truncated":false,"in_reply_to_status_id":null,"in_reply_to_status_id_str":null,"in_reply_to_user_id":null,"in_reply_to_user_id_str":null,"in_reply_to_screen_name":null,"user":{"id":452474201,"id_str":"452474201","name":"Shawnna
 \u2652\ufe0f","screen_name":"ThaaOddOne","location":"Onnat 
Ass","url":"http:\/\/contradictiveoxymoron.tumblr.com","description":"Booty.","protected":false,"verified":false,"followers_count":986,"friends_count":590,"listed_count":2,"favourites_count":1748,"statuses_count":35562,"created_at":"Sun
 Jan 01 22:06:19 +0000 2012","utc_offset":-18000,"time_zone":"Central Time (US 
& Canada)","geo_enabled":true,"lang":"en","contributors_enabled":false,"is_trans
 
lator":false,"profile_background_color":"022330","profile_background_image_url":"http:\/\/pbs.twimg.com\/profile_background_images\/378800000047672066\/d6cfdb19d8b56a6c388491b00a9a1fcb.jpeg","profile_background_image_url_https":"https:\/\/pbs.twimg.com\/profile_background_images\/378800000047672066\/d6cfdb19d8b56a6c388491b00a9a1fcb.jpeg","profile_background_tile":true,"profile_link_color":"0084B4","profile_sidebar_border_color":"000000","profile_sidebar_fill_color":"DDEEF6","profile_text_color":"333333","profile_use_background_image":true,"profile_image_url":"http:\/\/pbs.twimg.com\/profile_images\/501811487984611328\/WfUh6Mb7_normal.jpeg","profile_image_url_https":"https:\/\/pbs.twimg.com\/profile_images\/501811487984611328\/WfUh6Mb7_normal.jpeg","profile_banner_url":"https:\/\/pbs.twimg.com\/profile_banners\/452474201\/1408484011","default_profile":false,"default_profile_image":false,"following":null,"follow_request_sent":null,"notifications":null},"geo":null,"coordinates":null,"p
 
lace":null,"contributors":null,"retweet_count":4,"favorite_count":1,"entities":{"hashtags":[{"text":"example","indices":[0,16]},{"text":"tweet","indices":[118,125]}],"trends":[],"urls":[],"user_mentions":[],"symbols":[],"media":[{"id":502213094119325697,"id_str":"502213094119325697","indices":[44,66],"media_url":"http:\/\/pbs.twimg.com\/media\/Bvg4JfSIQAEihSw.jpg","media_url_https":"https:\/\/pbs.twimg.com\/media\/Bvg4JfSIQAEihSw.jpg","url":"http:\/\/t.co\/uSJwfwRYNk","display_url":"pic.twitter.com\/uSJwfwRYNk","expanded_url":"http:\/\/twitter.com\/ThaaOddOne\/status\/502213125421412352\/photo\/1","type":"photo","sizes":{"medium":{"w":600,"h":800,"resize":"fit"},"thumb":{"w":150,"h":150,"resize":"crop"},"small":{"w":340,"h":453,"resize":"fit"},"large":{"w":768,"h":1024,"resize":"fit"}}}]},"favorited":false,"retweeted":false,"possibly_sensitive":false,"filter_level":"low","lang":"en"},"retweet_count":0,"favorite_count":0,"entities":{"hashtags":[],"trends":[],"urls":[],"user_mentions"
 :[{"screen_name":"ThaaOddOne","name":"Shawnna 
\u2652\ufe0f","id":452474201,"id_str":"452474201","indices":[3,14]}],"symbols":[],"media":[{"id":502213094119325697,"id_str":"502213094119325697","indices":[60,82],"media_url":"http:\/\/pbs.twimg.com\/media\/Bvg4JfSIQAEihSw.jpg","media_url_https":"https:\/\/pbs.twimg.com\/media\/Bvg4JfSIQAEihSw.jpg","url":"http:\/\/t.co\/uSJwfwRYNk","display_url":"pic.twitter.com\/uSJwfwRYNk","expanded_url":"http:\/\/twitter.com\/ThaaOddOne\/status\/502213125421412352\/photo\/1","type":"photo","sizes":{"medium":{"w":600,"h":800,"resize":"fit"},"thumb":{"w":150,"h":150,"resize":"crop"},"small":{"w":340,"h":453,"resize":"fit"},"large":{"w":768,"h":1024,"resize":"fit"}},"source_status_id":502213125421412352,"source_status_id_str":"502213125421412352"}]},"favorited":false,"retweeted":false,"possibly_sensitive":false,"filter_level":"medium","lang":"en"}
+{"created_at":"Wed Aug 20 21:58:34 +0000 
2014","id":502213125421412353,"id_str":"502213125421412353","text":"Cooler than 
a wine glass. Witcho fine ass \ud83d\ude0c 
http:\/\/t.co\/uSJwfwRYNk","source":"\u003ca 
href=\"http:\/\/twitter.com\/download\/iphone\" rel=\"nofollow\"\u003eTwitter 
for 
iPhone\u003c\/a\u003e","truncated":false,"in_reply_to_status_id":null,"in_reply_to_status_id_str":null,"in_reply_to_user_id":null,"in_reply_to_user_id_str":null,"in_reply_to_screen_name":null,"user":{"id":452474201,"id_str":"452474201","name":"Shawnna
 \u2652\ufe0f","screen_name":"ThaaOddOne","location":"Onnat 
Ass","url":"http:\/\/contradictiveoxymoron.tumblr.com","description":"Booty.","protected":false,"verified":false,"followers_count":986,"friends_count":590,"listed_count":2,"favourites_count":1748,"statuses_count":35562,"created_at":"Sun
 Jan 01 22:06:19 +0000 2012","utc_offset":-18000,"time_zone":"Central Time (US 
& Canada)","geo_enabled":true,"lang":"en","contributors_enabled":false,"is_trans
 
lator":false,"profile_background_color":"022330","profile_background_image_url":"http:\/\/pbs.twimg.com\/profile_background_images\/378800000047672066\/d6cfdb19d8b56a6c388491b00a9a1fcb.jpeg","profile_background_image_url_https":"https:\/\/pbs.twimg.com\/profile_background_images\/378800000047672066\/d6cfdb19d8b56a6c388491b00a9a1fcb.jpeg","profile_background_tile":true,"profile_link_color":"0084B4","profile_sidebar_border_color":"000000","profile_sidebar_fill_color":"DDEEF6","profile_text_color":"333333","profile_use_background_image":true,"profile_image_url":"http:\/\/pbs.twimg.com\/profile_images\/501811487984611328\/WfUh6Mb7_normal.jpeg","profile_image_url_https":"https:\/\/pbs.twimg.com\/profile_images\/501811487984611328\/WfUh6Mb7_normal.jpeg","profile_banner_url":"https:\/\/pbs.twimg.com\/profile_banners\/452474201\/1408484011","default_profile":false,"default_profile_image":false,"following":null,"follow_request_sent":null,"notifications":null},"geo":null,"coordinates":null,"p
 
lace":null,"contributors":null,"retweet_count":4,"favorite_count":1,"entities":{"hashtags":[{"text":"example","indices":[0,16]},{"text":"tweet","indices":[118,125]}],"trends":[],"urls":[],"user_mentions":[],"symbols":[],"media":[{"id":502213094119325697,"id_str":"502213094119325697","indices":[44,66],"media_url":"http:\/\/pbs.twimg.com\/media\/Bvg4JfSIQAEihSw.jpg","media_url_https":"https:\/\/pbs.twimg.com\/media\/Bvg4JfSIQAEihSw.jpg","url":"http:\/\/t.co\/uSJwfwRYNk","display_url":"pic.twitter.com\/uSJwfwRYNk","expanded_url":"http:\/\/twitter.com\/ThaaOddOne\/status\/502213125421412352\/photo\/1","type":"photo","sizes":{"medium":{"w":600,"h":800,"resize":"fit"},"thumb":{"w":150,"h":150,"resize":"crop"},"small":{"w":340,"h":453,"resize":"fit"},"large":{"w":768,"h":1024,"resize":"fit"}}}]},"favorited":false,"retweeted":false,"possibly_sensitive":false,"filter_level":"low","lang":"en"},"retweet_count":0,"favorite_count":0,"entities":{"hashtags":[],"trends":[],"urls":[],"user_mentions"
 :[{"screen_name":"ThaaOddOne","name":"Shawnna 
\u2652\ufe0f","id":452474201,"id_str":"452474201","indices":[3,14]}],"symbols":[],"media":[{"id":502213094119325697,"id_str":"502213094119325697","indices":[60,82],"media_url":"http:\/\/pbs.twimg.com\/media\/Bvg4JfSIQAEihSw.jpg","media_url_https":"https:\/\/pbs.twimg.com\/media\/Bvg4JfSIQAEihSw.jpg","url":"http:\/\/t.co\/uSJwfwRYNk","display_url":"pic.twitter.com\/uSJwfwRYNk","expanded_url":"http:\/\/twitter.com\/ThaaOddOne\/status\/502213125421412352\/photo\/1","type":"photo","sizes":{"medium":{"w":600,"h":800,"resize":"fit"},"thumb":{"w":150,"h":150,"resize":"crop"},"small":{"w":340,"h":453,"resize":"fit"},"large":{"w":768,"h":1024,"resize":"fit"}},"source_status_id":502213125421412352,"source_status_id_str":"502213125421412352"}]},"favorited":false,"retweeted":false,"possibly_sensitive":false,"filter_level":"medium","lang":"en"}
+{"created_at":"Wed Aug 20 21:58:34 +0000 
2014","id":502213125421412354,"id_str":"502213125421412354","text":"Cooler than 
a wine glass. Witcho fine ass \ud83d\ude0c 
http:\/\/t.co\/uSJwfwRYNk","source":"\u003ca 
href=\"http:\/\/twitter.com\/download\/iphone\" rel=\"nofollow\"\u003eTwitter 
for 
iPhone\u003c\/a\u003e","truncated":false,"in_reply_to_status_id":null,"in_reply_to_status_id_str":null,"in_reply_to_user_id":null,"in_reply_to_user_id_str":null,"in_reply_to_screen_name":null,"user":{"id":452474201,"id_str":"452474201","name":"Shawnna
 \u2652\ufe0f","screen_name":"ThaaOddOne","location":"Onnat 
Ass","url":"http:\/\/contradictiveoxymoron.tumblr.com","description":"Booty.","protected":false,"verified":false,"followers_count":986,"friends_count":590,"listed_count":2,"favourites_count":1748,"statuses_count":35562,"created_at":"Sun
 Jan 01 22:06:19 +0000 2012","utc_offset":-18000,"time_zone":"Central Time (US 
& Canada)","geo_enabled":true,"lang":"en","contributors_enabled":false,"is_trans
 
lator":false,"profile_background_color":"022330","profile_background_image_url":"http:\/\/pbs.twimg.com\/profile_background_images\/378800000047672066\/d6cfdb19d8b56a6c388491b00a9a1fcb.jpeg","profile_background_image_url_https":"https:\/\/pbs.twimg.com\/profile_background_images\/378800000047672066\/d6cfdb19d8b56a6c388491b00a9a1fcb.jpeg","profile_background_tile":true,"profile_link_color":"0084B4","profile_sidebar_border_color":"000000","profile_sidebar_fill_color":"DDEEF6","profile_text_color":"333333","profile_use_background_image":true,"profile_image_url":"http:\/\/pbs.twimg.com\/profile_images\/501811487984611328\/WfUh6Mb7_normal.jpeg","profile_image_url_https":"https:\/\/pbs.twimg.com\/profile_images\/501811487984611328\/WfUh6Mb7_normal.jpeg","profile_banner_url":"https:\/\/pbs.twimg.com\/profile_banners\/452474201\/1408484011","default_profile":false,"default_profile_image":false,"following":null,"follow_request_sent":null,"notifications":null},"geo":null,"coordinates":null,"p
 
lace":null,"contributors":null,"retweet_count":4,"favorite_count":1,"entities":{"hashtags":[{"text":"last","indices":[0,16]},{"text":"example","indices":[118,125]},{"text":"that","indices":[118,125]}],"trends":[],"urls":[],"user_mentions":[],"symbols":[],"media":[{"id":502213094119325697,"id_str":"502213094119325697","indices":[44,66],"media_url":"http:\/\/pbs.twimg.com\/media\/Bvg4JfSIQAEihSw.jpg","media_url_https":"https:\/\/pbs.twimg.com\/media\/Bvg4JfSIQAEihSw.jpg","url":"http:\/\/t.co\/uSJwfwRYNk","display_url":"pic.twitter.com\/uSJwfwRYNk","expanded_url":"http:\/\/twitter.com\/ThaaOddOne\/status\/502213125421412352\/photo\/1","type":"photo","sizes":{"medium":{"w":600,"h":800,"resize":"fit"},"thumb":{"w":150,"h":150,"resize":"crop"},"small":{"w":340,"h":453,"resize":"fit"},"large":{"w":768,"h":1024,"resize":"fit"}}}]},"favorited":false,"retweeted":false,"possibly_sensitive":false,"filter_level":"low","lang":"en"},"retweet_count":0,"favorite_count":0,"entities":{"hashtags":[],"t
 
rends":[],"urls":[],"user_mentions":[{"screen_name":"ThaaOddOne","name":"Shawnna
 
\u2652\ufe0f","id":452474201,"id_str":"452474201","indices":[3,14]}],"symbols":[],"media":[{"id":502213094119325697,"id_str":"502213094119325697","indices":[60,82],"media_url":"http:\/\/pbs.twimg.com\/media\/Bvg4JfSIQAEihSw.jpg","media_url_https":"https:\/\/pbs.twimg.com\/media\/Bvg4JfSIQAEihSw.jpg","url":"http:\/\/t.co\/uSJwfwRYNk","display_url":"pic.twitter.com\/uSJwfwRYNk","expanded_url":"http:\/\/twitter.com\/ThaaOddOne\/status\/502213125421412352\/photo\/1","type":"photo","sizes":{"medium":{"w":600,"h":800,"resize":"fit"},"thumb":{"w":150,"h":150,"resize":"crop"},"small":{"w":340,"h":453,"resize":"fit"},"large":{"w":768,"h":1024,"resize":"fit"}},"source_status_id":502213125421412352,"source_status_id_str":"502213125421412352"}]},"favorited":false,"retweeted":false,"possibly_sensitive":false,"filter_level":"medium","lang":"en"}
+{"created_at":"Wed Aug 20 21:58:34 +0000 
2014","id":502213125421412355,"id_str":"502213125421412355","text":"Cooler than 
a wine glass. Witcho fine ass \ud83d\ude0c 
http:\/\/t.co\/uSJwfwRYNk","source":"\u003ca 
href=\"http:\/\/twitter.com\/download\/iphone\" rel=\"nofollow\"\u003eTwitter 
for 
iPhone\u003c\/a\u003e","truncated":false,"in_reply_to_status_id":null,"in_reply_to_status_id_str":null,"in_reply_to_user_id":null,"in_reply_to_user_id_str":null,"in_reply_to_screen_name":null,"user":{"id":452474201,"id_str":"452474201","name":"Shawnna
 \u2652\ufe0f","screen_name":"ThaaOddOne","location":"Onnat 
Ass","url":"http:\/\/contradictiveoxymoron.tumblr.com","description":"Booty.","protected":false,"verified":false,"followers_count":986,"friends_count":590,"listed_count":2,"favourites_count":1748,"statuses_count":35562,"created_at":"Sun
 Jan 01 22:06:19 +0000 2012","utc_offset":-18000,"time_zone":"Central Time (US 
& Canada)","geo_enabled":true,"lang":"en","contributors_enabled":false,"is_trans
 
lator":false,"profile_background_color":"022330","profile_background_image_url":"http:\/\/pbs.twimg.com\/profile_background_images\/378800000047672066\/d6cfdb19d8b56a6c388491b00a9a1fcb.jpeg","profile_background_image_url_https":"https:\/\/pbs.twimg.com\/profile_background_images\/378800000047672066\/d6cfdb19d8b56a6c388491b00a9a1fcb.jpeg","profile_background_tile":true,"profile_link_color":"0084B4","profile_sidebar_border_color":"000000","profile_sidebar_fill_color":"DDEEF6","profile_text_color":"333333","profile_use_background_image":true,"profile_image_url":"http:\/\/pbs.twimg.com\/profile_images\/501811487984611328\/WfUh6Mb7_normal.jpeg","profile_image_url_https":"https:\/\/pbs.twimg.com\/profile_images\/501811487984611328\/WfUh6Mb7_normal.jpeg","profile_banner_url":"https:\/\/pbs.twimg.com\/profile_banners\/452474201\/1408484011","default_profile":false,"default_profile_image":false,"following":null,"follow_request_sent":null,"notifications":null},"geo":null,"coordinates":null,"p
 
lace":null,"contributors":null,"retweet_count":4,"favorite_count":1,"entities":{"hashtags":[{"text":"d12","indices":[0,16]},{"text":"how_to","indices":[118,125]}],"trends":[],"urls":[],"user_mentions":[],"symbols":[],"media":[{"id":502213094119325697,"id_str":"502213094119325697","indices":[44,66],"media_url":"http:\/\/pbs.twimg.com\/media\/Bvg4JfSIQAEihSw.jpg","media_url_https":"https:\/\/pbs.twimg.com\/media\/Bvg4JfSIQAEihSw.jpg","url":"http:\/\/t.co\/uSJwfwRYNk","display_url":"pic.twitter.com\/uSJwfwRYNk","expanded_url":"http:\/\/twitter.com\/ThaaOddOne\/status\/502213125421412352\/photo\/1","type":"photo","sizes":{"medium":{"w":600,"h":800,"resize":"fit"},"thumb":{"w":150,"h":150,"resize":"crop"},"small":{"w":340,"h":453,"resize":"fit"},"large":{"w":768,"h":1024,"resize":"fit"}}}]},"favorited":false,"retweeted":false,"possibly_sensitive":false,"filter_level":"low","lang":"en"},"retweet_count":0,"favorite_count":0,"entities":{"hashtags":[],"trends":[],"urls":[],"user_mentions":[{
 "screen_name":"ThaaOddOne","name":"Shawnna 
\u2652\ufe0f","id":452474201,"id_str":"452474201","indices":[3,14]}],"symbols":[],"media":[{"id":502213094119325697,"id_str":"502213094119325697","indices":[60,82],"media_url":"http:\/\/pbs.twimg.com\/media\/Bvg4JfSIQAEihSw.jpg","media_url_https":"https:\/\/pbs.twimg.com\/media\/Bvg4JfSIQAEihSw.jpg","url":"http:\/\/t.co\/uSJwfwRYNk","display_url":"pic.twitter.com\/uSJwfwRYNk","expanded_url":"http:\/\/twitter.com\/ThaaOddOne\/status\/502213125421412352\/photo\/1","type":"photo","sizes":{"medium":{"w":600,"h":800,"resize":"fit"},"thumb":{"w":150,"h":150,"resize":"crop"},"small":{"w":340,"h":453,"resize":"fit"},"large":{"w":768,"h":1024,"resize":"fit"}},"source_status_id":502213125421412352,"source_status_id_str":"502213125421412352"}]},"favorited":false,"retweeted":false,"possibly_sensitive":false,"filter_level":"medium","lang":"en"}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink/blob/8e429ced/flink-contrib/src/test/java/org/apache/flink/contrib/SimpleTweetInputFormatTest.java
----------------------------------------------------------------------
diff --git 
a/flink-contrib/src/test/java/org/apache/flink/contrib/SimpleTweetInputFormatTest.java
 
b/flink-contrib/src/test/java/org/apache/flink/contrib/SimpleTweetInputFormatTest.java
new file mode 100644
index 0000000..a6f6fd0
--- /dev/null
+++ 
b/flink-contrib/src/test/java/org/apache/flink/contrib/SimpleTweetInputFormatTest.java
@@ -0,0 +1,98 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flink.contrib;
+
+import org.apache.flink.configuration.Configuration;
+import org.apache.flink.contrib.tweetinputformat.io.SimpleTweetInputFormat;
+import org.apache.flink.contrib.tweetinputformat.model.tweet.Tweet;
+import org.apache.flink.contrib.tweetinputformat.model.tweet.entities.HashTags;
+import org.apache.flink.core.fs.FileInputSplit;
+import org.apache.flink.core.fs.Path;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+
+public class SimpleTweetInputFormatTest {
+
+       private Tweet tweet;
+
+       private SimpleTweetInputFormat simpleTweetInputFormat;
+
+       private FileInputSplit fileInputSplit;
+
+       protected Configuration config;
+
+       protected File tempFile;
+
+
+       @Before
+       public void testSetUp() {
+
+
+               simpleTweetInputFormat = new SimpleTweetInputFormat();
+
+               File jsonFile = new 
File("../flink-contrib/src/main/resources/HashTagTweetSample.json");
+
+               fileInputSplit = new FileInputSplit(0, new 
Path(jsonFile.getPath()), 0, jsonFile.length(), new String[]{"localhost"});
+       }
+
+       @Test
+       public void testTweetInput() throws Exception {
+
+
+               simpleTweetInputFormat.open(fileInputSplit);
+               List<String> result;
+
+               int i = 0;
+               while (i < 4) {
+                       i++;
+                       tweet = new Tweet();
+                       tweet = simpleTweetInputFormat.nextRecord(tweet);
+
+                       if (tweet != null) {
+                               result = new ArrayList<String>();
+                               for (Iterator<HashTags> iterator = 
tweet.getEntities().getHashtags().iterator(); iterator.hasNext(); ) {
+                                       result.add(iterator.next().getText());
+                               }
+
+                               if 
(tweet.getId_str().equals("502213125421412352")) {
+                                       Assert.assertArrayEquals(new 
String[]{"example", "tweet"}, result.toArray());
+                               } else if 
(tweet.getId_str().equals("502213125421412353")) {
+                                       Assert.assertArrayEquals(new 
String[]{"example", "tweet"}, result.toArray());
+                               } else if 
(tweet.getId_str().equals("502213125421412354")) {
+                                       Assert.assertArrayEquals(new 
String[]{"last", "example", "that"}, result.toArray());
+                               } else if 
(tweet.getId_str().equals("502213125421412355")) {
+                                       Assert.assertArrayEquals(new 
String[]{"d12", "how_to"}, result.toArray());
+                               }
+                       }
+               }
+
+               tweet = new Tweet();
+               tweet = simpleTweetInputFormat.nextRecord(tweet);
+               Assert.assertNull(tweet);
+               Assert.assertTrue(simpleTweetInputFormat.reachedEnd());
+
+       }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flink/blob/8e429ced/flink-dist/src/main/flink-bin/LICENSE
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/LICENSE 
b/flink-dist/src/main/flink-bin/LICENSE
index 1236381..9600c24 100644
--- a/flink-dist/src/main/flink-bin/LICENSE
+++ b/flink-dist/src/main/flink-bin/LICENSE
@@ -243,6 +243,7 @@ under the Apache License (v 2.0):
  - StartBootstrap (http://startbootstrap.com)
  - CHAP Links Library Timeline (http://almende.github.io/chap-links-library/)
  - Jettison (http://jettison.codehaus.org)
+ - json-simple (https://code.google.com/p/json-simple/)
  - Akka (http://akka.io)
  - Metrics (https://github.com/dropwizard/metrics)
  

http://git-wip-us.apache.org/repos/asf/flink/blob/8e429ced/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1278386..cb31908 100644
--- a/pom.xml
+++ b/pom.xml
@@ -726,6 +726,8 @@ under the License.
                                                
<exclude>flink-tests/src/test/resources/testdata/terainput.txt</exclude>
                                                
<exclude>flink-staging/flink-avro/src/test/resources/avro/*.avsc</exclude>
                                                
<exclude>out/test/flink-avro/avro/user.avsc</exclude>
+                                               <!-- TweetInputFormat Test 
Data-->
+                                               
<exclude>flink-contrib/src/main/resources/HashTagTweetSample.json</exclude>
                                                
<exclude>flink-staging/flink-avro/src/test/resources/testdata.avro</exclude>
                                                
<exclude>flink-staging/flink-avro/src/test/java/org/apache/flink/api/io/avro/generated/*.java</exclude>
                                                
<exclude>flink-staging/flink-language-binding/flink-python/src/test/python/org/apache/flink/languagebinding/api/python/flink/test/data_csv</exclude>

Reply via email to