[openjpa] 08/15: Drop java8-compatibility.patch. No longer needed.

Markus Koschany apo at moszumanska.debian.org
Fri Jun 23 13:36:47 UTC 2017


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

apo pushed a commit to branch master
in repository openjpa.

commit ded5e6bde21f5f7dd7970efb25e3edc59a815bbf
Author: Markus Koschany <apo at debian.org>
Date:   Fri Jun 23 14:25:53 2017 +0200

    Drop java8-compatibility.patch. No longer needed.
---
 debian/patches/java8-compatibility.patch | 23 -----------------------
 debian/patches/series                    |  1 -
 2 files changed, 24 deletions(-)

diff --git a/debian/patches/java8-compatibility.patch b/debian/patches/java8-compatibility.patch
deleted file mode 100644
index a878967..0000000
--- a/debian/patches/java8-compatibility.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Remove the keyset() method from the deprecated NullSafeConcurrentHashMap class to build with Java 8.
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
---- a/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/NullSafeConcurrentHashMap.java
-+++ b/openjpa-lib/src/main/java/org/apache/openjpa/lib/util/concurrent/NullSafeConcurrentHashMap.java
-@@ -300,7 +300,7 @@
-     public Enumeration keys() {
-         throw new UnsupportedOperationException();
-     }
--
-+/*
-     @Override
-     public Set keySet() {
-         return new TranslatingSet(super.keySet()) {
-@@ -309,7 +309,7 @@
-             }
-         };
-     }
--
-+*/
-     @Override
-     public Collection values() {
-         return new TranslatingCollection(super.values()) {
diff --git a/debian/patches/series b/debian/patches/series
index 72bc529..a08b5b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 exclude-was-uow.diff
-java8-compatibility.patch
 fix-compilation-error.patch

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



More information about the pkg-java-commits mailing list