This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository eclipselink.
commit 53bb601f0ba04108cbde12e16f82ff53c8ccb6bb Author: Emmanuel Bourg <ebo...@apache.org> Date: Fri Sep 29 00:31:48 2017 +0200 No longer remove the embedded copy of ANTLR --- debian/changelog | 2 +- debian/classpath-debian | 2 - debian/control | 2 - debian/libeclipselink-java.manifest | 2 +- debian/patches/disable_antlr3_embedded_copy.diff | 183 ----------------------- debian/patches/series | 1 - 6 files changed, 2 insertions(+), 190 deletions(-) diff --git a/debian/changelog b/debian/changelog index 484989f..b7357a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +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 - * No longer remove the embedded copy of ASM (Closes: #800851) + * No longer remove the embedded copies of ASM and ANTLR (Closes: #800851) -- Emmanuel Bourg <ebo...@apache.org> Tue, 19 Jul 2016 11:30:24 +0200 diff --git a/debian/classpath-debian b/debian/classpath-debian index 5e81704..59cc307 100644 --- a/debian/classpath-debian +++ b/debian/classpath-debian @@ -9,8 +9,6 @@ usr/share/java/sdo-api.jar usr/share/java/cdi-api.jar usr/share/java/jsr311-api.jar usr/share/java/servlet-api-3.1.jar -usr/share/java/antlr3.jar -usr/share/java/antlr3-runtime.jar usr/share/java/javax.mail.jar usr/share/java/jaxb-xjc.jar usr/share/java/javax.json.jar diff --git a/debian/control b/debian/control index f06b0fa..064200c 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,6 @@ Maintainer: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.or Uploaders: Andrew Ross <ubu...@rossfamily.co.uk> Build-Depends: ant, - antlr3 (>= 3.2), aspectj, debhelper (>= 10~), default-jdk, @@ -32,7 +31,6 @@ Homepage: http://www.eclipse.org/eclipselink/ Package: libeclipselink-java Architecture: all Depends: - antlr3 (>= 3.2), libcdi-api-java, libgeronimo-j2ee-connector-1.5-spec-java, libgeronimo-jms-1.1-spec-java, diff --git a/debian/libeclipselink-java.manifest b/debian/libeclipselink-java.manifest index 1621145..e569bcf 100644 --- a/debian/libeclipselink-java.manifest +++ b/debian/libeclipselink-java.manifest @@ -8,7 +8,7 @@ usr/share/java/eclipselink.jar: Specification-Title: Eclipse Persistence Services Specification-Version: 2.5.1 Main-Class: org.eclipse.persistence.Version - Class-Path: /usr/share/java/javax.persistence-api.jar /usr/share/java/geronimo-jta_1.1_spec.jar /usr/share/java/geronimo-validation.jar /usr/share/java/javax.mail.jar /usr/share/java/geronimo-jms-1.1-spec.jar /usr/share/java/geronimo-j2ee-connector-1.5-spec.jar /usr/share/java/aspectjtools.jar /usr/share/java/sdo-api.jar /usr/share/java/antlr3.jar /usr/share/java/antlr3-runtime.jar /usr/share/java/cdi-api.jar /usr/share/java/jsr311-api.jar /usr/share/java/servlet-api-3.0.jar + Class-Path: /usr/share/java/javax.persistence-api.jar /usr/share/java/geronimo-jta_1.1_spec.jar /usr/share/java/geronimo-validation.jar /usr/share/java/javax.mail.jar /usr/share/java/geronimo-jms-1.1-spec.jar /usr/share/java/geronimo-j2ee-connector-1.5-spec.jar /usr/share/java/aspectjtools.jar /usr/share/java/sdo-api.jar /usr/share/java/cdi-api.jar /usr/share/java/jsr311-api.jar /usr/share/java/servlet-api-3.0.jar usr/share/java/org.eclipse.persistence.jpa.jpql.jar: Bundle-Name: EclipseLink Hermes Parser diff --git a/debian/patches/disable_antlr3_embedded_copy.diff b/debian/patches/disable_antlr3_embedded_copy.diff deleted file mode 100644 index 7d9a74e..0000000 --- a/debian/patches/disable_antlr3_embedded_copy.diff +++ /dev/null @@ -1,183 +0,0 @@ -Description: Remove references to ANTLR embedded copy -Author: Miguel Landaeta <mig...@miguel.cc> -Bug-Debian: http://bugs.debian.org/581861 -Forwarded: no -Last-Update: 2013-09-27 - ---- a/org/eclipse/persistence/internal/oxm/record/json/JSONLexer.java -+++ b/org/eclipse/persistence/internal/oxm/record/json/JSONLexer.java -@@ -12,7 +12,7 @@ - ******************************************************************************/ - package org.eclipse.persistence.internal.oxm.record.json; - --import org.eclipse.persistence.internal.libraries.antlr.runtime.*; -+import org.antlr.runtime.*; - - class JSONLexer extends Lexer { - public static final int EOF=-1; ---- a/org/eclipse/persistence/internal/oxm/record/json/JSONReader.java -+++ b/org/eclipse/persistence/internal/oxm/record/json/JSONReader.java -@@ -27,14 +27,14 @@ - import javax.xml.namespace.QName; - - import org.eclipse.persistence.exceptions.XMLMarshalException; --import org.eclipse.persistence.internal.libraries.antlr.runtime.ANTLRInputStream; --import org.eclipse.persistence.internal.libraries.antlr.runtime.ANTLRReaderStream; --import org.eclipse.persistence.internal.libraries.antlr.runtime.CharStream; --import org.eclipse.persistence.internal.libraries.antlr.runtime.RecognitionException; --import org.eclipse.persistence.internal.libraries.antlr.runtime.TokenRewriteStream; --import org.eclipse.persistence.internal.libraries.antlr.runtime.TokenStream; --import org.eclipse.persistence.internal.libraries.antlr.runtime.tree.CommonTree; --import org.eclipse.persistence.internal.libraries.antlr.runtime.tree.Tree; -+import org.antlr.runtime.ANTLRInputStream; -+import org.antlr.runtime.ANTLRReaderStream; -+import org.antlr.runtime.CharStream; -+import org.antlr.runtime.RecognitionException; -+import org.antlr.runtime.TokenRewriteStream; -+import org.antlr.runtime.TokenStream; -+import org.antlr.runtime.tree.CommonTree; -+import org.antlr.runtime.tree.Tree; - import org.eclipse.persistence.internal.oxm.CollectionGroupingElementNodeValue; - import org.eclipse.persistence.internal.oxm.Constants; - import org.eclipse.persistence.internal.oxm.ContainerValue; ---- a/org/eclipse/persistence/internal/oxm/record/json/JSONParser.java -+++ b/org/eclipse/persistence/internal/oxm/record/json/JSONParser.java -@@ -12,8 +12,8 @@ - ******************************************************************************/ - package org.eclipse.persistence.internal.oxm.record.json; - --import org.eclipse.persistence.internal.libraries.antlr.runtime.*; --import org.eclipse.persistence.internal.libraries.antlr.runtime.tree.*; -+import org.antlr.runtime.*; -+import org.antlr.runtime.tree.*; - - class JSONParser extends Parser { - public static final String[] tokenNames = new String[] { ---- a/org/eclipse/persistence/internal/jpa/parsing/jpql/InvalidIdentifierStartException.java -+++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/InvalidIdentifierStartException.java -@@ -12,7 +12,7 @@ - ******************************************************************************/ - package org.eclipse.persistence.internal.jpa.parsing.jpql; - --import org.eclipse.persistence.internal.libraries.antlr.runtime.RecognitionException; -+import org.antlr.runtime.RecognitionException; - - /* - * This is a custom Exception class that is thrown from ANTLR JPQL code when we ---- a/org/eclipse/persistence/internal/jpa/parsing/jpql/CaseInsensitiveANTLRStringStream.java -+++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/CaseInsensitiveANTLRStringStream.java -@@ -12,7 +12,7 @@ - ******************************************************************************/ - package org.eclipse.persistence.internal.jpa.parsing.jpql; - --import org.eclipse.persistence.internal.libraries.antlr.runtime.ANTLRStringStream; -+import org.antlr.runtime.ANTLRStringStream; - - /** - * This Stream is used when tokenizing JPQL queries ---- a/org/eclipse/persistence/internal/jpa/parsing/jpql/CaseInsensitiveJPQLLexer.java -+++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/CaseInsensitiveJPQLLexer.java -@@ -12,7 +12,7 @@ - ******************************************************************************/ - package org.eclipse.persistence.internal.jpa.parsing.jpql; - --import org.eclipse.persistence.internal.libraries.antlr.runtime.*; -+import org.antlr.runtime.*; - import org.eclipse.persistence.internal.jpa.parsing.jpql.antlr.JPQLLexer; - - /* ---- a/org/eclipse/persistence/internal/jpa/parsing/jpql/JPQLParser.java -+++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/JPQLParser.java -@@ -15,21 +15,21 @@ - import java.util.List; - import java.util.ArrayList; - --import org.eclipse.persistence.internal.libraries.antlr.runtime.*; -+import org.antlr.runtime.*; - // Third party (ANLTR) stuff --/*import org.eclipse.persistence.internal.libraries.antlr.ANTLRException; --import org.eclipse.persistence.internal.libraries.antlr.LLkParser; --import org.eclipse.persistence.internal.libraries.antlr.MismatchedCharException; --import org.eclipse.persistence.internal.libraries.antlr.MismatchedTokenException; --import org.eclipse.persistence.internal.libraries.antlr.NoViableAltException; --import org.eclipse.persistence.internal.libraries.antlr.NoViableAltForCharException; --import org.eclipse.persistence.internal.libraries.antlr.ParserSharedInputState; --import org.eclipse.persistence.internal.libraries.antlr.RecognitionException; --import org.eclipse.persistence.internal.libraries.antlr.Token; --import org.eclipse.persistence.internal.libraries.antlr.TokenBuffer; --import org.eclipse.persistence.internal.libraries.antlr.TokenStream; --import org.eclipse.persistence.internal.libraries.antlr.TokenStreamException; --import org.eclipse.persistence.internal.libraries.antlr.TokenStreamRecognitionException;*/ -+/*import org.antlr.ANTLRException; -+import org.antlr.LLkParser; -+import org.antlr.MismatchedCharException; -+import org.antlr.MismatchedTokenException; -+import org.antlr.NoViableAltException; -+import org.antlr.NoViableAltForCharException; -+import org.antlr.ParserSharedInputState; -+import org.antlr.RecognitionException; -+import org.antlr.Token; -+import org.antlr.TokenBuffer; -+import org.antlr.TokenStream; -+import org.antlr.TokenStreamException; -+import org.antlr.TokenStreamRecognitionException;*/ - - //toplink imports - import org.eclipse.persistence.exceptions.JPQLException; -@@ -41,7 +41,7 @@ - /** - * EJBQLParser is the superclass of the ANTLR generated parser. - */ --public abstract class JPQLParser extends org.eclipse.persistence.internal.libraries.antlr.runtime.Parser { -+public abstract class JPQLParser extends org.antlr.runtime.Parser { - - /** List of errors. */ - private List errors = new ArrayList(); ---- a/org/eclipse/persistence/internal/jpa/parsing/jpql/antlr/JPQLParser.java -+++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/antlr/JPQLParser.java -@@ -9,7 +9,7 @@ - import org.eclipse.persistence.internal.jpa.parsing.jpql.InvalidIdentifierException; - - --import org.eclipse.persistence.internal.libraries.antlr.runtime.*; -+import org.antlr.runtime.*; - - import java.util.Stack; - /******************************************************************************* ---- a/org/eclipse/persistence/internal/jpa/parsing/jpql/antlr/JPQLParserBuilder.java -+++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/antlr/JPQLParserBuilder.java -@@ -12,8 +12,8 @@ - ******************************************************************************/ - package org.eclipse.persistence.internal.jpa.parsing.jpql.antlr; - --import org.eclipse.persistence.internal.libraries.antlr.runtime.*; --//import org.eclipse.persistence.internal.libraries.antlr.TokenBuffer; -+import org.antlr.runtime.*; -+//import org.antlr.TokenBuffer; - - //eclipselink imports - import org.eclipse.persistence.internal.jpa.parsing.jpql.CaseInsensitiveJPQLLexer; ---- a/org/eclipse/persistence/internal/jpa/parsing/jpql/antlr/JPQLLexer.java -+++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/antlr/JPQLLexer.java -@@ -5,7 +5,7 @@ - import org.eclipse.persistence.internal.jpa.parsing.jpql.InvalidIdentifierStartException; - - --import org.eclipse.persistence.internal.libraries.antlr.runtime.*; -+import org.antlr.runtime.*; - - public class JPQLLexer extends Lexer { - public static final int EXPONENT=116; ---- a/org/eclipse/persistence/internal/jpa/parsing/jpql/InvalidIdentifierException.java -+++ b/org/eclipse/persistence/internal/jpa/parsing/jpql/InvalidIdentifierException.java -@@ -12,8 +12,8 @@ - ******************************************************************************/ - package org.eclipse.persistence.internal.jpa.parsing.jpql; - --import org.eclipse.persistence.internal.libraries.antlr.runtime.RecognitionException; --import org.eclipse.persistence.internal.libraries.antlr.runtime.Token; -+import org.antlr.runtime.RecognitionException; -+import org.antlr.runtime.Token; - - /** - * This is a custom Exception class that is thrown from ANTLR JPQL code when we diff --git a/debian/patches/series b/debian/patches/series index 7372a57..028a5a4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ -disable_antlr3_embedded_copy.diff charset.patch typeparameters.patch explicitcast.patch -- 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