pool/hsqldb
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/hsqldb?expand=0&rev=36

Browse Source
This commit is contained in:
Fridrich Strba 2018-07-16 08:53:08 +00:00 committed by Git OBS Bridge
parent b1ea7f07c6
commit 769a017c3b
3 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
hsqldb-jdk11.patch
View File

@ -1,45 +0,0 @@
--- 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)) {

4
hsqldb.changes
View File

@ -3,10 +3,6 @@ Thu Jul 12 07:59:04 UTC 2018 - fstrba@suse.com
- Version bump to 2.4.1 - Version bump to 2.4.1
* Require java 8 or higher * Require java 8 or higher
- Added patch:
* hsqldb-jdk11.patch
+ Fix build with jdk11
+ Don't use javax.xml.bind.util.JAXB* APIs removed in jdk11
- Changed patch: - Changed patch:
* hsqldb-2.3.3-javadoc10.patch -> hsqldb-2.4.1-javadoc10.patch * hsqldb-2.3.3-javadoc10.patch -> hsqldb-2.4.1-javadoc10.patch
+ rediff to changed context + rediff to changed context

2
hsqldb.spec
View File

@ -46,7 +46,6 @@ Patch0: %{name}-apidocs.patch
Patch1: %{name}-cmdline.patch Patch1: %{name}-cmdline.patch
# Jdk10's javadoc ends up in error when a remote url cannot be reached # Jdk10's javadoc ends up in error when a remote url cannot be reached
Patch2: hsqldb-2.4.1-javadoc10.patch Patch2: hsqldb-2.4.1-javadoc10.patch
Patch3: %{name}-jdk11.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
@ -128,7 +127,6 @@ sed -i -e 's|doc/apidocs|%{_javadocdir}/%{name}|g' index.html
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p2 %patch2 -p2
%patch3 -p2
%build %build
export CLASSPATH=$(build-classpath servletapi5 junit) export CLASSPATH=$(build-classpath servletapi5 junit)