[pkg-java] r15378 - in trunk/maven-ant-helper: . debian

[Ludovic Claude]

Author: ludovicc-guest
Date: 2011-11-12 23:48:58 +0000 (Sat, 12 Nov 2011)
New Revision: 15378

Modified:
   trunk/maven-ant-helper/debian/changelog
   trunk/maven-ant-helper/maven-build.xml
   trunk/maven-ant-helper/maven-defaults.properties
Log:
* Use Java 1.5 for compiling and source level compatibility
  by default (Closes: #644941)
* Fix issue when test sources are missing and maven.test.skip is not set
  to true

Modified: trunk/maven-ant-helper/debian/changelog
===================================================================
--- trunk/maven-ant-helper/debian/changelog	2011-11-12 22:49:50 UTC (rev 15377)
+++ trunk/maven-ant-helper/debian/changelog	2011-11-12 23:48:58 UTC (rev 15378)
@@ -1,3 +1,12 @@
+maven-ant-helper (7.5) UNRELEASED; urgency=low
+
+  * Use Java 1.5 for compiling and source level compatibility
+    by default (Closes: #644941)
+  * Fix issue when test sources are missing and maven.test.skip is not set
+    to true
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Sun, 30 Oct 2011 19:56:27 +0100
+
 maven-ant-helper (7.4) unstable; urgency=low
 
   [ Ludovic Claude ]

Modified: trunk/maven-ant-helper/maven-build.xml
===================================================================
--- trunk/maven-ant-helper/maven-build.xml	2011-11-12 22:49:50 UTC (rev 15377)
+++ trunk/maven-ant-helper/maven-build.xml	2011-11-12 23:48:58 UTC (rev 15378)
@@ -358,7 +358,7 @@
         </javac>
     </target>
 
-    <target name="test" depends="test-compile" unless="maven.test.skip">
+    <target name="test" depends="test-compile" if="available.testSources" unless="maven.test.skip">
         <mkdir dir="${build.directory}/test-output"/>
         <junit printsummary="yes" haltonfailure="no"> <!--  fork="yes" forkmode="once" -->
             <sysproperty key="basedir" value="${basedir}"/>

Modified: trunk/maven-ant-helper/maven-defaults.properties
===================================================================
--- trunk/maven-ant-helper/maven-defaults.properties	2011-11-12 22:49:50 UTC (rev 15377)
+++ trunk/maven-ant-helper/maven-defaults.properties	2011-11-12 23:48:58 UTC (rev 15378)
@@ -8,7 +8,7 @@
 build.directory=build
 build.outputDirectory=${build.directory}/classes
 build.testOutputDirectory=${build.directory}/test-classes
-build.javaVersion=1.4
+build.javaVersion=1.5
 javadoc.dir=${build.directory}/docs/api
 classpath.compile=
 classpath.test=