[pkg-java] r13830 - in trunk/maven-ant-helper: . debian
Ludovic Claude
ludovicc-guest at alioth.debian.org
Sat Jul 2 11:33:22 UTC 2011
Author: ludovicc-guest
Date: 2011-07-02 11:33:22 +0000 (Sat, 02 Jul 2011)
New Revision: 13830
Modified:
trunk/maven-ant-helper/debian/changelog
trunk/maven-ant-helper/debian/control
trunk/maven-ant-helper/maven-build.xml
trunk/maven-ant-helper/maven-defaults.properties
Log:
process-test-resources now ignores Java files when copying
Modified: trunk/maven-ant-helper/debian/changelog
===================================================================
--- trunk/maven-ant-helper/debian/changelog 2011-07-02 05:20:23 UTC (rev 13829)
+++ trunk/maven-ant-helper/debian/changelog 2011-07-02 11:33:22 UTC (rev 13830)
@@ -1,3 +1,9 @@
+maven-ant-helper (7.4) unstable; urgency=low
+
+ * process-test-resources now ignores Java files when copying
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Sat, 02 Jul 2011 13:31:29 +0100
+
maven-ant-helper (7.3) unstable; urgency=low
* maven-build.xml: Fix read of properties in *.poms files by changing
Modified: trunk/maven-ant-helper/debian/control
===================================================================
--- trunk/maven-ant-helper/debian/control 2011-07-02 05:20:23 UTC (rev 13829)
+++ trunk/maven-ant-helper/debian/control 2011-07-02 11:33:22 UTC (rev 13830)
@@ -14,6 +14,7 @@
Package: maven-ant-helper
Architecture: all
+Section: java
Depends: ${misc:Depends}, ant, ant-optional, ant-contrib, maven-repo-helper (>= 1.4)
Suggests: default-jdk-doc, libmodello-java (>= 1.0), libmaven2-core-java,
libmaven-plugin-tools-java, libplexus-component-metadata-java
Modified: trunk/maven-ant-helper/maven-build.xml
===================================================================
--- trunk/maven-ant-helper/maven-build.xml 2011-07-02 05:20:23 UTC (rev 13829)
+++ trunk/maven-ant-helper/maven-build.xml 2011-07-02 11:33:22 UTC (rev 13830)
@@ -40,6 +40,9 @@
dependency2=libcommons-logging-java
javadoc.generate: if set, the default target (build-all) will build the project and generate the Javadoc
+ The properties can be defined also in debian/build.properties, and they will override properties
+ defined in /usr/share/maven-ant-helper/maven-defaults.properties.
+
If you provide a pom file to your project, or the project already contains a pom file,
then it will be read. You need to add /usr/share/java/ant-nodeps.jar to the classpath
for this functionality to work.
@@ -337,7 +340,9 @@
<target name="process-test-resources" depends="compile" if="available.testResources" unless="maven.test.skip">
<mkdir dir="${build.testOutputDirectory}"/>
<copy todir="${build.testOutputDirectory}">
- <fileset dir="${build.testResourcesDirectory}"/>
+ <fileset dir="${build.testResourcesDirectory}">
+ <exclude name="**/*.java" />
+ </fileset>
</copy>
</target>
Modified: trunk/maven-ant-helper/maven-defaults.properties
===================================================================
--- trunk/maven-ant-helper/maven-defaults.properties 2011-07-02 05:20:23 UTC (rev 13829)
+++ trunk/maven-ant-helper/maven-defaults.properties 2011-07-02 11:33:22 UTC (rev 13830)
@@ -16,4 +16,6 @@
classpath.full.test=${build.testOutputDirectory}:${classpath.test}:${build.outputDirectory}:${classpath.compile}
manifest=/usr/share/maven-ant-helper/manifest.mf
+# To skip tests, set this property to true
+#maven.test.skip=true
maven.test.excludes=
More information about the pkg-java-commits
mailing list