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

Accepting request 623088 from Java:packages

Browse Source 
Adapt to the new augmented OpenJDK 11

OBS-URL: https://build.opensuse.org/request/show/623088
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hsqldb?expand=0&rev=26
This commit is contained in:
Dominique Leuenberger 2018-07-24 15:33:05 +00:00 committed by Git OBS Bridge
commit 3b4573c72b
6 changed files with 37 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hsqldb-2.3.3.zip
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b9a84c79a62fd0ca4af126f49aed8a6d21440f1007f1e13e8cfeb8a67dbd473e
size 7768831

55
hsqldb-2.3.3-javadoc10.patch → hsqldb-2.4.1-javadoc10.patch
View File

@ -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

6
hsqldb-2.3.3.pom → hsqldb-2.4.1.pom
View File

@ -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.1</url>
</scm>
</project>

3
hsqldb-2.4.1.zip Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:467ff38b073d1d05c78aa992c8bcd57d80740e6a9c449a08b745aa5f06a09bfc
size 7979027

9
hsqldb.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Jul 12 07:59:04 UTC 2018 - fstrba@suse.com
- Version bump to 2.4.1
* Require java 8 or higher
- Changed patch:
* hsqldb-2.3.3-javadoc10.patch -> hsqldb-2.4.1-javadoc10.patch
+ rediff to changed context
-------------------------------------------------------------------
Mon Dec 18 07:05:16 UTC 2017 - fstrba@suse.com

9
hsqldb.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package hsqldb
#
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -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,10 @@ 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
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
# Needed for maven conversions
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
@ -55,7 +56,7 @@ BuildRequires: junit
BuildRequires: servletapi5
BuildRequires: systemd
BuildRequires: unzip
Requires: java
Requires: java >= 1.8
Requires: servletapi5
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch