From e5ee44b69daf7e697416318020038d5e41067210db080acf32af475a420a6c72 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 18 Dec 2017 07:06:28 +0000
Subject: [PATCH] Fix build with jdk10

OBS-URL: https://build.opensuse.org/package/show/Java:packages/hsqldb?expand=0&rev=30
---
 hsqldb-2.3.3-javadoc10.patch | 91 ++++++++++++++++++++++++++++++++++++
 hsqldb.changes               |  8 ++++
 hsqldb.spec                  |  3 ++
 3 files changed, 102 insertions(+)
 create mode 100644 hsqldb-2.3.3-javadoc10.patch

diff --git a/hsqldb-2.3.3-javadoc10.patch b/hsqldb-2.3.3-javadoc10.patch
new file mode 100644
index 0000000..ceddac7
--- /dev/null
+++ b/hsqldb-2.3.3-javadoc10.patch
@@ -0,0 +1,91 @@
+diff -urEbwB hsqldb-2.3.3/hsqldb/build/build.xml hsqldb-2.3.3.new/hsqldb/build/build.xml
+--- hsqldb-2.3.3/hsqldb/build/build.xml	2017-12-18 07:56:53.939190423 +0100
++++ hsqldb-2.3.3.new/hsqldb/build/build.xml	2017-12-18 07:59:13.211190949 +0100
+@@ -895,58 +895,7 @@
+       </jar>
+     </target>
+ 
+-    <target name="-doclink-17"
+-                depends="-set-jvmvars"
+-                if="ant.java.iscjava17">
+-        <!-- The depends above is a Gradle work-around.
+-             It is not necessary for Ant.  -->
+-        <property name="jse.doc.link"
+-                  value="http://docs.oracle.com/javase/7/docs/api/"/>
+-        <property name="jee.doc.link"
+-                  value="http://docs.oracle.com/javaee/6/api/"/>
+-    </target>
+-
+-    <target name="-doclink-16"
+-                depends="-doclink-17"
+-                    if="ant.java.iscjava16"
+-            unless="ant.java.iscjava17">
+-        <property name="jse.doc.link"
+-                  value="http://docs.oracle.com/javase/6/docs/api/"/>
+-        <property name="jee.doc.link"
+-                  value="http://docs.oracle.com/javaee/6/api/"/>
+-    </target>
+-
+-    <target name="-doclink-15"
+-                    depends="-doclink-16"
+-                    if="ant.java.iscjava15"
+-            unless="ant.java.iscjava16">
+-        <property name="jse.doc.link"
+-                  value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
+-        <property name="jee.doc.link"
+-                  value="http://docs.oracle.com/javaee/5/api/"/>
+-    </target>
+-
+-    <target name="-doclink-14"
+-            depends="-doclink-15"
+-            if="ant.java.iscjava14"
+-            unless="ant.java.iscjava15">
+-        <property name="jse.doc.link"
+-                  value="http://docs.oracle.com/javase/1.4.2/docs/api/"/>
+-        <property name="jee.doc.link"
+-                  value="http://docs.oracle.com/javaee/1.4/api/"/>
+-    </target>
+-
+-    <target name="-doclink-12"
+-            depends="-doclink-14"
+-            if="ant.java.iscjava12"
+-            unless="ant.java.iscjava14">
+-        <property name="jse.doc.link"
+-                  value="http://docs.oracle.com/javase/1.3/docs/api/"/>
+-        <property name="jee.doc.link"
+-                  value="http://docs.oracle.com/javaee/1.3/api/"/>
+-    </target>
+-
+-    <target name="javadoc" depends="-prepare-javadoc,-set-jvmvars,-doclink-12"
++    <target name="javadoc" depends="-prepare-javadoc,-set-jvmvars"
+             description="Create javadoc for the distribution package">
+       <!-- TODO:  Find out why JDBCDriver class is listed twice in the lass
+            list pane, but only when All Classes selected
+@@ -991,8 +940,6 @@
+            <packageset dir='src'>
+                <include name='org/hsqldb/jdbc'/>
+            </packageset>
+-           <link href="${jse.doc.link}"/>
+-           <link href="${jee.doc.link}"/>
+            <tag name="todo" enabled="false"/>
+            <tag name="revised" enabled="false"/>
+            <tag name="jboss.xmbean" enabled="false"/>
+@@ -1006,7 +953,7 @@
+    </target>
+ 
+    <target name="javadocdev"
+-            depends="-prepare-javadoc,-set-jvmvars,-doclink-12"
++            depends="-prepare-javadoc,-set-jvmvars"
+             description="Create javadoc for all HSQLDB code-base classes">
+       <!-- Since our preprocessor package compilatoin depends on the
+            env-specific ant runtime lib via includeAntRuntime=true, Javadoc
+@@ -1036,9 +983,6 @@
+              <pathelement location="${junit38.lib}"/>
+              <pathelement location="${servletapi.lib}"/>
+            </classpath>
+-           <link href="${jse.doc.link}"/>
+-           <link href="${jee.doc.link}"/>
+-           <link href="${junit.doc.link}"/>
+            <tag name="todo"/>
+            <tag name="revised"/>
+            <tag name="jboss.xmbean"/>
diff --git a/hsqldb.changes b/hsqldb.changes
index 572ba88..182dc02 100644
--- a/hsqldb.changes
+++ b/hsqldb.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Dec 18 07:05:16 UTC 2017 - fstrba@suse.com
+
+- Added patch:
+  * hsqldb-2.3.3-javadoc10.patch
+    + Fix build with jdk10's javadoc that ends in error when a
+      link cannot be downloaded
+
 -------------------------------------------------------------------
 Thu Nov 23 13:50:25 UTC 2017 - rbrown@suse.com
 
diff --git a/hsqldb.spec b/hsqldb.spec
index 0239cda..7e0c97d 100644
--- a/hsqldb.spec
+++ b/hsqldb.spec
@@ -44,6 +44,8 @@ Source9:        hsqldb-stop
 Patch0:         %{name}-apidocs.patch
 # Package org.hsqldb.cmdline was only compiled with java 1.5
 Patch1:         %{name}-cmdline.patch
+# Jdk10's javadoc ends up in error when a remote url cannot be reached
+Patch2:         hsqldb-2.3.3-javadoc10.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
 # Needed for maven conversions
@@ -123,6 +125,7 @@ sed -i -e 's|doc/apidocs|%{_javadocdir}/%{name}|g' index.html
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p2
 
 %build
 export CLASSPATH=$(build-classpath servletapi5 junit)