From eb1ad096f6f23ff9dadf28a1fc72a102591d8bacf062d386de916e0880bb697e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 8 Sep 2017 05:51:51 +0000 Subject: [PATCH 1/2] First step to buildability with jdk9 OBS-URL: https://build.opensuse.org/package/show/Java:packages/dom4j?expand=0&rev=17 --- dom4j-sourcetarget.patch | 13 +++++++++++++ dom4j.changes | 10 ++++++++++ dom4j.spec | 7 +++++-- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 dom4j-sourcetarget.patch diff --git a/dom4j-sourcetarget.patch b/dom4j-sourcetarget.patch new file mode 100644 index 0000000..f55a8c4 --- /dev/null +++ b/dom4j-sourcetarget.patch @@ -0,0 +1,13 @@ +--- dom4j/build.xml 2009-05-12 15:04:18.000000000 +0200 ++++ dom4j/build.xml 2017-09-07 22:31:44.290776444 +0200 +@@ -142,8 +142,8 @@ + destdir="${build.dest}" + debug="${debug}" + optimize="${optimize}" +- target="1.3" +- source="1.3" ++ target="1.6" ++ source="1.6" + deprecation="${deprecation}" + classpathref="compile.classpath"> + diff --git a/dom4j.changes b/dom4j.changes index 8037fe7..625c70a 100644 --- a/dom4j.changes +++ b/dom4j.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Sep 8 05:47:14 UTC 2017 - fstrba@suse.com + +- Added patch: + * 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 diff --git a/dom4j.spec b/dom4j.spec index 370dc10..a2969a6 100644 --- a/dom4j.spec +++ b/dom4j.spec @@ -35,12 +35,14 @@ Source0: dom4j-1.6.1-debian.tar.bz2 Source1: dom4j_rundemo.sh Source2: http://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom Patch0: dom4j-1.6.1-bug1618750.patch +Patch1: dom4j-sourcetarget.patch BuildRequires: ant >= 1.6.5 BuildRequires: ant-apache-resolver BuildRequires: ant-junit BuildRequires: bea-stax BuildRequires: isorelax -BuildRequires: java-devel >= 1.5.0 +# Disable this one whenever the javadoc build is fixed for jdk9 +BuildRequires: java-1_8_0-openjdk-devel # Needed for maven conversions BuildRequires: javapackages-local BuildRequires: javapackages-tools @@ -57,7 +59,7 @@ BuildRequires: xpp2 BuildRequires: xpp3 Requires: bea-stax Requires: isorelax -Requires: java >= 1.5.0 +Requires: java >= 1.6.0 Requires: jaxen >= 1.1 Requires: relaxngDatatype Requires: stax_1_0_api @@ -125,6 +127,7 @@ rm -f src/test/org/dom4j/ThreadingTest.java # FIXME: (yyang): failed in JDK6, maybe failed to load russArticle.xml because it's russian encoding rm -f src/test/org/dom4j/io/StaxTest.java %patch0 -p1 -b .bug1618750 +%patch1 -p1 -b .sourcetarget perl -pi -e 's/\r//g' LICENSE.txt docs/clover/*.css docs/style/*.css docs/xref/*.css docs/xref-test/*.css src/doc/style/*.css docs/benchmarks/xpath/*.java pushd lib From e754dd32039874ea0dd02e309bbbe68d95382c883eb51fd2a09d67ef2d90a134 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 11 Sep 2017 11:54:51 +0000 Subject: [PATCH 2/2] Fix build with jdk9 OBS-URL: https://build.opensuse.org/package/show/Java:packages/dom4j?expand=0&rev=18 --- dom4j-sourcetarget.patch | 26 +++++++++++++++++++++++++- dom4j.changes | 2 -- dom4j.spec | 12 +++--------- 3 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dom4j-sourcetarget.patch b/dom4j-sourcetarget.patch index f55a8c4..51c8eb2 100644 --- a/dom4j-sourcetarget.patch +++ b/dom4j-sourcetarget.patch @@ -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"> +@@ -195,6 +195,7 @@ + + + + = 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