This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository openjpa.
commit 934d03521c9fd16731ba54bd5ef206a81e7bc1a6 Author: Markus Koschany <[email protected]> Date: Fri Jun 23 14:26:27 2017 +0200 Drop fix-compilation-error.patch. --- debian/patches/fix-compilation-error.patch | 46 ------------------------------ debian/patches/series | 1 - 2 files changed, 47 deletions(-) diff --git a/debian/patches/fix-compilation-error.patch b/debian/patches/fix-compilation-error.patch deleted file mode 100644 index e1208e2..0000000 --- a/debian/patches/fix-compilation-error.patch +++ /dev/null @@ -1,46 +0,0 @@ -Description: Fix compilation errors with Java 8 -Author: Emmanuel Bourg <[email protected]> -Forwarded: no ---- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java -+++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceXMLMetaDataParser.java -@@ -158,9 +158,9 @@ - private XMLMetaData parseXMLClassAnnotations(Class<?> cls) { - // check immediately whether the class has JAXB XML annotations - if (cls == null || xmlTypeClass == null -- || !((AccessController.doPrivileged(J2DoPrivHelper -+ || !(((Boolean) AccessController.doPrivileged(J2DoPrivHelper - .isAnnotationPresentAction(cls, xmlTypeClass))).booleanValue() -- && (AccessController -+ && ((Boolean) AccessController - .doPrivileged(J2DoPrivHelper.isAnnotationPresentAction(cls, - xmlRootElementClass))).booleanValue())) - return null; -@@ -210,7 +210,7 @@ - Class superclass = cls.getSuperclass(); - - // handle inheritance at sub-element level -- if ((AccessController.doPrivileged(J2DoPrivHelper -+ if (((Boolean) AccessController.doPrivileged(J2DoPrivHelper - .isAnnotationPresentAction(superclass, xmlTypeClass))) - .booleanValue()) - populateFromReflection(superclass, meta); -@@ -232,7 +232,7 @@ - // avoid JAXB XML bind default name - if (StringUtils.equals(XMLMetaData.defaultName, xmlname)) - xmlname = member.getName(); -- if ((AccessController.doPrivileged(J2DoPrivHelper -+ if (((Boolean) AccessController.doPrivileged(J2DoPrivHelper - .isAnnotationPresentAction(((Field) member).getType(), - xmlTypeClass))).booleanValue()) { - field = _repos.addXMLClassMetaData(((Field) member).getType()); ---- a/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java -+++ b/openjpa-persistence-jdbc/src/main/java/org/apache/openjpa/persistence/jdbc/AnnotationPersistenceMappingParser.java -@@ -1577,7 +1577,7 @@ - } - if (xmlRootElementClass != null - && StringUtils.isEmpty(pcols[i].columnDefinition()) -- && (AccessController.doPrivileged(J2DoPrivHelper -+ && ((Boolean) AccessController.doPrivileged(J2DoPrivHelper - .isAnnotationPresentAction(fm.getDeclaredType(), - xmlRootElementClass))).booleanValue()) { - DBDictionary dict = ((MappingRepository) getRepository()) diff --git a/debian/patches/series b/debian/patches/series index a08b5b2..483e690 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ exclude-was-uow.diff -fix-compilation-error.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/openjpa.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
