[antlr3] 02/17: Removed java{7,8}-compat.patch (fixed upstream)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository antlr3.

commit 2507a4a2654c330fca32e98742f9e77c1ed6e957
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jul 17 16:01:05 2015 +0200

    Removed java{7,8}-compat.patch (fixed upstream)
---
 debian/changelog                  |  4 ++-
 debian/patches/java7-compat.patch | 59 ---------------------------------------
 debian/patches/java8-compat.patch | 14 ----------
 debian/patches/series             |  2 --
 4 files changed, 3 insertions(+), 76 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f018aea..e626b9b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
-antlr3 (3.2-12) UNRELEASED; urgency=medium
+antlr3 (3.5.2-1) UNRELEASED; urgency=medium
 
+  * New upstream release
+    - Removed java{7,8}-compat.patch (fixed upstream)
   * debian/watch: Watch the release tags on Github
   * Use XZ compression for the upstream tarball
 
diff --git a/debian/patches/java7-compat.patch b/debian/patches/java7-compat.patch
deleted file mode 100644
index d46c4dc..0000000
--- a/debian/patches/java7-compat.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Description: Target Java 1.5 instead of jsr14 which is not supported
- by Java 7.
- .
- The minimum java version in Debian is 1.5 so this is OK.
-Author: James Page <james.page at ubuntu.com>
-Fowarded: no
-
-Index: antlr3-3.2/antlr3-maven-plugin/pom.xml
-===================================================================
---- antlr3-3.2.orig/antlr3-maven-plugin/pom.xml	2012-06-21 15:49:21.516762511 +0100
-+++ antlr3-3.2/antlr3-maven-plugin/pom.xml	2012-06-21 15:54:04.321701402 +0100
-@@ -332,7 +332,7 @@
-                 <version>2.0.2</version>
-                 <configuration>
-                     <source>1.5</source>
--                    <target>jsr14</target>
-+                    <target>1.5</target>
-                 </configuration>
-             </plugin>
- 
-Index: antlr3-3.2/gunit/pom.xml
-===================================================================
---- antlr3-3.2.orig/gunit/pom.xml	2012-06-21 15:49:21.520762523 +0100
-+++ antlr3-3.2/gunit/pom.xml	2012-06-21 15:54:10.053720435 +0100
-@@ -133,7 +133,7 @@
-                 <artifactId>maven-compiler-plugin</artifactId>
-                 <configuration>
-                     <source>1.5</source>
--                    <target>jsr14</target>
-+                    <target>1.5</target>
-                     <sourceDirectory>src</sourceDirectory>
-                 </configuration>
-             </plugin>
-Index: antlr3-3.2/pom.xml
-===================================================================
---- antlr3-3.2.orig/pom.xml	2012-06-21 15:49:21.508762484 +0100
-+++ antlr3-3.2/pom.xml	2012-06-21 15:54:13.005730234 +0100
-@@ -169,7 +169,7 @@
-                 <artifactId>maven-compiler-plugin</artifactId>
-                 <configuration>
-                     <source>1.5</source>
--                    <target>jsr14</target>
-+                    <target>1.5</target>
-                     <sourceDirectory>src</sourceDirectory>
-                 </configuration>
-             </plugin>
-Index: antlr3-3.2/runtime/Java/pom.xml
-===================================================================
---- antlr3-3.2.orig/runtime/Java/pom.xml	2012-06-21 15:49:21.512762498 +0100
-+++ antlr3-3.2/runtime/Java/pom.xml	2012-06-21 15:54:18.125747235 +0100
-@@ -100,7 +100,7 @@
-             <version>2.0.2</version>
-             <configuration>
-                 <source>1.5</source>
--                <target>jsr14</target>
-+                <target>1.5</target>
-             </configuration>
-         </plugin>
- 
diff --git a/debian/patches/java8-compat.patch b/debian/patches/java8-compat.patch
deleted file mode 100644
index a7f3fda..0000000
--- a/debian/patches/java8-compat.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: Fixes a NullPointerException in CompositeGrammar.getIndirectDelegates() with Java 8
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
---- a/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
-+++ b/tool/src/main/java/org/antlr/tool/CompositeGrammar.java
-@@ -219,7 +219,7 @@
- 	public List<Grammar> getIndirectDelegates(Grammar g) {
- 		List<Grammar> direct = getDirectDelegates(g);
- 		List<Grammar> delegates = getDelegates(g);
--		delegates.removeAll(direct);
-+		if (direct != null) delegates.removeAll(direct);
- 		return delegates;
- 	}
- 
diff --git a/debian/patches/series b/debian/patches/series
index e071037..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +0,0 @@
-java7-compat.patch
-java8-compat.patch

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