rpm/xpp3
SHA256
1
0
Fork 0
forked from pool/xpp3
Code Pull Requests Activity

Accepting request 962916 from Java:packages

Browse Source 
Build with source/target levels 8

OBS-URL: https://build.opensuse.org/request/show/962916
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xpp3?expand=0&rev=21
This commit is contained in:
Dominique Leuenberger 2022-03-28 14:59:03 +00:00 committed by Git OBS Bridge
commit 47eb272b6b
3 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
xpp3-sourcetarget.patch
View File

@ -5,7 +5,7 @@
<target name="api" depends="prepare,update_api"> <target name="api" depends="prepare,update_api">
<mkdir dir="${build_api}"/> <mkdir dir="${build_api}"/>
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
srcdir="${src_api}" destdir="${build_api}" classpath="${build_api}"/> srcdir="${src_api}" destdir="${build_api}" classpath="${build_api}"/>
</target> </target>
@ -13,14 +13,14 @@
<mkdir dir="${build_classes_min}"/> <mkdir dir="${build_classes_min}"/>
<touch file="${build_classes_min}/${xpp3_tag}_MIN_VERSION"/> <touch file="${build_classes_min}/${xpp3_tag}_MIN_VERSION"/>
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
srcdir="${src_api}" destdir="${build_classes_min}" classpath="${build_classes_min}"> srcdir="${src_api}" destdir="${build_classes_min}" classpath="${build_classes_min}">
<include name="**/*.java"/> <include name="**/*.java"/>
<exclude name="**/*Factory.java"/> <exclude name="**/*Factory.java"/>
<exclude name="**/*Serializer.java"/> <exclude name="**/*Serializer.java"/>
</javac> </javac>
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
srcdir="${src_impl_min}" destdir="${build_classes_min}" classpath="${build_classes_min}"/> srcdir="${src_impl_min}" destdir="${build_classes_min}" classpath="${build_classes_min}"/>
<mkdir dir="${build_classes_min}/META-INF/services"/> <mkdir dir="${build_classes_min}/META-INF/services"/>
<copy todir="${build_classes_min}/META-INF/services"> <copy todir="${build_classes_min}/META-INF/services">
@ -29,13 +29,13 @@
<target name="serializer" depends="prepare,api"> <target name="serializer" depends="prepare,api">
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
srcdir="${src_impl_serializer}" destdir="${build_classes}" classpath="${build_api}"/> srcdir="${src_impl_serializer}" destdir="${build_classes}" classpath="${build_api}"/>
</target> </target>
<target name="builder" depends="prepare,api"> <target name="builder" depends="prepare,api">
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
srcdir="${src_builder}" destdir="${build_classes}" classpath="${build_api}"/> srcdir="${src_builder}" destdir="${build_classes}" classpath="${build_api}"/>
</target> </target>
@ -44,23 +44,23 @@
<target name="xpath" depends="builder"> <target name="xpath" depends="builder">
<mkdir dir="${build_xpath}"/> <mkdir dir="${build_xpath}"/>
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
srcdir="${src_xpath}" destdir="${build_xpath}" classpath="${build_api}:${build_classes}"/> srcdir="${src_xpath}" destdir="${build_xpath}" classpath="${build_api}:${build_classes}"/>
</target> </target>
<target name="xpath_samples" depends="check_junit,xpath" if="junit_present"> <target name="xpath_samples" depends="check_junit,xpath" if="junit_present">
<mkdir dir="${build_samples}"/> <mkdir dir="${build_samples}"/>
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
srcdir="${src_xpath_samples}" destdir="${build_samples}" classpath="${build_api}:${build_classes}:${build_xpath}"/> srcdir="${src_xpath_samples}" destdir="${build_samples}" classpath="${build_api}:${build_classes}:${build_xpath}"/>
</target> </target>
<target name="impl" depends="impl_min,serializer"> <target name="impl" depends="impl_min,serializer">
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
srcdir="${src_impl_min}" destdir="${build_classes}" classpath="${build_api}"/> srcdir="${src_impl_min}" destdir="${build_classes}" classpath="${build_api}"/>
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
srcdir="${src_impl_standard}" destdir="${build_classes}" classpath="${build_api}"/> srcdir="${src_impl_standard}" destdir="${build_classes}" classpath="${build_api}"/>
<mkdir dir="${build_classes}/META-INF/services"/> <mkdir dir="${build_classes}/META-INF/services"/>
<copy todir="${build_classes}/META-INF/services"> <copy todir="${build_classes}/META-INF/services">
@ -69,7 +69,7 @@
<target name="parser_pool" depends="api,update_parser_pool"> <target name="parser_pool" depends="api,update_parser_pool">
<mkdir dir="${build_classes}"/> <mkdir dir="${build_classes}"/>
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
srcdir="${src_parser_pool}" destdir="${build_classes}" classpath="${build_api}"/> srcdir="${src_parser_pool}" destdir="${build_classes}" classpath="${build_api}"/>
</target> </target>
@ -78,7 +78,7 @@
<target name="dom2_builder" depends="api,check_dom2,update_dom2_builder"> <target name="dom2_builder" depends="api,check_dom2,update_dom2_builder">
<mkdir dir="${build_classes}"/> <mkdir dir="${build_classes}"/>
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
srcdir="${src_dom2_builder}" destdir="${build_classes}" classpath="${build_api}"/> srcdir="${src_dom2_builder}" destdir="${build_classes}" classpath="${build_api}"/>
</target> </target>
@ -87,7 +87,7 @@
<target name="sax2_driver" depends="api,check_sax2,update_sax2_driver"> <target name="sax2_driver" depends="api,check_sax2,update_sax2_driver">
<mkdir dir="${build_classes}"/> <mkdir dir="${build_classes}"/>
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
srcdir="${src_sax2_driver}" destdir="${build_classes}" classpath="${build_api}"/> srcdir="${src_sax2_driver}" destdir="${build_classes}" classpath="${build_api}"/>
</target> </target>
@ -96,7 +96,7 @@
<target name="util" depends="api,update_util"> <target name="util" depends="api,update_util">
<mkdir dir="${build_classes}"/> <mkdir dir="${build_classes}"/>
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
srcdir="${src_util}" destdir="${build_classes}" classpath="${build_api}"/> srcdir="${src_util}" destdir="${build_classes}" classpath="${build_api}"/>
</target> </target>
@ -105,7 +105,7 @@
<target name="wrapper" depends="api,util,update_wrapper"> <target name="wrapper" depends="api,util,update_wrapper">
<mkdir dir="${build_classes}"/> <mkdir dir="${build_classes}"/>
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
srcdir="${src_wrapper}" destdir="${build_classes}" classpath="${build_api}"/> srcdir="${src_wrapper}" destdir="${build_classes}" classpath="${build_api}"/>
</target> </target>
@ -114,7 +114,7 @@
<target name="xmlpull_samples" depends="api,update_samples"> <target name="xmlpull_samples" depends="api,update_samples">
<mkdir dir="${build_samples}"/> <mkdir dir="${build_samples}"/>
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
srcdir="${src_samples}" destdir="${build_samples}" classpath="${build_api}"/> srcdir="${src_samples}" destdir="${build_samples}" classpath="${build_api}"/>
</target> </target>
@ -123,7 +123,7 @@
<target name="tests_addons" if="junit_present" <target name="tests_addons" if="junit_present"
depends="check_junit,impl,update_tests,wrapper,dom2_builder"> depends="check_junit,impl,update_tests,wrapper,dom2_builder">
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
srcdir="${src_addons_tests}" destdir="${build_tests}" srcdir="${src_addons_tests}" destdir="${build_tests}"
classpath="${build_api}:${build_classes}" classpath="${build_api}:${build_classes}"
/> />
@ -133,7 +133,7 @@
<mkdir dir="${build_tests}"/> <mkdir dir="${build_tests}"/>
- <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1" - <javac debug="${debug}" deprecation="${deprecation}" source="1.2" target="1.1"
- srcdir="${src_tests}" destdir="${build_tests}" classpath="${build_api}" - srcdir="${src_tests}" destdir="${build_tests}" classpath="${build_api}"
+ <javac debug="${debug}" deprecation="${deprecation}" source="1.6" target="1.6" + <javac debug="${debug}" deprecation="${deprecation}" source="1.8" target="1.8"
+ srcdir="${src_tests}" destdir="${build_tests}" classpath="${build_api}" encoding="ISO-8859-1" + srcdir="${src_tests}" destdir="${build_tests}" classpath="${build_api}" encoding="ISO-8859-1"
/> />
<copy todir="${build_tests_xml}"> <copy todir="${build_tests_xml}">

7
xpp3.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Mar 18 17:47:34 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* xpp3-sourcetarget.patch
+ Build with source/target levels 8
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Nov 23 12:43:24 UTC 2018 - Fridrich Strba <fstrba@suse.com> Fri Nov 23 12:43:24 UTC 2018 - Fridrich Strba <fstrba@suse.com>

9
xpp3.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package xpp3 # spec file for package xpp3
# #
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -22,7 +22,7 @@ Release: 0
Summary: XML Pull Parser Summary: XML Pull Parser
License: Apache-1.1 License: Apache-1.1
Group: Development/Libraries/Java Group: Development/Libraries/Java
Url: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html URL: http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/index.html
Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{version}_src.tgz Source0: http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-%{version}_src.tgz
Source1: http://central.maven.org/maven2/xpp3/xpp3/%{version}/xpp3-%{version}.pom Source1: http://central.maven.org/maven2/xpp3/xpp3/%{version}/xpp3-%{version}.pom
Source2: http://central.maven.org/maven2/xpp3/xpp3_min/%{version}/xpp3_min-%{version}.pom Source2: http://central.maven.org/maven2/xpp3/xpp3_min/%{version}/xpp3_min-%{version}.pom
@ -30,13 +30,13 @@ Source3: http://central.maven.org/maven2/xpp3/xpp3_xpath/%{version}/xpp3_
Source4: %{name}-%{version}-OSGI-MANIFEST.MF Source4: %{name}-%{version}-OSGI-MANIFEST.MF
Patch0: xpp3-sourcetarget.patch Patch0: xpp3-sourcetarget.patch
BuildRequires: ant >= 1.6 BuildRequires: ant >= 1.6
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: junit BuildRequires: junit
BuildRequires: perl BuildRequires: perl
BuildRequires: xml-commons-apis BuildRequires: xml-commons-apis
Requires: java >= 1.4.2 Requires: java >= 1.4.2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
%description %description
@ -106,7 +106,8 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_mavenpomdir}/%{name}-xpath.pom
%files %files
%defattr(0644,root,root,0755) %defattr(0644,root,root,0755)
%doc README.html LICENSE.txt doc/* %license LICENSE.txt
%doc README.html doc/*
%{_javadir}/%{name}.jar %{_javadir}/%{name}.jar
%{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}-%{version}.jar
%{_javadir}/%{name}-xpath.jar %{_javadir}/%{name}-xpath.jar