pool/jdom
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/jdom?expand=0&rev=57

Browse Source
This commit is contained in:
Fridrich Strba 2022-03-18 19:12:44 +00:00 committed by Git OBS Bridge
parent b47791ef13
commit 2724aaec98
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jdom-1.1-build.xml.patch
View File

@ -6,8 +6,8 @@
deprecation="${deprecation}" deprecation="${deprecation}"
- target="1.2" - target="1.2"
- source="1.3" - source="1.3"
+ target="1.6" + target="1.8"
+ source="1.6" + source="1.8"
encoding="UTF-8" encoding="UTF-8"
excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java"> excludes="nu/xom/pantry/* nu/xom/tools/* nu/xom/samples/*Servlet.java">
<classpath refid="compile.class.path"/> <classpath refid="compile.class.path"/>
@ -17,8 +17,8 @@
deprecation="${deprecation}" deprecation="${deprecation}"
- target="1.2" - target="1.2"
- source="1.3" - source="1.3"
+ target="1.6" + target="1.8"
+ source="1.6" + source="1.8"
encoding="UTF-8"> encoding="UTF-8">
<classpath refid="compile.class.path"/> <classpath refid="compile.class.path"/>
<include name="nu/xom/samples/*Servlet.java" /> <include name="nu/xom/samples/*Servlet.java" />
@ -28,8 +28,8 @@
deprecation="${deprecation}" deprecation="${deprecation}"
- target="1.2" - target="1.2"
- source="1.3" - source="1.3"
+ target="1.6" + target="1.8"
+ source="1.6" + source="1.8"
encoding="UTF-8" encoding="UTF-8"
failonerror="false"> failonerror="false">
<classpath refid="compile.class.path"/> <classpath refid="compile.class.path"/>
@ -39,8 +39,8 @@
deprecation="${deprecation}" deprecation="${deprecation}"
- target="1.2" - target="1.2"
- source="1.3" - source="1.3"
+ target="1.6" + target="1.8"
+ source="1.6" + source="1.8"
encoding="UTF-8" encoding="UTF-8"
includes="nu/xom/tools/*"> includes="nu/xom/tools/*">
<classpath> <classpath>
@ -50,8 +50,8 @@
deprecation="${deprecation}" deprecation="${deprecation}"
- target="1.2" - target="1.2"
- source="1.3" - source="1.3"
+ target="1.6" + target="1.8"
+ source="1.6" + source="1.8"
encoding="UTF-8" encoding="UTF-8"
includeAntRuntime="no" includeAntRuntime="no"
excludes="org/jaxen/dom/** excludes="org/jaxen/dom/**

7
jdom.changes
View File

@ -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> Thu Mar 17 15:50:20 UTC 2022 - Fridrich Strba <fstrba@suse.com>

10
jdom.spec
View File

@ -60,7 +60,7 @@ Patch1: jdom-1.1-OSGiManifest.patch
Patch2: jdom-1.1-xom-get-jaxen.patch Patch2: jdom-1.1-xom-get-jaxen.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: ant-junit BuildRequires: ant-junit
BuildRequires: java-devel BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: junit BuildRequires: junit
BuildRequires: relaxngDatatype BuildRequires: relaxngDatatype
@ -181,7 +181,7 @@ cp %{SOURCE13} jaxen-%{jaxen_version}.pom
%pom_remove_parent jaxen-%{jaxen_version}.pom %pom_remove_parent jaxen-%{jaxen_version}.pom
%build %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 JAVAC="javac ${JAVA_OPTS} "
export ANT_OPTS="-Xss6m" export ANT_OPTS="-Xss6m"
i=0 i=0
@ -211,7 +211,7 @@ pushd %{jdom_dir}
ant -Dparser.jar=$(build-classpath xerces-j2) \ ant -Dparser.jar=$(build-classpath xerces-j2) \
-Dxml-apis.jar=$(build-classpath xml-commons-apis) \ -Dxml-apis.jar=$(build-classpath xml-commons-apis) \
-Djaxen.lib.dir=%{jdom_dir} \ -Djaxen.lib.dir=%{jdom_dir} \
-Dcompile.source=1.6 -Dcompile.target=1.6 \ -Dcompile.source=1.8 -Dcompile.target=1.8 \
-Dversion=%{jdom_version} \ -Dversion=%{jdom_version} \
package package
mv build/jdom-%{jdom_version}.jar %{_builddir}/jdom-%{jdom_version}.jar 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 mv build/saxpath.jar %{_builddir}/saxpath-%{saxpath_version}.jar
popd popd
pushd %{xom_dir} pushd %{xom_dir}
ant \ %ant \
-Djaxen.dir=%{stage1_build_dir} \ -Djaxen.dir=%{stage1_build_dir} \
-Dxml-apis.jar=$(build-classpath xml-commons-apis) \ -Dxml-apis.jar=$(build-classpath xml-commons-apis) \
-Dparser.jar=$(build-classpath xerces-j2) \ -Dparser.jar=$(build-classpath xerces-j2) \
@ -240,7 +240,7 @@ ant \
-Djunit.jar=$(build-classpath junit) \ -Djunit.jar=$(build-classpath junit) \
-Dresolver.jar=$(build-classpath xml-commons-resolver) \ -Dresolver.jar=$(build-classpath xml-commons-resolver) \
-Ddom4j.jar=%{stage1_build_dir} \ -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 compile compile15 jar
mv build/xom-%{xom_version}.jar %{_builddir} mv build/xom-%{xom_version}.jar %{_builddir}
popd popd