[olap4j] 01/01: Fix build with Java 9

[Chris West]

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

faux-guest pushed a commit to branch master
in repository olap4j.

commit a7cd65ab6831f6c4d3864d0e4a468a6c4614a41b
Author: Chris West (Faux) <git at goeswhere.com>
Date:   Tue Aug 22 23:21:29 2017 +0100

    Fix build with Java 9
---
 debian/changelog                     |  6 ++++++
 debian/patches/13_compile_java9.diff | 22 ++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fbb5f2c..66ec7bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+olap4j (1.2.0-2) UNRELEASED; urgency=medium
+
+  * Fix build with Java 9 by fiddling generics.
+
+ -- Chris West <solo-debian at goeswhere.com>  Tue, 22 Aug 2017 23:20:37 +0100
+
 olap4j (1.2.0-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/13_compile_java9.diff b/debian/patches/13_compile_java9.diff
new file mode 100644
index 0000000..ac5fb6f
--- /dev/null
+++ b/debian/patches/13_compile_java9.diff
@@ -0,0 +1,22 @@
+--- a/testsrc/org/olap4j/test/TestContext.java
++++ b/testsrc/org/olap4j/test/TestContext.java
+@@ -115,7 +115,7 @@
+      * @param suite Suite to which to add tests
+      */
+     private static void addTck(TestSuite suite) {
+-        for (Class<?> tckClass : TCK_CLASSES) {
++        for (Class tckClass : TCK_CLASSES) {
+             suite.addTestSuite(tckClass);
+         }
+     }
+--- a/build.xml
++++ b/build.xml
+@@ -524,7 +524,7 @@
+             destdir="${javadoc.dir}" packagenames="org.olap4j.*"
+             excludepackagenames="org.olap4j.impl.*,org.olap4j.mdx.parser.impl.*,org.olap4j.sample.*"
+             overview="${src.dir}/overview.html"
+-            author="true" source="1.5" access="public"
++            author="true" source="1.6" access="public"
+             Windowtitle="olap4j, version ${project.revision}" additionalparam="-notimestamp" locale="en">
+             <tag name="pre" description="Pre-condition:" scope="constructors,methods" />
+             <tag name="post" description="Post-condition:" scope="constructors,methods" />
diff --git a/debian/patches/series b/debian/patches/series
index ba340b7..094ed06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 10_javadoc_tweaks.diff
 11_disable_git_commit_info.diff
 12_remove_version_txt.diff
+13_compile_java9.diff

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