[pkg-java] r16190 - trunk/jbossas4/debian
Niels Thykier
nthykier at alioth.debian.org
Thu Jun 21 11:50:49 UTC 2012
Author: nthykier
Date: 2012-06-21 11:50:48 +0000 (Thu, 21 Jun 2012)
New Revision: 16190
Modified:
trunk/jbossas4/debian/build.xml
trunk/jbossas4/debian/changelog
Log:
Partial fixes FTBFS with Java7
Modified: trunk/jbossas4/debian/build.xml
===================================================================
--- trunk/jbossas4/debian/build.xml 2012-06-21 09:57:00 UTC (rev 16189)
+++ trunk/jbossas4/debian/build.xml 2012-06-21 11:50:48 UTC (rev 16190)
@@ -57,7 +57,7 @@
<target name="jar">
<mkdir dir="${test.dir}/${class.dir}"/>
<javac srcdir="${test.dir}/${source.dir}" destdir="${test.dir}/${class.dir}"
- debug="true"/>
+ debug="true" source="1.5" target="1.5"/>
<jar jarfile="${test.jar}">
<fileset dir="${test.dir}/${class.dir}">
@@ -67,7 +67,7 @@
<mkdir dir="${ejb3x.dir}/${class.dir}"/>
<javac srcdir="${ejb3x.dir}/${source.dir}" destdir="${ejb3x.dir}/${class.dir}"
- debug="true" source="1.5"/>
+ debug="true" source="1.5" target="1.5" />
<jar jarfile="${ejb3x.jar}">
<fileset dir="${ejb3x.dir}/${class.dir}">
@@ -77,7 +77,7 @@
<mkdir dir="${jmx.dir}/${class.dir}"/>
<javac srcdir="${jmx.dir}/${source.dir}" destdir="${jmx.dir}/${class.dir}"
- debug="true"/>
+ debug="true" source="1.5" target="1.5"/>
<!-- The upstream build.xml builds some more jars with partial
content only. Do we need to build them? -->
@@ -90,7 +90,7 @@
<mkdir dir="${system.dir}/${class.dir}"/>
<javac srcdir="${system.dir}/${source.dir}" destdir="${system.dir}/${class.dir}"
- debug="true" classpath="jboss-jmx.jar"/>
+ debug="true" classpath="jboss-jmx.jar" source="1.5" target="1.5"/>
<!-- The upstream build.xml builds some more jars with partial
content only. Do we need to build them? -->
@@ -102,7 +102,7 @@
<mkdir dir="${j2ee.dir}/${class.dir}"/>
<javac srcdir="${j2ee.dir}/${source.dir}" destdir="${j2ee.dir}/${class.dir}"
- debug="true" source="1.5"/>
+ debug="true" source="1.5" target="1.5"/>
<!-- The upstream build.xml builds some more jars with partial
content only. Do we need to build them? Additionally it builds
@@ -116,7 +116,7 @@
<mkdir dir="${jaxrpc.dir}/${class.dir}"/>
<javac srcdir="${jaxrpc.dir}/${source.dir}" destdir="${jaxrpc.dir}/${class.dir}"
- debug="true"/>
+ debug="true" source="1.5" target="1.5"/>
<jar jarfile="${jaxrpc.jar}">
<fileset dir="${jaxrpc.dir}/${class.dir}">
@@ -126,7 +126,7 @@
<mkdir dir="${naming.dir}/${class.dir}"/>
<javac srcdir="${naming.dir}/${source.dir}" destdir="${naming.dir}/${class.dir}"
- debug="true"/>
+ debug="true" source="1.5" target="1.5"/>
<jar jarfile="${jnpserver.jar}">
<fileset dir="${naming.dir}/${class.dir}">
@@ -147,7 +147,7 @@
<mkdir dir="${deployment.dir}/${class.dir}"/>
<javac srcdir="${deployment.dir}/${source.dir}" destdir="${deployment.dir}/${class.dir}"
- debug="true">
+ debug="true" source="1.5" target="1.5">
<classpath>
<fileset dir=".">
<include name='*.jar'/>
@@ -163,7 +163,7 @@
<mkdir dir="${transaction.dir}/${class.dir}"/>
<javac srcdir="${transaction.dir}/${source.dir}" destdir="${transaction.dir}/${class.dir}"
- debug="true">
+ debug="true" source="1.5" target="1.5">
<classpath>
<fileset dir=".">
<include name='*.jar'/>
@@ -182,7 +182,7 @@
target="security/src/main/org/jboss/security/auth/login/SunConfigParser.jj"
javacchome="/usr/share/java/" static="false" debugparser="true"/>
<javac srcdir="${security.dir}/${source.dir}" destdir="${security.dir}/${class.dir}"
- debug="true" source="1.5">
+ debug="true" source="1.5" target="1.5">
<classpath>
<fileset dir=".">
<include name='*.jar'/>
@@ -220,7 +220,7 @@
target="messaging/src/main/org/jboss/mq/selectors/SelectorParser.jj"
javacchome="/usr/share/java/" static="false" debugparser="true"/>
<javac srcdir="${messaging.dir}/${source.dir}" destdir="${messaging.dir}/${class.dir}"
- debug="true" source="1.5">
+ debug="true" source="1.5" target="1.5">
<classpath>
<fileset dir=".">
<include name='*.jar'/>
@@ -237,7 +237,7 @@
<mkdir dir="${management.dir}/${class.dir}"/>
<javac srcdir="${management.dir}/${source.dir}" destdir="${management.dir}/${class.dir}"
includes="org/jboss/management/j2ee/**" excludes="**/cluster/**,**/factory/EJB*.java,**/factory/RAR*.java"
- debug="true">
+ debug="true" source="1.5" target="1.5">
<classpath>
<fileset dir=".">
<include name='*.jar'/>
@@ -254,7 +254,7 @@
<mkdir dir="${remoting.dir}/${class.dir}"/>
<javac srcdir="${remoting.dir}/${source.dir}" destdir="${remoting.dir}/${class.dir}"
- debug="true">
+ debug="true" source="1.5" target="1.5">
<classpath>
<fileset dir=".">
<include name='*.jar'/>
@@ -270,7 +270,7 @@
<mkdir dir="${jms.dir}/${class.dir}"/>
<javac srcdir="${jms.dir}/${source.dir}" destdir="${jms.dir}/${class.dir}"
- debug="true">
+ debug="true" source="1.5" target="1.5">
<classpath>
<fileset dir=".">
<include name='*.jar'/>
@@ -286,7 +286,7 @@
<mkdir dir="${connector.dir}/${class.dir}"/>
<javac srcdir="${connector.dir}/${source.dir}" destdir="${connector.dir}/${class.dir}"
- debug="true" source="1.5" includes="**/*.java"
+ debug="true" source="1.5" target="1.5" includes="**/*.java"
excludes="**/org/jboss/resource/adapter/jdbc/jdk5/*.java">
<classpath>
<fileset dir=".">
@@ -303,7 +303,7 @@
<mkdir dir="${cluster.dir}/${class.dir}"/>
<javac srcdir="${cluster.dir}/${source.dir}" destdir="${cluster.dir}/${class.dir}"
- includes="**/framework/**" debug="true" source="1.5">
+ includes="**/framework/**" debug="true" source="1.5" target="1.5">
<classpath>
<fileset dir=".">
<include name='*.jar'/>
@@ -320,7 +320,7 @@
<mkdir dir="${aspects.dir}/${class.dir}"/>
<javac srcdir="${aspects.dir}/${source.dir}" destdir="${aspects.dir}/${class.dir}"
- excludes="**/deployment/**" debug="true" source="1.4">
+ excludes="**/deployment/**" debug="true" source="1.4" target="1.4">
<classpath>
<fileset dir=".">
<include name='*.jar'/>
@@ -337,7 +337,7 @@
<mkdir dir="${ejb3.dir}/${class.dir}"/>
<javac srcdir="${ejb3.dir}/${source.dir}" destdir="${ejb3.dir}/${class.dir}"
excludes="**/deployers/**,**/embedded/**,**/iiop/**,**/naming/**,**/clientmodule/**,**/webservice/**"
- debug="true" source="1.5">
+ debug="true" source="1.5" target="1.5">
<classpath>
<fileset dir=".">
<include name='*.jar'/>
@@ -353,7 +353,7 @@
<mkdir dir="${webservices.dir}/${class.dir}"/>
<javac srcdir="${webservices.dir}/${source.dir}" destdir="${webservices.dir}/${class.dir}"
- debug="true" source="1.5">
+ debug="true" source="1.5" target="1.5">
<classpath>
<fileset dir=".">
<include name='*.jar'/>
Modified: trunk/jbossas4/debian/changelog
===================================================================
--- trunk/jbossas4/debian/changelog 2012-06-21 09:57:00 UTC (rev 16189)
+++ trunk/jbossas4/debian/changelog 2012-06-21 11:50:48 UTC (rev 16190)
@@ -1,3 +1,11 @@
+jbossas4 (4.2.3.GA-8) UNRELEASED; urgency=low
+
+ * Team upload.
+ * Compile Java with source 1.5 and target 1.5 if it did
+ not explicitly had another source marker.
+
+ -- Niels Thykier <niels at thykier.net> Thu, 21 Jun 2012 13:49:33 +0200
+
jbossas4 (4.2.3.GA-7) unstable; urgency=low
* Team upload.
More information about the pkg-java-commits
mailing list