Accepting request 523086 from Java:packages

Fix build with java 9

OBS-URL: https://build.opensuse.org/request/show/523086
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dom4j?expand=0&rev=19

dom4j-sourcetarget.patch

@@ -0,0 +1,37 @@
+--- dom4j/build.xml	2009-05-12 15:04:18.000000000 +0200
++++ dom4j/build.xml	2017-09-11 13:36:05.252661089 +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">
+ 	<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"

dom4j.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+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
+
 -------------------------------------------------------------------
 Fri May 19 09:03:12 UTC 2017 - mpluskal@suse.com
 

dom4j.spec

@@ -35,12 +35,13 @@ 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
+BuildRequires:  java-devel >= 1.6
 # Needed for maven conversions
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
@@ -57,7 +58,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,14 +126,12 @@ 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
 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)
@@ -157,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