You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2010/11/04 14:54:27 UTC
svn commit: r1030992 - in /felix/trunk/bundleplugin: ./ src/main/java/aQute/
src/main/java/org/apache/felix/bundleplugin/ src/main/java/org/osgi/
src/test/java/org/apache/felix/bundleplugin/
Author: rickhall
Date: Thu Nov 4 13:54:27 2010
New Revision: 1030992
URL: http://svn.apache.org/viewvc?rev=1030992&view=rev
Log:
Remove bnd modification. (FELIX-2176)
Removed:
felix/trunk/bundleplugin/src/main/java/aQute/
felix/trunk/bundleplugin/src/main/java/org/osgi/
Modified:
felix/trunk/bundleplugin/pom.xml
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/PackageVersionAnalyzer.java
felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
Modified: felix/trunk/bundleplugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/pom.xml?rev=1030992&r1=1030991&r2=1030992&view=diff
==============================================================================
--- felix/trunk/bundleplugin/pom.xml (original)
+++ felix/trunk/bundleplugin/pom.xml Thu Nov 4 13:54:27 2010
@@ -56,7 +56,7 @@
<dependency>
<groupId>biz.aQute</groupId>
<artifactId>bndlib</artifactId>
- <version>1.10.0</version>
+ <version>1.15.0</version>
</dependency>
<dependency>
<groupId>net.sf.kxml</groupId>
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java?rev=1030992&r1=1030991&r2=1030992&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/ManifestPlugin.java Thu Nov 4 13:54:27 2010
@@ -167,7 +167,8 @@ public class ManifestPlugin extends Bund
properties.putAll( getDefaultProperties( project ) );
properties.putAll( transformDirectives( instructions ) );
- PackageVersionAnalyzer analyzer = new PackageVersionAnalyzer();
+// PackageVersionAnalyzer analyzer = new PackageVersionAnalyzer();
+ Builder analyzer = new Builder();
if ( project.getBasedir() != null )
analyzer.setBase( project.getBasedir() );
Modified: felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/PackageVersionAnalyzer.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/PackageVersionAnalyzer.java?rev=1030992&r1=1030991&r2=1030992&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/PackageVersionAnalyzer.java (original)
+++ felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/PackageVersionAnalyzer.java Thu Nov 4 13:54:27 2010
@@ -37,6 +37,7 @@ public final class PackageVersionAnalyze
/*
* Remove META-INF subfolders from exports and set package versions to bundle version.
*/
+/*
public Map analyzeBundleClasspath( Jar dot, Map bundleClasspath, Map contained, Map referred, Map uses )
throws IOException
{
@@ -46,14 +47,14 @@ public final class PackageVersionAnalyze
{
Map.Entry entry = ( Map.Entry ) it.next();
- /* remove packages under META-INF */
+ // remove packages under META-INF
String packageName = ( String ) entry.getKey();
if ( packageName.startsWith( "META-INF." ) )
{
it.remove();
}
- /* set package versions to bundle version values */
+ // set package versions to bundle version values
if ( bundleVersion != null )
{
Map values = ( Map ) entry.getValue();
@@ -65,4 +66,5 @@ public final class PackageVersionAnalyze
}
return classSpace;
}
+*/
}
Modified: felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java?rev=1030992&r1=1030991&r2=1030992&view=diff
==============================================================================
--- felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java (original)
+++ felix/trunk/bundleplugin/src/test/java/org/apache/felix/bundleplugin/BundlePluginTest.java Thu Nov 4 13:54:27 2010
@@ -113,7 +113,8 @@ public class BundlePluginTest extends Ab
project.setArtifactId( "artifact" );
project.setVersion( "1.1.0.0" );
- PackageVersionAnalyzer analyzer = new PackageVersionAnalyzer();
+// PackageVersionAnalyzer analyzer = new PackageVersionAnalyzer();
+ Builder analyzer = new Builder();
Jar jar = new Jar( "name", osgiBundleFile );
analyzer.setJar( jar );
analyzer.setClasspath( new Jar[]