[FLINK-1392] Add Kryo serializer for Protobuf

Conflicts:
	flink-java/pom.xml
	flink-java/src/main/java/org/apache/flink/api/java/typeutils/runtime/KryoSerializer.java

flink-java/pom.xml

@@ -69,6 +69,39 @@ under the License.
  <version>0.5.1</version>
  </dependency>
 
+ <dependency>
+ <groupId>com.twitter</groupId>
+ <artifactId>chill-protobuf</artifactId>
+ <version>0.5.1</version>
+ </dependency>
+ <!-- We need protobuf for chill-protobuf -->
+ <dependency>
+ <groupId>com.google.protobuf</groupId>
+ <artifactId>protobuf-java</artifactId>
+ <version>2.5.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.twitter</groupId>
+ <artifactId>chill-thrift</artifactId>
+ <version>0.5.1</version>
+ </dependency>
+ <!-- libthrift is required by chill-thrift -->
+ <dependency>
+ <groupId>org.apache.thrift</groupId>
+ <artifactId>libthrift</artifactId>
+ <version>0.6.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
 
  <!-- guava needs to be in "provided" scope, to make sure it is not included into the jars by the shading -->
  <dependency>

flink-shaded/pom.xml

@@ -69,6 +69,9 @@ under the License.
  <relocation>
  <pattern>com.google</pattern>
  <shadedPattern>org.apache.flink.shaded.com.google</shadedPattern>
+ <excludes>
+ <exclude>com.google.protobuf.**</exclude>
+ </excludes>
  </relocation>
  </relocations>
  </configuration>

pom.xml

@@ -955,6 +955,9 @@ under the License.
  <relocation>
  <pattern>com.google</pattern>
  <shadedPattern>org.apache.flink.shaded.com.google</shadedPattern>
+ <excludes>
+ <exclude>com.google.protobuf.**</exclude>
+ </excludes>
  </relocation>
  </relocations>
  </configuration>