[avro] Fix to compile with OpenJDK 8

[Ricardo Arguello]

commit b13fcd434f49a1bf9b4ed93d072ae6e02d31110a
Author: Ricardo Arguello <ricardo at fedoraproject.org>
Date:   Mon Jun 30 15:43:52 2014 +0000

    Fix to compile with OpenJDK 8

 avro-jdk8.patch |   39 +++++++++++++++++++++++++++++++++++++--
 avro.spec       |   13 ++++++++-----
 2 files changed, 45 insertions(+), 7 deletions(-)
---
diff --git a/avro-jdk8.patch b/avro-jdk8.patch
index 6b3b21f..6cde674 100644
--- a/avro-jdk8.patch
+++ b/avro-jdk8.patch
@@ -1,5 +1,40 @@
---- a/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java	2013-07-09 21:57:43.894166000 +0000
-+++ b/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java	2014-03-31 02:01:00.407611714 +0000
+diff -Naur avro-1.7.5.orig/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StaticServlet.java avro-1.7.5/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StaticServlet.java
+--- avro-1.7.5.orig/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StaticServlet.java	2010-08-23 06:57:37.000000000 +0000
++++ avro-1.7.5/lang/java/ipc/src/main/java/org/apache/avro/ipc/stats/StaticServlet.java	2014-06-30 15:36:43.991567570 +0000
+@@ -34,13 +34,9 @@
+     String[] parts = pathInContext.split("/");
+     String filename =  parts[parts.length - 1];
+ 
+-    try {
+       URL resource = getClass().getClassLoader().getResource(
+           "org/apache/avro/ipc/stats/static/" + filename);
+       if (resource == null) { return null; }
+       return Resource.newResource(resource);
+-    } catch (IOException e) {
+-      return null;
+-    }
+   }
+ } 
+diff -Naur avro-1.7.5.orig/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/StaticServlet.java avro-1.7.5/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/StaticServlet.java
+--- avro-1.7.5.orig/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/StaticServlet.java	2010-08-23 06:57:37.000000000 +0000
++++ avro-1.7.5/lang/java/ipc/src/main/java/org/apache/avro/ipc/trace/StaticServlet.java	2014-06-30 15:36:28.312245529 +0000
+@@ -38,13 +38,9 @@
+     }
+     String filename =  parts[parts.length - 1];
+ 
+-    try {
+       URL resource = getClass().getClassLoader().getResource(
+           "org/apache/avro/ipc/trace/static/" + filename);
+       if (resource == null) { return null; }
+       return Resource.newResource(resource);
+-    } catch (IOException e) {
+-      return null;
+-    }
+   }
+ } 
+diff -Naur avro-1.7.5.orig/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java avro-1.7.5/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java
+--- avro-1.7.5.orig/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java	2013-07-09 21:57:43.000000000 +0000
++++ avro-1.7.5/lang/java/thrift/src/main/java/org/apache/avro/thrift/ThriftData.java	2014-06-30 12:27:02.773652660 +0000
 @@ -101,7 +101,7 @@
      if (fields == null) {                           // cache miss
        fields = new TFieldIdEnum[s.getFields().size()];
diff --git a/avro.spec b/avro.spec
index 05e6c3c..11e8bf9 100644
--- a/avro.spec
+++ b/avro.spec
@@ -1,6 +1,6 @@
 Name:             avro
 Version:          1.7.5
-Release:          7%{?dist}
+Release:          8%{?dist}
 Summary:          Data serialization system
 Group:            Development/Libraries
 License:          ASL 2.0
@@ -143,7 +143,7 @@ sed -i "s|>3.4.0.Final<|>3<|" lang/java/pom.xml
 
 %build
 
-%mvn_build -f -- -Dhadoop.version=2 -P hadoop2
+%mvn_build -f -- -Dhadoop.version=2 -P hadoop2 -Dcheckstyle.skip=true
 
 %install
 %mvn_install
@@ -170,6 +170,9 @@ sed -i "s|>3.4.0.Final<|>3<|" lang/java/pom.xml
 %doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Sun Jun 29 2014 Ricardo Arguello <ricardo at fedoraproject.org> - 1.7.5-8
+- Fix to compile with OpenJDK 8
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.5-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -205,12 +208,12 @@ sed -i "s|>3.4.0.Final<|>3<|" lang/java/pom.xml
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
-* Tue Mar 13 2012 Ricardo Arguello <ricardo at fedoraproject.org> 1.6.2-3
+* Tue Mar 13 2012 Ricardo Arguello <ricardo at fedoraproject.org> - 1.6.2-3
 - Remove *.dll files from source tarball
 - Include license file
 
-* Tue Mar 6 2012 Ricardo Arguello <ricardo at fedoraproject.org> 1.6.2-2
+* Tue Mar 6 2012 Ricardo Arguello <ricardo at fedoraproject.org> - 1.6.2-2
 - Cleanup of the spec file
 
-* Tue Feb 21 2012 Marek Goldmann <mgoldman at redhat.com> 1.6.2-1
+* Tue Feb 21 2012 Marek Goldmann <mgoldman at redhat.com> - 1.6.2-1
 - Initial packaging