[ws-jaxme] Build all class files in 1.5 format (rhbz#842624)

[Hans de Goede]

commit 0ae5301b8014359fd347248aa509e2eacafc7b06
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri Jul 27 16:20:43 2012 +0200

    Build all class files in 1.5 format (rhbz#842624)

 ws-jaxme-0.5.2-class-version15.patch |   75 ++++++++++++++++++++++++++++++++++
 ws-jaxme.spec                        |    7 +++-
 2 files changed, 81 insertions(+), 1 deletions(-)
---
diff --git a/ws-jaxme-0.5.2-class-version15.patch b/ws-jaxme-0.5.2-class-version15.patch
new file mode 100644
index 0000000..59954e6
--- /dev/null
+++ b/ws-jaxme-0.5.2-class-version15.patch
@@ -0,0 +1,75 @@
+diff -up ws-jaxme-0.5.2/ant/jm.xml~ ws-jaxme-0.5.2/ant/jm.xml
+--- ws-jaxme-0.5.2/ant/jm.xml~	2012-07-27 12:18:59.000000000 +0200
++++ ws-jaxme-0.5.2/ant/jm.xml	2012-07-27 16:07:58.924849227 +0200
+@@ -128,7 +128,7 @@
+     <target name="JM.compile" depends="dirs,JM.precompile">
+         <javac classpathref="jaxme.class.path" debug="${debug}"
+             optimize="${optimize}" destdir="${build.jm.classes}"
+-             source="1.3" target="1.3"
++             source="1.5" target="1.5"
+             failonerror="true">
+             <src>
+                 <pathelement location="${src.jm}"/>
+@@ -185,7 +185,7 @@
+     <target name="JM.localtest" depends="JM.generate">
+         <javac debug="${debug}"
+             optimize="${optimize}" destdir="${build.jm.classes}"
+-            source="1.3" target="1.3"
++            source="1.5" target="1.5"
+             failonerror="true">
+             <src>
+                 <pathelement location="${src.jm}"/>
+diff -up ws-jaxme-0.5.2/ant/js.xml~ ws-jaxme-0.5.2/ant/js.xml
+--- ws-jaxme-0.5.2/ant/js.xml~	2012-07-27 12:18:59.000000000 +0200
++++ ws-jaxme-0.5.2/ant/js.xml	2012-07-27 16:08:26.538504008 +0200
+@@ -71,7 +71,7 @@
+    
+     <target name="JS.compile" depends="JS.antlr,init">
+         <javac destdir="${build.js.classes}" debug="${debug}"
+-            source="1.3" target="1.3"
++            source="1.5" target="1.5"
+             optimize="${optimize}" classpathref="js.class.path">
+             <src>
+                 <pathelement location="${src.js}"/>
+@@ -160,7 +160,7 @@
+         <javac destdir="${build.js.test.classes}"
+             debug="${debug}" optimize="${optimize}"
+             includes="org/apache/ws/jaxme/js/junit/**/*"
+-            source="1.3" target="1.3"
++            source="1.5" target="1.5"
+             classpathref="js.test.path">
+           <src path="${src.js}"/>
+           <src path="${build.js.src}"/>
+diff -up ws-jaxme-0.5.2/ant/macros.xml~ ws-jaxme-0.5.2/ant/macros.xml
+--- ws-jaxme-0.5.2/ant/macros.xml~	2005-07-14 20:32:17.000000000 +0200
++++ ws-jaxme-0.5.2/ant/macros.xml	2012-07-27 16:08:37.033372804 +0200
+@@ -54,7 +54,7 @@
+             <mkdir dir="@{destdir}"/>
+             <javac destdir="@{destdir}" srcdir="@{srcdir}" debug="${debug}"
+                 optimize="${optimize}" classpathref="@{classpathref}"
+-                excludes="@{excludes}" source="1.3" target="1.3">
++                excludes="@{excludes}" source="1.5" target="1.5">
+                 <exclude name="@{java14classes}" unless="have14"/>
+             </javac>
+         </sequential>
+diff -up ws-jaxme-0.5.2/ant/pm.xml~ ws-jaxme-0.5.2/ant/pm.xml
+--- ws-jaxme-0.5.2/ant/pm.xml~	2012-07-27 12:18:59.000000000 +0200
++++ ws-jaxme-0.5.2/ant/pm.xml	2012-07-27 16:08:42.912299308 +0200
+@@ -70,7 +70,7 @@
+     <target name="PM.compile" depends="dirs,JM.all">
+         <javac classpathref="pm.class.path" debug="${debug}"
+             optimize="${optimize}" destdir="${build.pm.classes}"
+-            source="1.3" target="1.3"
++            source="1.5" target="1.5"
+             srcdir="${src.pm}">
+             <exclude name="org/apache/ws/jaxme/pm/junit/**/*"/>
+             <exclude name="org/apache/ws/jaxme/**/api4j/*" unless="have.inoapi4j"/>
+@@ -112,7 +112,7 @@
+ 
+     <target name="PM.generate.compile" depends="PM.generate">
+         <javac debug="${debug}"
+-            source="1.3" target="1.3"
++            source="1.5" target="1.5"
+             optimize="${optimize}" destdir="${build.pm.test.classes}">
+             <classpath>
+                 <path refid="pm.class.path"/>
diff --git a/ws-jaxme.spec b/ws-jaxme.spec
index 179a01d..8e4b585 100644
--- a/ws-jaxme.spec
+++ b/ws-jaxme.spec
@@ -32,7 +32,7 @@
 
 Name:           ws-jaxme
 Version:        0.5.2
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          0
 Summary:        Open source implementation of JAXB
 
@@ -52,6 +52,7 @@ Patch4:         ws-jaxme-ant-scripts.patch
 Patch5:         ws-jaxme-use-commons-codec.patch
 # Remove xmldb-api, deprecated since f17
 Patch6:         ws-jaxme-remove-xmldb.patch
+Patch7:         ws-jaxme-0.5.2-class-version15.patch
 BuildArch:      noarch
 BuildRequires:  jpackage-utils >= 0:1.6
 BuildRequires:	java-devel >= 1.6.0
@@ -121,6 +122,7 @@ DOCBOOKX_DTD=`%{_bindir}/xmlcatalog %{_datadir}/sgml/docbook/xmlcatalog "-//OASI
 %patch4 -b .sav
 %patch5 -b .sav
 %patch6 -p1
+%patch7 -p1
 
 %build
 export CLASSPATH=$(build-classpath antlr hsqldb commons-codec junit log4j xerces-j2 xalan-j2)
@@ -173,6 +175,9 @@ install -pm 644 LICENSE $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Fri Jul 27 2012 Hans de Goede <hdegoede at redhat.com> - 0:0.5.2-5
+- Build all class files in 1.5 format (rhbz#842624)
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0:0.5.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild