[pkg-java] r10801 - in trunk/maven-repo-helper: debian src/main/java/org/debian/maven/repo

[Damien Raude-Morvan]

Author: drazzib
Date: 2009-10-11 16:48:58 +0000 (Sun, 11 Oct 2009)
New Revision: 10801

Modified:
   trunk/maven-repo-helper/debian/changelog
   trunk/maven-repo-helper/debian/control
   trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMReader.java
Log:
* org/debian/maven/repo/POMReader.java:
  Fix ${parent.version} parsing inside child's pom.xml
* Bump Standards-Version to 3.8.3 (no changes needed)
* Fix Vcs-* fields: use pkg-java SVN repository

Modified: trunk/maven-repo-helper/debian/changelog
===================================================================
--- trunk/maven-repo-helper/debian/changelog	2009-10-11 16:38:20 UTC (rev 10800)
+++ trunk/maven-repo-helper/debian/changelog	2009-10-11 16:48:58 UTC (rev 10801)
@@ -1,3 +1,12 @@
+maven-repo-helper (0.8) unstable; urgency=low
+
+  * org/debian/maven/repo/POMReader.java:
+    Fix ${parent.version} parsing inside child's pom.xml
+  * Bump Standards-Version to 3.8.3 (no changes needed)
+  * Fix Vcs-* fields: use pkg-java SVN repository
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 11 Oct 2009 18:47:16 +0200
+
 maven-repo-helper (0.7) unstable; urgency=low
 
   * Install jars in /usr/share/java and create link to them from

Modified: trunk/maven-repo-helper/debian/control
===================================================================
--- trunk/maven-repo-helper/debian/control	2009-10-11 16:38:20 UTC (rev 10800)
+++ trunk/maven-repo-helper/debian/control	2009-10-11 16:48:58 UTC (rev 10801)
@@ -2,11 +2,11 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
+Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, help2man, libstax-java
-Standards-Version: 3.8.1
-Vcs-Bzr: lp:~ludovicc/maven-packaging-support/maven-repo-helper
-Vcs-Browser: http://bazaar.launchpad.net/~ludovicc/maven-packaging-support/maven-repo-helper/files
+Standards-Version: 3.8.3
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-repo-helper/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-repo-helper/
 Homepage: https://launchpad.net/maven-packaging-support
 
 Package: maven-repo-helper

Modified: trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMReader.java
===================================================================
--- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMReader.java	2009-10-11 16:38:20 UTC (rev 10800)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMReader.java	2009-10-11 16:48:58 UTC (rev 10801)
@@ -226,6 +226,11 @@
         if (thisPom.getVersion() == null && parent != null) {
             thisPom.setVersion(parent.getVersion());
         }
+        
+        // Damien Raude-Morvan: Resolve "parent.version" variable when parsing pom 
+        if (thisPom.getVersion().equalsIgnoreCase("${parent.version}") && parent != null) {
+            thisPom.setVersion(parent.getVersion());
+        }
 
         Map inferedProperties = new TreeMap(properties);
         inferedProperties.put("pom.groupId", thisPom.getGroupId());