[libspring-java] 05/09: Disabled the Caffeine support (not in Debian)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libspring-java.

commit 0fbf6744d249e87a3d0edb8c506a749a95e750cd
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Aug 3 23:11:27 2016 +0200

    Disabled the Caffeine support (not in Debian)
---
 debian/changelog                          |  1 +
 debian/maven.ignoreRules                  |  1 +
 debian/patches/0045-ignore-caffeine.patch | 20 ++++++++++++++++++++
 debian/patches/series                     |  1 +
 4 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dddb050..4eb2e82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ libspring-java (4.3.2-1) UNRELEASED; urgency=medium
     - Refreshed the patches
     - Updated the Maven poms
     - Removed the dependency on libaopalliance-java
+    - Disabled the Caffeine support (not in Debian)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 03 Aug 2016 19:55:28 +0200
 
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 6cde0d3..bdce0cf 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,4 +1,5 @@
 com.ibm.websphere uow * * * *
+com.github.ben-manes.caffeine caffeine * * * *
 com.h2database h2 * * * *
 org.hibernate hibernate-annotations * * * *
 io.spring.gradle docbook-reference-plugin * * * *
diff --git a/debian/patches/0045-ignore-caffeine.patch b/debian/patches/0045-ignore-caffeine.patch
new file mode 100644
index 0000000..8c4e5bf
--- /dev/null
+++ b/debian/patches/0045-ignore-caffeine.patch
@@ -0,0 +1,20 @@
+Description: Disable the Caffeine support (not in Debian)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/build.gradle
++++ b/build.gradle
+@@ -667,6 +667,14 @@
+ 		testRuntime("com.sun.mail:javax.mail:${javamailVersion}")
+ 		testRuntime("org.ehcache:jcache:${ehcachejcacheVersion}")
+ 	}
++
++	sourceSets {
++		main {
++			java {
++				exclude "**/caffeine/*"
++			}
++		}
++	}
+ }
+ 
+ project("spring-web") {
diff --git a/debian/patches/series b/debian/patches/series
index e7a5f80..6af5b65 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@
 0042-ignore-money-api.patch
 0043-ignore-okhttp.patch
 0044-ignore-httpunit.patch
+0045-ignore-caffeine.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libspring-java.git