[ehcache-core] try to fix java8 build problems

gil gil at fedoraproject.org
Mon Apr 7 10:37:56 UTC 2014


commit 003cf3770f5234896cef48ac7e7483ab3c84106e
Author: gil <puntogil at libero.it>
Date:   Mon Apr 7 12:37:43 2014 +0200

    try to fix java8 build problems

 ehcache-core-2.6.7-java8.patch |   29 +++++++++++++++++++++++++++++
 ehcache-core.spec              |    2 ++
 2 files changed, 31 insertions(+), 0 deletions(-)
---
diff --git a/ehcache-core-2.6.7-java8.patch b/ehcache-core-2.6.7-java8.patch
new file mode 100644
index 0000000..361fead
--- /dev/null
+++ b/ehcache-core-2.6.7-java8.patch
@@ -0,0 +1,29 @@
+--- src/main/java/net/sf/ehcache/config/CacheConfiguration.java	2013-01-17 08:54:30.000000000 +0100
++++ src/main/java/net/sf/ehcache/config/CacheConfiguration.java-ebourg	2014-04-07 12:33:12.176458079 +0200
+@@ -2543,7 +2543,7 @@
+     /**
+      * Accessor
+      */
+-    public List getCacheEventListenerConfigurations() {
++    public List<CacheEventListenerFactoryConfiguration> getCacheEventListenerConfigurations() {
+         return cacheEventListenerConfigurations;
+     }
+ 
+@@ -2552,7 +2552,7 @@
+      *
+      * @return the configuration
+      */
+-    public List getCacheExtensionConfigurations() {
++    public List<CacheExtensionFactoryConfiguration> getCacheExtensionConfigurations() {
+         return cacheExtensionConfigurations;
+     }
+ 
+@@ -2561,7 +2561,7 @@
+      *
+      * @return the configuration
+      */
+-    public List getCacheLoaderConfigurations() {
++    public List<CacheLoaderFactoryConfiguration> getCacheLoaderConfigurations() {
+         return cacheLoaderConfigurations;
+     }
+ 
diff --git a/ehcache-core.spec b/ehcache-core.spec
index a926892..271bb35 100644
--- a/ehcache-core.spec
+++ b/ehcache-core.spec
@@ -11,6 +11,7 @@ URL:           http://ehcache.org/
 # find ehcache-core-2.6.7 -name '*.class' -delete
 # tar czf ehcache-core-2.6.7-clean-src-svn.tar.gz ehcache-core-2.6.7
 Source0:       %{name}-%{version}-clean-src-svn.tar.gz
+Patch0:        %{name}-2.6.7-java8.patch
 
 BuildRequires: ehcache-parent
 BuildRequires: java-devel
@@ -63,6 +64,7 @@ This package contains javadoc for %{name}.
 
 %prep
 %setup -q
+%patch0 -p0
 
 %pom_remove_plugin org.codehaus.gmaven:gmaven-plugin
 %pom_remove_plugin org.eclipse.m2e:lifecycle-mapping


More information about the scm-commits mailing list