Load distribution management

git-svn-id: https://svn.argeo.org/slc/trunk/maven@2311 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/maven-argeo-osgi-plugin/pom.xml b/maven-argeo-osgi-plugin/pom.xml
index bae4ef353a040189b1a7d09e46233faeefb92b44..af234f940e80723bc913a72de8d53ad5b6fad7ab 100644 (file)
--- a/maven-argeo-osgi-plugin/pom.xml
+++ b/maven-argeo-osgi-plugin/pom.xml
@@ -2,7 +2,7 @@
        <modelVersion>4.0.0</modelVersion>\r
        <groupId>org.argeo.slc.maven</groupId>\r
        <artifactId>maven-argeo-osgi-plugin</artifactId>\r
-       <version>0.1.2</version>\r
+       <version>0.1.3</version>\r
        <packaging>maven-plugin</packaging>\r
        <name>Argeo OSGi Plugin</name>\r
 \r

diff --git a/maven-argeo-osgi-plugin/src/main/scripts/argeo-osgi.build.xml b/maven-argeo-osgi-plugin/src/main/scripts/argeo-osgi.build.xml
index 7afa78b7a1d12b9f6b437fa99326bfa9f71a4262..805a646f96bf46d8deac7df07c2c5af197ae04e0 100644 (file)
--- a/maven-argeo-osgi-plugin/src/main/scripts/argeo-osgi.build.xml
+++ b/maven-argeo-osgi-plugin/src/main/scripts/argeo-osgi.build.xml
@@ -7,7 +7,9 @@
        
        <target name="generate-poms">
 
-               <property name="profilesTemplate" location="profiles-template.xml" />
+               <loadfile property="distributionManagement"
+                     srcFile="distributionManagement.xml"/>
+
                <property name="targetDir" location="target" />
                <mkdir dir="${targetDir}" />
 
@@ -59,9 +61,9 @@
                        <![CDATA[
                        <module>bundles</module>
                </modules>
+               ${distributionManagement}
                </project>
        ]]></echo>
-       <copy file="${profilesTemplate}" tofile="${targetDir}/bundles/profiles.xml"/>
 
                
        <for list="${dirs}" param="dir">
@@ -84,10 +86,9 @@
                        <copy file="pom-template.xml" toFile="${bundleDir}/pom.xml">
                                <filterset>
                                        <filtersfile file="${bundleDir}/target/bundle.properties" />
+                                       <filter token="distributionManagement" value="${distributionManagement}"/>
                                </filterset>
                        </copy>
-
-                       <copy file="${profilesTemplate}" tofile="${bundleDir}/profiles.xml"/>
                </sequential>
        </for>
 
@@ -143,9 +144,8 @@
        <echo file="${deployPomFile}" append="true">
                <![CDATA[
                </dependencies>
+               ${distributionManagement}
        </project>
        ]]></echo>
-       
-       <copy file="${profilesTemplate}" tofile="${targetDir}/bundles/bundles/profiles.xml"/>
 </target>
 </project>
\ No newline at end of file