[sling-maven-launchpad-plugin] 16/29: SLING-2331 : Values in partial bundle list should be interpolated Maven style

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to annotated tag maven-launchpad-plugin-2.1.2
in repository https://gitbox.apache.org/repos/asf/sling-maven-launchpad-plugin.git

commit 5deee1155234cb780189253368e846c38af1ec92
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Mon Dec 19 10:54:42 2011 +0000

    SLING-2331 : Values in partial bundle list should be interpolated Maven style
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/maven/maven-launchpad-plugin@1220684 13f79535-47bb-0310-9956-ffa450edef68
---
 .../projectsupport/AttachPartialBundleListMojo.java      | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/apache/sling/maven/projectsupport/AttachPartialBundleListMojo.java b/src/main/java/org/apache/sling/maven/projectsupport/AttachPartialBundleListMojo.java
index aff92b0..64c519b 100644
--- a/src/main/java/org/apache/sling/maven/projectsupport/AttachPartialBundleListMojo.java
+++ b/src/main/java/org/apache/sling/maven/projectsupport/AttachPartialBundleListMojo.java
@@ -16,6 +16,9 @@
  */
 package org.apache.sling.maven.projectsupport;
 
+import static org.apache.sling.maven.projectsupport.BundleListUtils.interpolateProperties;
+import static org.apache.sling.maven.projectsupport.BundleListUtils.readBundleList;
+
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
@@ -28,7 +31,6 @@ import org.codehaus.plexus.archiver.ArchiverException;
 import org.codehaus.plexus.archiver.zip.ZipArchiver;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import static org.apache.sling.maven.projectsupport.BundleListUtils.readBundleList;
 
 /**
  * Attaches the bundle list as a project artifact.
@@ -60,7 +62,7 @@ public class AttachPartialBundleListMojo extends AbstractBundleListMojo {
      * @parameter default-value="${project.build.directory}/bundleListconfig"
      */
     private File configOutputDir;
-    
+
     /**
      * @parameter default-value="${project.build.directory}/list.xml"
      */
@@ -86,16 +88,18 @@ public class AttachPartialBundleListMojo extends AbstractBundleListMojo {
         } else {
             initializedBundleList = new BundleList();
         }
-        
+
         addDependencies(initializedBundleList);
-        
-        BundleListXpp3Writer writer = new BundleListXpp3Writer();
+
+        interpolateProperties(initializedBundleList, this.project, this.mavenSession);
+
+        final BundleListXpp3Writer writer = new BundleListXpp3Writer();
         try {
             writer.write(new FileWriter(bundleListOutput), initializedBundleList);
         } catch (IOException e) {
             throw new MojoExecutionException("Unable to write bundle list", e);
         }
-        
+
         project.getArtifact().setFile(bundleListOutput);
 
         this.getLog().info("Attaching bundle list configuration");

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.