This commit is contained in:
parent
6edbd83dc6
commit
ef38f23e27
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b9a84c79a62fd0ca4af126f49aed8a6d21440f1007f1e13e8cfeb8a67dbd473e
|
||||
size 7768831
|
@ -1,25 +1,22 @@
|
||||
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 @@
|
||||
--- hsqldb-2.4.1/hsqldb/build/build.xml 2018-01-02 16:19:00.000000000 +0100
|
||||
+++ hsqldb-2.4.1/hsqldb/build/build.xml 2018-07-11 08:35:42.354467810 +0200
|
||||
@@ -871,36 +871,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. -->
|
||||
- <target name="-doclink-18"
|
||||
- if="ant.java.iscjava18">
|
||||
- <!-- TODO: update to final release api docs url when available -->
|
||||
- <property name="jse.doc.link"
|
||||
- value="http://docs.oracle.com/javase/7/docs/api/"/>
|
||||
- value="http://docs.oracle.com/javase/8/docs/api/"/>
|
||||
- <property name="jee.doc.link"
|
||||
- value="http://docs.oracle.com/javaee/6/api/"/>
|
||||
- value="http://docs.oracle.com/javaee/7/api/"/>
|
||||
- </target>
|
||||
-
|
||||
- <target name="-doclink-16"
|
||||
- depends="-doclink-17"
|
||||
- depends="-doclink-18"
|
||||
- if="ant.java.iscjava16"
|
||||
- unless="ant.java.iscjava17">
|
||||
- unless="ant.java.iscjava18">
|
||||
- <property name="jse.doc.link"
|
||||
- value="http://docs.oracle.com/javase/6/docs/api/"/>
|
||||
- <property name="jee.doc.link"
|
||||
@ -36,32 +33,12 @@ diff -urEbwB hsqldb-2.3.3/hsqldb/build/build.xml hsqldb-2.3.3.new/hsqldb/build/b
|
||||
- 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,-doclink-15"
|
||||
+ <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 @@
|
||||
@@ -953,8 +924,6 @@
|
||||
<packageset dir='src'>
|
||||
<include name='org/hsqldb/jdbc'/>
|
||||
</packageset>
|
||||
@ -70,16 +47,16 @@ diff -urEbwB hsqldb-2.3.3/hsqldb/build/build.xml hsqldb-2.3.3.new/hsqldb/build/b
|
||||
<tag name="todo" enabled="false"/>
|
||||
<tag name="revised" enabled="false"/>
|
||||
<tag name="jboss.xmbean" enabled="false"/>
|
||||
@@ -1006,7 +953,7 @@
|
||||
@@ -968,7 +937,7 @@
|
||||
</target>
|
||||
|
||||
<target name="javadocdev"
|
||||
- depends="-prepare-javadoc,-set-jvmvars,-doclink-12"
|
||||
- depends="-prepare-javadoc,-set-jvmvars,-doclink-15"
|
||||
+ 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 @@
|
||||
@@ -998,9 +967,6 @@
|
||||
<pathelement location="${junit38.lib}"/>
|
||||
<pathelement location="${servletapi.lib}"/>
|
||||
</classpath>
|
||||
@ -89,3 +66,5 @@ diff -urEbwB hsqldb-2.3.3/hsqldb/build/build.xml hsqldb-2.3.3.new/hsqldb/build/b
|
||||
<tag name="todo"/>
|
||||
<tag name="revised"/>
|
||||
<tag name="jboss.xmbean"/>
|
||||
Only in hsqldb-2.4.1/hsqldb/build: build.xml.orig
|
||||
Only in hsqldb-2.4.1/hsqldb/build: build.xml.rej
|
@ -4,7 +4,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>org.hsqldb</groupId>
|
||||
<artifactId>hsqldb</artifactId>
|
||||
<version>2.3.3</version>
|
||||
<version>2.4.1</version>
|
||||
<name>HyperSQL Database</name>
|
||||
<description>HSQLDB - Lightweight 100% Java SQL Database Engine</description>
|
||||
<url>http://hsqldb.org</url>
|
||||
@ -29,7 +29,7 @@
|
||||
</developers>
|
||||
<scm>
|
||||
<connection>scm:svn:http://svn.code.sf.net/p/hsqldb/svn/base/</connection>
|
||||
<tag>2.3.3</tag>
|
||||
<url>http://sourceforge.net/p/hsqldb/svn/HEAD/tree/base/tags/2.3.3</url>
|
||||
<tag>2.4.1</tag>
|
||||
<url>http://sourceforge.net/p/hsqldb/svn/HEAD/tree/base/tags/2.4.13</url>
|
||||
</scm>
|
||||
</project>
|
3
hsqldb-2.4.1.zip
Normal file
3
hsqldb-2.4.1.zip
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:467ff38b073d1d05c78aa992c8bcd57d80740e6a9c449a08b745aa5f06a09bfc
|
||||
size 7979027
|
45
hsqldb-jdk11.patch
Normal file
45
hsqldb-jdk11.patch
Normal file
@ -0,0 +1,45 @@
|
||||
--- hsqldb-2.4.1/hsqldb/src/org/hsqldb/jdbc/JDBCSQLXML.java 2017-04-09 10:22:34.000000000 +0200
|
||||
+++ hsqldb-2.4.1/hsqldb/src/org/hsqldb/jdbc/JDBCSQLXML.java 2018-07-12 08:24:29.507770794 +0200
|
||||
@@ -58,8 +58,6 @@
|
||||
import java.util.zip.GZIPInputStream;
|
||||
import java.util.zip.GZIPOutputStream;
|
||||
|
||||
-import javax.xml.bind.util.JAXBResult;
|
||||
-import javax.xml.bind.util.JAXBSource;
|
||||
import javax.xml.parsers.DocumentBuilder;
|
||||
import javax.xml.parsers.DocumentBuilderFactory;
|
||||
import javax.xml.parsers.FactoryConfigurationError;
|
||||
@@ -1462,15 +1460,7 @@
|
||||
protected <T extends Source>T getSourceImpl(
|
||||
Class<T> sourceClass) throws SQLException {
|
||||
|
||||
- if (JAXBSource.class.isAssignableFrom(sourceClass)) {
|
||||
-
|
||||
- // Must go first presently, since JAXBSource extends SAXSource
|
||||
- // (purely as an implementation detail) and it's not possible
|
||||
- // to instantiate a valid JAXBSource with a Zero-Args
|
||||
- // constructor(or any subclass thereof, due to the finality of
|
||||
- // its private marshaller and context object attributes)
|
||||
- // FALL THROUGH... will throw an exception
|
||||
- } else if (StreamSource.class.isAssignableFrom(sourceClass)) {
|
||||
+ if (StreamSource.class.isAssignableFrom(sourceClass)) {
|
||||
return createStreamSource(sourceClass);
|
||||
} else if ((sourceClass == null)
|
||||
|| DOMSource.class.isAssignableFrom(sourceClass)) {
|
||||
@@ -1683,15 +1673,7 @@
|
||||
setWritable(false);
|
||||
setReadable(true);
|
||||
|
||||
- if (JAXBResult.class.isAssignableFrom(resultClass)) {
|
||||
-
|
||||
- // Must go first presently, since JAXBResult extends SAXResult
|
||||
- // (purely as an implementation detail) and it's not possible
|
||||
- // to instantiate a valid JAXBResult with a Zero-Args
|
||||
- // constructor(or any subclass thereof, due to the finality of
|
||||
- // its private UnmarshallerHandler)
|
||||
- // FALL THROUGH... will throw an exception
|
||||
- } else if ((resultClass == null)
|
||||
+ if ((resultClass == null)
|
||||
|| StreamResult.class.isAssignableFrom(resultClass)) {
|
||||
return createStreamResult(resultClass);
|
||||
} else if (DOMResult.class.isAssignableFrom(resultClass)) {
|
@ -22,7 +22,7 @@
|
||||
%endif
|
||||
|
||||
Name: hsqldb
|
||||
Version: 2.3.3
|
||||
Version: 2.4.1
|
||||
Release: 0
|
||||
Summary: HyperSQL Database Engine
|
||||
License: BSD-3-Clause
|
||||
@ -45,9 +45,11 @@ 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
|
||||
Patch2: hsqldb-2.4.1-javadoc10.patch
|
||||
Patch3: %{name}-jdk11.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: java-devel >= 1.8
|
||||
# Needed for maven conversions
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: javapackages-tools
|
||||
@ -55,7 +57,7 @@ BuildRequires: junit
|
||||
BuildRequires: servletapi5
|
||||
BuildRequires: systemd
|
||||
BuildRequires: unzip
|
||||
Requires: java
|
||||
Requires: java >= 1.8
|
||||
Requires: servletapi5
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildArch: noarch
|
||||
@ -126,6 +128,7 @@ sed -i -e 's|doc/apidocs|%{_javadocdir}/%{name}|g' index.html
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch2 -p2
|
||||
%patch3 -p2
|
||||
|
||||
%build
|
||||
export CLASSPATH=$(build-classpath servletapi5 junit)
|
||||
|
Loading…
Reference in New Issue
Block a user