[guava-libraries] 01/02: Added a patch to keep MapMaker.makeComputingMap() public since this method is still used by reverse dependencies

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to annotated tag debian/15.0-1
in repository guava-libraries.

commit bb1dd12a0b0156cd9785d22b4c9a12e87b177dd9
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Sep 12 12:36:03 2013 +0200

    Added a patch to keep MapMaker.makeComputingMap() public since this method is still used by reverse dependencies
---
 debian/changelog                                   |    2 ++
 .../05-preserve-mapmaker-makecomputingmap.patch    |   21 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0a052dd..7a3ba73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ guava-libraries (15.0-1) UNRELEASED; urgency=low
   * Use XZ compression for the upstream tarball
   * Added a Maven publish rule to take over the artifact
     of Google Collections (Closes: #712453)
+  * Added a patch to keep MapMaker.makeComputingMap() public since
+    this method is still used by reverse dependencies
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 26 Jun 2013 19:17:42 +0200
 
diff --git a/debian/patches/05-preserve-mapmaker-makecomputingmap.patch b/debian/patches/05-preserve-mapmaker-makecomputingmap.patch
new file mode 100644
index 0000000..85a4c69
--- /dev/null
+++ b/debian/patches/05-preserve-mapmaker-makecomputingmap.patch
@@ -0,0 +1,21 @@
+Description: Guava 15.0 changed the visibility of MapMaker.makeComputingMap()
+ to package private. The method has been deprecated in favor of the CacheBuilder
+ class. This breaks several reverse dependencies: jython (<= 2.5.2-2),
+ and sisu-guice (<= 3.1.1-1) and stapler (<= 1.207-1). Until this is fixed
+ in the upstream projects the method is made public.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+Bug-Sisu: https://github.com/sonatype/sisu-guice/pull/7
+Bug-Stapler: https://github.com/stapler/stapler/pull/27
+Bug-Jython: http://bugs.jython.org/issue2087
+--- a/guava/src/com/google/common/collect/MapMaker.java
++++ b/guava/src/com/google/common/collect/MapMaker.java
+@@ -581,7 +581,7 @@
+    */
+   @Deprecated
+   @Override
+-  <K, V> ConcurrentMap<K, V> makeComputingMap(
++  public <K, V> ConcurrentMap<K, V> makeComputingMap(
+       Function<? super K, ? extends V> computingFunction) {
+     return (nullRemovalCause == null)
+         ? new MapMaker.ComputingMapAdapter<K, V>(this, computingFunction)
diff --git a/debian/patches/series b/debian/patches/series
index 1f03c8f..8972202 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02-remove-source-in-javadoc.patch
 03-openjdk-inference.patch
 04-source-encoding.patch
+05-preserve-mapmaker-makecomputingmap.patch

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