Author: drazzib Date: 2009-10-12 00:27:39 +0000 (Mon, 12 Oct 2009) New Revision: 10806
Modified: trunk/maven-repo-helper/debian/changelog trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMReader.java Log: org/debian/maven/repo/POMReader.java: Extend previous fix to parse much more properties and use expandProperties() like other cases. Modified: trunk/maven-repo-helper/debian/changelog =================================================================== --- trunk/maven-repo-helper/debian/changelog 2009-10-11 23:25:52 UTC (rev 10805) +++ trunk/maven-repo-helper/debian/changelog 2009-10-12 00:27:39 UTC (rev 10806) @@ -1,3 +1,11 @@ +maven-repo-helper (0.9) UNRELEASED; urgency=low + + * org/debian/maven/repo/POMReader.java: + Extend previous fix to parse much more properties + and use expandProperties() like other cases. + + -- Damien Raude-Morvan <[email protected]> Mon, 12 Oct 2009 00:27:19 +0200 + maven-repo-helper (0.8) unstable; urgency=low * org/debian/maven/repo/POMReader.java: 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 23:25:52 UTC (rev 10805) +++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMReader.java 2009-10-12 00:27:39 UTC (rev 10806) @@ -20,6 +20,7 @@ * Reads relevant information from the POM. * * @author Ludovic Claude <[email protected]> + * @author Damien Raude-Morvan <[email protected]> */ public class POMReader { @@ -226,19 +227,28 @@ 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()); inferedProperties.put("project.groupId", thisPom.getGroupId()); + inferedProperties.put("groupId", thisPom.getGroupId()); + inferedProperties.put("pom.artifactId", thisPom.getArtifactId()); inferedProperties.put("project.artifactId", thisPom.getArtifactId()); + inferedProperties.put("artifactId", thisPom.getArtifactId()); + inferedProperties.put("pom.version", thisPom.getVersion()); inferedProperties.put("project.version", thisPom.getVersion()); + inferedProperties.put("version", thisPom.getVersion()); + + if (parent != null) { + inferedProperties.put("parent.groupId", parent.getGroupId()); + inferedProperties.put("parent.artifactId", parent.getArtifactId()); + inferedProperties.put("parent.version", parent.getVersion()); + } + + expandProperties(thisPom, inferedProperties); expendProperties(dependencies, inferedProperties); expendProperties(dependencyManagement, inferedProperties); expendProperties(plugins, inferedProperties); _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
