This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository eclipselink.
commit 312cdb32a5469a4dc53433e3cecda15a333610ed Author: Emmanuel Bourg <ebo...@apache.org> Date: Fri Sep 29 00:34:30 2017 +0200 Removed charset.patch, typeparameters.patch and explicitcast.patch --- debian/changelog | 1 + debian/patches/charset.patch | 13 ------- debian/patches/explicitcast.patch | 71 ------------------------------------- debian/patches/series | 3 -- debian/patches/typeparameters.patch | 13 ------- 5 files changed, 1 insertion(+), 100 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1601f40..74cc8e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ eclipselink (2.6.2-1) UNRELEASED; urgency=medium instead of libgeronimo-validation-1.0-spec-java - Disabled JGroup support (too old in Debian) - Updated the Maven poms + - Removed charset.patch, typeparameters.patch and explicitcast.patch * No longer remove the embedded copies of ASM and ANTLR (Closes: #800851) * Set the source/target level to Java 7 diff --git a/debian/patches/charset.patch b/debian/patches/charset.patch deleted file mode 100644 index 06d3e66..0000000 --- a/debian/patches/charset.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix a line containing a bad character which causes unknown charset failures. - ---- a/org/eclipse/persistence/internal/jpa/transaction/JTATransactionWrapper.java -+++ b/org/eclipse/persistence/internal/jpa/transaction/JTATransactionWrapper.java -@@ -114,7 +114,7 @@ - // In general, a persistence context will be synchronized to the database as described below. However, a - // persistence context of type SynchronizationType.UNSYNCHRONIZED or an application-managed - // persistence context that has been created outside the scope of the current transaction will only be --// synchronized to the database if it has been joined to the current transaction by the application�s use of -+// synchronized to the database if it has been joined to the current transaction by the applications use of - // the EntityManager joinTransaction method. - // .. - // If there is no transaction active diff --git a/debian/patches/explicitcast.patch b/debian/patches/explicitcast.patch deleted file mode 100644 index c2530b1..0000000 --- a/debian/patches/explicitcast.patch +++ /dev/null @@ -1,71 +0,0 @@ -Add in explicit casts where required to meet Java spec, so that the package compiles with -OpenJDK as well as ECJ. - ---- a/org/eclipse/persistence/mappings/converters/ConverterClass.java -+++ b/org/eclipse/persistence/mappings/converters/ConverterClass.java -@@ -83,12 +83,12 @@ - if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) { - try { - attributeConverterClass = (Class) AccessController.doPrivileged(new PrivilegedClassForName(attributeConverterClassName, true, classLoader)); -- attributeConverter = AccessController.doPrivileged(new PrivilegedNewInstanceFromClass(attributeConverterClass)); -+ attributeConverter = (AttributeConverter)AccessController.doPrivileged(new PrivilegedNewInstanceFromClass(attributeConverterClass)); - } catch (PrivilegedActionException exception) { - throw ValidationException.classNotFoundWhileConvertingClassNames(attributeConverterClassName, exception.getException()); - } - } else { -- attributeConverterClass = PrivilegedAccessHelper.getClassForName(attributeConverterClassName, true, classLoader); -+ attributeConverterClass = (Class)PrivilegedAccessHelper.getClassForName(attributeConverterClassName, true, classLoader); - attributeConverter = (AttributeConverter) PrivilegedAccessHelper.newInstanceFromClass(attributeConverterClass); - } - } catch (ClassNotFoundException exception) { ---- a/org/eclipse/persistence/jpa/rs/PersistenceContext.java -+++ b/org/eclipse/persistence/jpa/rs/PersistenceContext.java -@@ -527,7 +527,7 @@ - } - Field[] fields = null; - if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) { -- fields = AccessController.doPrivileged(new PrivilegedGetDeclaredFields(clazz)); -+ fields = (Field[])AccessController.doPrivileged(new PrivilegedGetDeclaredFields(clazz)); - } else { - fields = PrivilegedAccessHelper.getDeclaredFields(clazz); - } ---- a/org/eclipse/persistence/internal/xr/QueryOperation.java -+++ b/org/eclipse/persistence/internal/xr/QueryOperation.java -@@ -615,8 +615,8 @@ - Class oracleSQLXML; - Method getStringMethod; - if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) { -- oracleSQLXML = AccessController.doPrivileged(new PrivilegedClassForName(ORACLESQLXML_STR, true, this.getClass().getClassLoader())); -- getStringMethod = AccessController.doPrivileged(new PrivilegedGetDeclaredMethod(oracleSQLXML, GETSTRING_METHOD, new Class[] {})); -+ oracleSQLXML = (Class)AccessController.doPrivileged(new PrivilegedClassForName(ORACLESQLXML_STR, true, this.getClass().getClassLoader())); -+ getStringMethod = (Method)AccessController.doPrivileged(new PrivilegedGetDeclaredMethod(oracleSQLXML, GETSTRING_METHOD, new Class[] {})); - fieldValue = (String) AccessController.doPrivileged(new PrivilegedMethodInvoker(getStringMethod, fieldValue, new Object[] {})); - } else { - oracleSQLXML = PrivilegedAccessHelper.getClassForName(ORACLESQLXML_STR, true, this.getClass().getClassLoader()); -@@ -635,11 +635,11 @@ - Object xmlTypeFactory; - Method getStringMethod; - if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) { -- oracleOPAQUE = AccessController.doPrivileged(new PrivilegedClassForName(ORACLEOPAQUE_STR, true, this.getClass().getClassLoader())); -- xmlTypeFactoryClass = AccessController.doPrivileged(new PrivilegedClassForName(XMLTYPEFACTORY_STR, true, this.getClass().getClassLoader())); -- xmlTypeFactoryConstructor = AccessController.doPrivileged(new PrivilegedGetConstructorFor(xmlTypeFactoryClass, new Class[0], true)); -+ oracleOPAQUE = (Class)AccessController.doPrivileged(new PrivilegedClassForName(ORACLEOPAQUE_STR, true, this.getClass().getClassLoader())); -+ xmlTypeFactoryClass = (Class)AccessController.doPrivileged(new PrivilegedClassForName(XMLTYPEFACTORY_STR, true, this.getClass().getClassLoader())); -+ xmlTypeFactoryConstructor = (Constructor)AccessController.doPrivileged(new PrivilegedGetConstructorFor(xmlTypeFactoryClass, new Class[0], true)); - xmlTypeFactory = AccessController.doPrivileged(new PrivilegedInvokeConstructor(xmlTypeFactoryConstructor, new Object[0])); -- getStringMethod = AccessController.doPrivileged(new PrivilegedGetDeclaredMethod(xmlTypeFactoryClass, GETSTRING_METHOD, new Class[] {oracleOPAQUE})); -+ getStringMethod = (Method)AccessController.doPrivileged(new PrivilegedGetDeclaredMethod(xmlTypeFactoryClass, GETSTRING_METHOD, new Class[] {oracleOPAQUE})); - fieldValue = (String) AccessController.doPrivileged(new PrivilegedMethodInvoker(getStringMethod, fieldValue, new Object[] {})); - } else { - oracleOPAQUE = PrivilegedAccessHelper.getClassForName(ORACLEOPAQUE_STR, false, this.getClass().getClassLoader()); ---- a/org/eclipse/persistence/internal/jaxb/XMLJavaTypeConverter.java -+++ b/org/eclipse/persistence/internal/jaxb/XMLJavaTypeConverter.java -@@ -289,7 +289,7 @@ - } catch (IllegalAccessException e) { - Constructor ctor = null; - if (PrivilegedAccessHelper.shouldUsePrivilegedAccess()) { -- ctor = AccessController.doPrivileged(new PrivilegedGetConstructorFor(xmlAdapterClass, new Class[0], true)); -+ ctor = (Constructor)AccessController.doPrivileged(new PrivilegedGetConstructorFor(xmlAdapterClass, new Class[0], true)); - } else { - ctor = PrivilegedAccessHelper.getDeclaredConstructorFor(xmlAdapterClass, new Class[0], true); - } diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 028a5a4..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,3 +0,0 @@ -charset.patch -typeparameters.patch -explicitcast.patch diff --git a/debian/patches/typeparameters.patch b/debian/patches/typeparameters.patch deleted file mode 100644 index 26048bc..0000000 --- a/debian/patches/typeparameters.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix parameters to meet the java spec, so that the build works in OpenJDK as well as ECJ. - ---- a/org/eclipse/persistence/internal/oxm/XMLMarshaller.java -+++ b/org/eclipse/persistence/internal/oxm/XMLMarshaller.java -@@ -68,7 +68,7 @@ - public abstract class XMLMarshaller< - ABSTRACT_SESSION extends CoreAbstractSession, - CONTEXT extends Context<ABSTRACT_SESSION, DESCRIPTOR, ?, ?, ?, ?, ?>, -- DESCRIPTOR extends Descriptor, -+ DESCRIPTOR extends Descriptor<?,?,?,?,?,?,?,?,?>, - MEDIA_TYPE extends MediaType, - NAMESPACE_PREFIX_MAPPER extends NamespacePrefixMapper, - OBJECT_BUILDER extends ObjectBuilder<?, ABSTRACT_SESSION, ?, XMLMarshaller>> extends Marshaller<CONTEXT, MEDIA_TYPE, NAMESPACE_PREFIX_MAPPER> { -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/eclipselink.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits