Author: bimargulies Date: Mon Aug 29 17:05:00 2011 New Revision: 1162903 URL: http://svn.apache.org/viewvc?rev=1162903&view=rev Log: eliminate nasty x resulting from 'shading' rather than incorporating the dependencies.
Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml Modified: maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml URL: http://svn.apache.org/viewvc/maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml?rev=1162903&r1=1162902&r2=1162903&view=diff ============================================================================== --- maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml (original) +++ maven/sandbox/branches/doxia-ide-eclipse-with-tycho/doxia-osgi/org.apache.maven.doxia.eclipse.dependencies/pom.xml Mon Aug 29 17:05:00 2011 @@ -36,6 +36,7 @@ under the License. <doxiaVersion>1.2</doxiaVersion> <doxiaConverterVersion>1.2</doxiaConverterVersion> <maven-bundle-plugin-version>2.3.5</maven-bundle-plugin-version> + <dollar>$</dollar> </properties> <dependencies> <!-- Doxia --> @@ -122,11 +123,25 @@ under the License. <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> <configuration> + <dumpInstructions>target/dump.txt</dumpInstructions> <instructions> + <stamp>$${tstamp}</stamp> + <!-- hmm, has to be updated for releases --> + <Bundle-Version>1.0.0.${stamp}</Bundle-Version> + <!-- this should work better than the above, but does not work + at all + <_snapshot>\${tstamp}</_snapshot> + --> + <!-- <Embed-Dependency>*;scope=compile|runtime;inline=true</Embed-Dependency> <Export-Package> org.apache.maven.doxia.*;-split-package:=merge-first,org.codehaus.plexus.util,org.apache.commons.io,org.apache.commons.io.input,org.apache.commons.io.filefilter,org.apache.commons.io.output </Export-Package> + --> + <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency> + <_exportcontents> + org.apache.maven.doxia.*,org.codehaus.plexus.util,org.apache.commons.io,org.apache.commons.io.input,org.apache.commons.io.filefilter,org.apache.commons.io.output + </_exportcontents> <Import-Package>!com.apple.mrj,!com.sun.*,!javax.*,!org.apache.commons.*,!org.apache.log,!org.apache.xmlbeans,!org.apache.tools.*,!org.apache.xml.*,!org.codehaus.*,!sun.*,*</Import-Package> <Embed-Transitive>true</Embed-Transitive> <_nouses>true</_nouses>