You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by mc...@apache.org on 2008/05/16 06:39:32 UTC
svn commit: r656932 - in /felix/trunk/bundleplugin/src/main:
java/org/apache/felix/bundleplugin/AntPlugin.java resources/build.xml
Author: mcculls
Date: Thu May 15 21:39:32 2008
New Revision: 656932
URL: http://svn.apache.org/viewvc?rev=656932&view=rev
Log:
FELIX-561: Use same level of Bnd in script generated by bundle:ant as in the bundleplugin itself
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java
felix/trunk/bundleplugin/src/main/resources/build.xml
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java?rev=656932&r1=656931&r2=656932&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/AntPlugin.java Thu May 15 21:39:32 2008
@@ -78,6 +78,7 @@
// modify build template
String buildXml = IOUtil.toString( getClass().getResourceAsStream( BUILD_XML ) );
+ buildXml = StringUtils.replace( buildXml, "BND_VERSION", builder.getVersion() );
buildXml = StringUtils.replace( buildXml, "ARTIFACT_ID", artifactId );
FileUtils.fileWrite( baseDir + BUILD_XML, buildXml );
Modified: felix/trunk/bundleplugin/src/main/resources/build.xml
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/resources/build.xml?rev=656932&r1=656931&r2=656932&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/resources/build.xml (original)
+++ felix/trunk/bundleplugin/src/main/resources/build.xml Thu May 15 21:39:32 2008
@@ -20,7 +20,7 @@
<echo message="Please run: $ant -projecthelp"/>
</target>
- <property name="bnd.version" value="0.0.238"/>
+ <property name="bnd.version" value="BND_VERSION"/>
<target name="get-bnd"
depends="test-offline"
@@ -34,13 +34,12 @@
ignoreerrors="true"/>
</target>
- <taskdef resource="aQute/bnd/ant/taskdef.properties">
- <classpath>
- <pathelement location="${maven.repo.local}/biz/aQute/bnd/${bnd.version}/bnd-${bnd.version}.jar"/>
- </classpath>
- </taskdef>
-
<target name="package" depends="compile,test,get-bnd" description="Package the bundle">
+ <taskdef resource="aQute/bnd/ant/taskdef.properties">
+ <classpath>
+ <pathelement location="${maven.repo.local}/biz/aQute/bnd/${bnd.version}/bnd-${bnd.version}.jar"/>
+ </classpath>
+ </taskdef>
<pathconvert property="bnd.classpath" refid="build.classpath" pathsep=","/>
<bnd files="maven-build.bnd" classpath="${maven.build.outputDir},${bnd.classpath}"/>
</target>