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

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-06-26 17:19:12 +0000 (Sun, 26 Jun 2011)
New Revision: 13824

Modified:
   trunk/maven-ant-helper/debian/changelog
   trunk/maven-ant-helper/debian/control
   trunk/maven-ant-helper/debian/rules
   trunk/maven-ant-helper/maven-build.xml
Log:
* maven-build.xml: Fix read of properties in *.poms files by changing
  regexp and set cleaner.options only if not already defined.
  (Closes: #629894).
* debian/rules: Remove ant-trax from classpath (doesn't exist anymore since
  Ant 1.8).

Modified: trunk/maven-ant-helper/debian/changelog
===================================================================
--- trunk/maven-ant-helper/debian/changelog	2011-06-25 22:42:05 UTC (rev 13823)
+++ trunk/maven-ant-helper/debian/changelog	2011-06-26 17:19:12 UTC (rev 13824)
@@ -1,3 +1,13 @@
+maven-ant-helper (7.3) unstable; urgency=low
+
+  * maven-build.xml: Fix read of properties in *.poms files by changing
+    regexp and set cleaner.options only if not already defined.
+    (Closes: #629894).
+  * debian/rules: Remove ant-trax from classpath (doesn't exist anymore since
+    Ant 1.8).
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 26 Jun 2011 19:14:05 +0200
+
 maven-ant-helper (7.2) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/maven-ant-helper/debian/control
===================================================================
--- trunk/maven-ant-helper/debian/control	2011-06-25 22:42:05 UTC (rev 13823)
+++ trunk/maven-ant-helper/debian/control	2011-06-26 17:19:12 UTC (rev 13824)
@@ -5,9 +5,9 @@
 Uploaders: Trygve Laugstøl <trygvis at inamo.no>, Paul Cager <paul-debian at home.paulcager.org>, 
  Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>,
  Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk
+Build-Depends: debhelper (>= 7), cdbs, default-jdk
 Build-Depends-Indep: ant, ant-optional, ant-contrib
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-ant-helper
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-ant-helper/
 Homepage: http://svn.debian.org/wsvn/pkg-java/trunk/maven-ant-helper

Modified: trunk/maven-ant-helper/debian/rules
===================================================================
--- trunk/maven-ant-helper/debian/rules	2011-06-25 22:42:05 UTC (rev 13823)
+++ trunk/maven-ant-helper/debian/rules	2011-06-26 17:19:12 UTC (rev 13824)
@@ -6,7 +6,7 @@
 PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
 VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ')
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2 
+DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar xalan2
 DEB_ANT_BUILD_TARGET := package
 DEB_ANT_BUILDFILE    := ./debian/build.xml
 DEB_ANT_ARGS         := -DartifactId=$(PACKAGE) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -propertyfile debian/build.properties

Modified: trunk/maven-ant-helper/maven-build.xml
===================================================================
--- trunk/maven-ant-helper/maven-build.xml	2011-06-25 22:42:05 UTC (rev 13823)
+++ trunk/maven-ant-helper/maven-build.xml	2011-06-26 17:19:12 UTC (rev 13824)
@@ -52,6 +52,7 @@
     <property name="bin.package" value="lib${package}-java" />
     <property name="debian.dir" value="${basedir}/debian" />
     <property name="project.dir" value="" />
+    <property name="debian.poms" value="${debian.dir}/${bin.package}.poms" />
     <property file="${debian.dir}/build.properties"/>
     <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
     <property name="xml-input-factory" value="com.bea.xml.stream.MXParserFactory" />
@@ -72,13 +73,13 @@
         <property name="pom.file" value="${pom.name}" />
         <condition property="available.pom">
             <and>
-                <available file="${debian.dir}/${bin.package}.poms"/>
+                <available file="${debian.poms}"/>
                 <available file="${pom.file}"/>
             </and>
         </condition>
 
         <echo message="Base dir is ${basedir}" />
-        <echo message="Pom name in ${bin.package}.poms: ${pom.name}" />
+        <echo message="Pom name in ${debian.poms}: ${pom.name}" />
         <echo message="Pom file ${pom.file} available? ${available.pom}" />
 
         <path id="repo-helper.classpath">
@@ -133,10 +134,10 @@
     <!-- /usr/share/java/ant-nodeps.jar must be in the classpath -->
     <target name="read.pom" depends="init.pom" if="available.pom">
 
-        <loadfile srcfile="${debian.dir}/${bin.package}.poms" property="cleaner.options">
+        <loadfile srcfile="${debian.poms}" property="cleaner.options">
             <filterchain>
                <linecontainsregexp>
-                   <regexp pattern="^${pom.name}$" />
+                   <regexp pattern="^${pom.name}" />
                </linecontainsregexp>
                <tokenfilter>
                  <containsregex
@@ -146,8 +147,12 @@
                <striplinebreaks/>
             </filterchain>
         </loadfile>
-        <!-- default empty value -->
-        <property name="cleaner.options" value=""/>
+        <!-- Default value -->
+        <condition property="cleaner.options" value="">
+            <not>  
+                <isset property="cleaner.options"/>
+            </not>
+        </condition>
 
         <mkdir dir="${debian.dir}/.mh" /> 
         <delete>