First step to buildability with jdk9
OBS-URL: https://build.opensuse.org/package/show/Java:packages/dom4j?expand=0&rev=17
This commit is contained in:
parent
8100fcad71
commit
eb1ad096f6
13
dom4j-sourcetarget.patch
Normal file
13
dom4j-sourcetarget.patch
Normal file
@ -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">
|
||||||
|
<exclude name="org/dom4j/datatype/**"/>
|
@ -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
|
Fri May 19 09:03:12 UTC 2017 - mpluskal@suse.com
|
||||||
|
|
||||||
|
@ -35,12 +35,14 @@ Source0: dom4j-1.6.1-debian.tar.bz2
|
|||||||
Source1: dom4j_rundemo.sh
|
Source1: dom4j_rundemo.sh
|
||||||
Source2: http://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom
|
Source2: http://repo1.maven.org/maven2/dom4j/dom4j/1.6.1/dom4j-1.6.1.pom
|
||||||
Patch0: dom4j-1.6.1-bug1618750.patch
|
Patch0: dom4j-1.6.1-bug1618750.patch
|
||||||
|
Patch1: dom4j-sourcetarget.patch
|
||||||
BuildRequires: ant >= 1.6.5
|
BuildRequires: ant >= 1.6.5
|
||||||
BuildRequires: ant-apache-resolver
|
BuildRequires: ant-apache-resolver
|
||||||
BuildRequires: ant-junit
|
BuildRequires: ant-junit
|
||||||
BuildRequires: bea-stax
|
BuildRequires: bea-stax
|
||||||
BuildRequires: isorelax
|
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
|
# Needed for maven conversions
|
||||||
BuildRequires: javapackages-local
|
BuildRequires: javapackages-local
|
||||||
BuildRequires: javapackages-tools
|
BuildRequires: javapackages-tools
|
||||||
@ -57,7 +59,7 @@ BuildRequires: xpp2
|
|||||||
BuildRequires: xpp3
|
BuildRequires: xpp3
|
||||||
Requires: bea-stax
|
Requires: bea-stax
|
||||||
Requires: isorelax
|
Requires: isorelax
|
||||||
Requires: java >= 1.5.0
|
Requires: java >= 1.6.0
|
||||||
Requires: jaxen >= 1.1
|
Requires: jaxen >= 1.1
|
||||||
Requires: relaxngDatatype
|
Requires: relaxngDatatype
|
||||||
Requires: stax_1_0_api
|
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
|
# 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
|
rm -f src/test/org/dom4j/io/StaxTest.java
|
||||||
%patch0 -p1 -b .bug1618750
|
%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
|
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
|
pushd lib
|
||||||
|
Loading…
Reference in New Issue
Block a user