[antlr3.2] 21/46: * Fix FTBFS with openjdk-7: - d/patches/java7-compat.patch: Target 1.5 instead of jsr14 which is not supported by Java 7.

[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.2.

commit 5703a435a4c75e6899b216beb0395c4a576b464f
Author: James Page <james.page at canonical.com>
Date:   Thu Jun 21 15:06:12 2012 +0000

    * Fix FTBFS with openjdk-7:
      - d/patches/java7-compat.patch: Target 1.5 instead of jsr14 which is
        not supported by Java 7.
---
 debian/changelog                  |  7 +++++
 debian/patches/java7-compat.patch | 59 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 67 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 75f1209..723ccf0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
 antlr3 (3.2-7) UNRELEASED; urgency=low
 
   * Team upload.
+
+  [ tony mancill ]
   * Remove Michal Koch from Uploaders. (Closes: #653985)
 
+  [ James Page ]
+  * Fix FTBFS with openjdk-7:
+    - d/patches/java7-compat.patch: Target 1.5 instead of jsr14 which is
+      not supported by Java 7.
+
  -- tony mancill <tmancill at debian.org>  Sun, 01 Jan 2012 16:31:42 -0800
 
 antlr3 (3.2-6) unstable; urgency=low
diff --git a/debian/patches/java7-compat.patch b/debian/patches/java7-compat.patch
new file mode 100644
index 0000000..d46c4dc
--- /dev/null
+++ b/debian/patches/java7-compat.patch
@@ -0,0 +1,59 @@
+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/series b/debian/patches/series
new file mode 100644
index 0000000..3d96cba
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+java7-compat.patch

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