Fix build with jdk9

OBS-URL: https://build.opensuse.org/package/show/Java:packages/dom4j?expand=0&rev=18
This commit is contained in:
Fridrich Strba 2017-09-11 11:54:51 +00:00 committed by Git OBS Bridge
parent eb1ad096f6
commit e754dd3203
3 changed files with 28 additions and 12 deletions

View File

@ -1,5 +1,5 @@
--- dom4j/build.xml 2009-05-12 15:04:18.000000000 +0200
+++ dom4j/build.xml 2017-09-07 22:31:44.290776444 +0200
+++ dom4j/build.xml 2017-09-11 13:36:05.252661089 +0200
@@ -142,8 +142,8 @@
destdir="${build.dest}"
debug="${debug}"
@ -11,3 +11,27 @@
deprecation="${deprecation}"
classpathref="compile.classpath">
<exclude name="org/dom4j/datatype/**"/>
@@ -195,6 +195,7 @@
<mkdir dir="${build.javadocs}"/>
<javadoc packagenames="${packages}"
sourcepath="${build.src}"
+ source="1.6"
destdir="${build.javadocs}"
author="true"
version="true"
@@ -214,6 +215,7 @@
<mkdir dir="${build.javadocs}"/>
<javadoc packagenames="${packages}"
sourcepath="${build.src}"
+ source="1.6"
destdir="${build.javadocs}"
author="true"
version="true"
@@ -230,6 +232,7 @@
<mkdir dir="${build.apidocs}"/>
<javadoc packagenames="${api.packages}"
sourcepath="${build.src}"
+ source="1.6"
destdir="${build.apidocs}"
author="true"
version="true"

View File

@ -5,8 +5,6 @@ Fri Sep 8 05:47:14 UTC 2017 - fstrba@suse.com
* dom4j-sourcetarget.patch
+ Use java source and target level 1.6 in order to allow
building with jdk9
- Force using of java-1_8_0-openjdk-devel, since javadoc errors are
fatal in jdk9
-------------------------------------------------------------------
Fri May 19 09:03:12 UTC 2017 - mpluskal@suse.com

View File

@ -41,8 +41,7 @@ BuildRequires: ant-apache-resolver
BuildRequires: ant-junit
BuildRequires: bea-stax
BuildRequires: isorelax
# Disable this one whenever the javadoc build is fixed for jdk9
BuildRequires: java-1_8_0-openjdk-devel
BuildRequires: java-devel >= 1.6
# Needed for maven conversions
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
@ -133,9 +132,6 @@ perl -pi -e 's/\r//g' LICENSE.txt docs/clover/*.css docs/style/*.css docs/xref/*
pushd lib
ln -sf $(build-classpath xpp2)
ln -sf $(build-classpath relaxngDatatype)
pushd endorsed
#ln -sf $(build-classpath jaxp12)
popd
ln -sf $(build-classpath jaxme/jaxmeapi)
#ln -sf $(build-classpath msv-xsdlib)
#ln -sf $(build-classpath msv-msv)
@ -160,12 +156,10 @@ popd
popd
%build
export CLASSPATH=
export CLASSPATH=$(build-classpath jaxen relaxngDatatype xpp3 xpp2)
export OPT_JAR_LIST="junit ant/ant-junit"
#ant package test release-javadoc
rm -rf src/java/org/dom4j/datatype
ant package release-javadoc
#export CLASSPATH=`pwd`/dom4j-1.6.1.jar:$(build-classpath xpp2)
#ant samples
%install
# jars