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/04/30 07:38:03 UTC
svn commit: r652266 -
/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
Author: mcculls
Date: Tue Apr 29 22:38:03 2008
New Revision: 652266
URL: http://svn.apache.org/viewvc?rev=652266&view=rev
Log:
FELIX-543: remove automatic addition of classifier from Bundle-Version, instead provide the classifier as a Bnd property: $(classifier)
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?rev=652266&r1=652265&r2=652266&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java Tue Apr 29 22:38:03 2008
@@ -362,12 +362,6 @@
// update BND instructions to add included Maven resources
includeMavenResources( currentProject, properties, getLog() );
- if ( null != classifier && classifier.trim().length() > 0 )
- {
- String bundleVersion = properties.getProperty( Analyzer.BUNDLE_VERSION );
- properties.put( Analyzer.BUNDLE_VERSION, bundleVersion + '-' + classifier );
- }
-
if ( !properties.containsKey( Analyzer.EXPORT_PACKAGE ) && !properties.containsKey( Analyzer.PRIVATE_PACKAGE ) )
{
String bsn = properties.getProperty( Analyzer.BUNDLE_SYMBOLICNAME );
@@ -821,6 +815,8 @@
properties.put( "project.build.directory", getBuildDirectory() );
properties.put( "project.build.outputdirectory", getOutputDirectory() );
+ properties.put( "classifier", classifier == null ? "" : classifier );
+
return properties;
}