This commit is contained in:
parent
b47791ef13
commit
2724aaec98
@ -6,8 +6,8 @@
|
||||
deprecation="${deprecation}"
|
||||
- target="1.2"
|
||||
- source="1.3"
|
||||
+ target="1.6"
|
||||
+ source="1.6"
|
||||
+ target="1.8"
|
||||
+ source="1.8"
|
||||
encoding="UTF-8"
|
||||
excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java">
|
||||
<classpath refid="compile.class.path"/>
|
||||
@ -17,8 +17,8 @@
|
||||
deprecation="${deprecation}"
|
||||
- target="1.2"
|
||||
- source="1.3"
|
||||
+ target="1.6"
|
||||
+ source="1.6"
|
||||
+ target="1.8"
|
||||
+ source="1.8"
|
||||
encoding="UTF-8">
|
||||
<classpath refid="compile.class.path"/>
|
||||
<include name="nu/xom/samples/*Servlet.java" />
|
||||
@ -28,8 +28,8 @@
|
||||
deprecation="${deprecation}"
|
||||
- target="1.2"
|
||||
- source="1.3"
|
||||
+ target="1.6"
|
||||
+ source="1.6"
|
||||
+ target="1.8"
|
||||
+ source="1.8"
|
||||
encoding="UTF-8"
|
||||
failonerror="false">
|
||||
<classpath refid="compile.class.path"/>
|
||||
@ -39,8 +39,8 @@
|
||||
deprecation="${deprecation}"
|
||||
- target="1.2"
|
||||
- source="1.3"
|
||||
+ target="1.6"
|
||||
+ source="1.6"
|
||||
+ target="1.8"
|
||||
+ source="1.8"
|
||||
encoding="UTF-8"
|
||||
includes="nu/xom/tools/*">
|
||||
<classpath>
|
||||
@ -50,8 +50,8 @@
|
||||
deprecation="${deprecation}"
|
||||
- target="1.2"
|
||||
- source="1.3"
|
||||
+ target="1.6"
|
||||
+ source="1.6"
|
||||
+ target="1.8"
|
||||
+ source="1.8"
|
||||
encoding="UTF-8"
|
||||
includeAntRuntime="no"
|
||||
excludes="org/jaxen/dom/**
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 18 19:12:10 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
- Modified patch:
|
||||
* jdom-1.1-build.xml.patch
|
||||
+ Build with source/target levels 8
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Mar 17 15:50:20 UTC 2022 - Fridrich Strba <fstrba@suse.com>
|
||||
|
||||
|
10
jdom.spec
10
jdom.spec
@ -60,7 +60,7 @@ Patch1: jdom-1.1-OSGiManifest.patch
|
||||
Patch2: jdom-1.1-xom-get-jaxen.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-junit
|
||||
BuildRequires: java-devel
|
||||
BuildRequires: java-devel >= 1.8
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: junit
|
||||
BuildRequires: relaxngDatatype
|
||||
@ -181,7 +181,7 @@ cp %{SOURCE13} jaxen-%{jaxen_version}.pom
|
||||
%pom_remove_parent jaxen-%{jaxen_version}.pom
|
||||
|
||||
%build
|
||||
export JAVA_OPTS="-source 1.6 -target 1.6 -encoding UTF-8 -J-Xss6m"
|
||||
export JAVA_OPTS="-source 1.8 -target 1.8 -encoding UTF-8 -J-Xss6m"
|
||||
export JAVAC="javac ${JAVA_OPTS} "
|
||||
export ANT_OPTS="-Xss6m"
|
||||
i=0
|
||||
@ -211,7 +211,7 @@ pushd %{jdom_dir}
|
||||
ant -Dparser.jar=$(build-classpath xerces-j2) \
|
||||
-Dxml-apis.jar=$(build-classpath xml-commons-apis) \
|
||||
-Djaxen.lib.dir=%{jdom_dir} \
|
||||
-Dcompile.source=1.6 -Dcompile.target=1.6 \
|
||||
-Dcompile.source=1.8 -Dcompile.target=1.8 \
|
||||
-Dversion=%{jdom_version} \
|
||||
package
|
||||
mv build/jdom-%{jdom_version}.jar %{_builddir}/jdom-%{jdom_version}.jar
|
||||
@ -231,7 +231,7 @@ CLASSPATH=%{_builddir}/jaxen-%{jaxen_version}.jar:%{_builddir}/jdom-%{jdom_versi
|
||||
mv build/saxpath.jar %{_builddir}/saxpath-%{saxpath_version}.jar
|
||||
popd
|
||||
pushd %{xom_dir}
|
||||
ant \
|
||||
%ant \
|
||||
-Djaxen.dir=%{stage1_build_dir} \
|
||||
-Dxml-apis.jar=$(build-classpath xml-commons-apis) \
|
||||
-Dparser.jar=$(build-classpath xerces-j2) \
|
||||
@ -240,7 +240,7 @@ ant \
|
||||
-Djunit.jar=$(build-classpath junit) \
|
||||
-Dresolver.jar=$(build-classpath xml-commons-resolver) \
|
||||
-Ddom4j.jar=%{stage1_build_dir} \
|
||||
-Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 \
|
||||
-Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 \
|
||||
compile compile15 jar
|
||||
mv build/xom-%{xom_version}.jar %{_builddir}
|
||||
popd
|
||||
|
Loading…
Reference in New Issue
Block a user