directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1296269 - in /directory/studio/trunk: ./ libraries/net.sf.ehcache.core/ libraries/org.antlr.antlr/ libraries/org.apache.commons.codec/ libraries/org.apache.commons.collections/ libraries/org.apache.commons.io/ libraries/org.apache.commons....
Date Fri, 02 Mar 2012 16:02:40 GMT
Author: pamarcelot
Date: Fri Mar  2 16:02:39 2012
New Revision: 1296269

URL: http://svn.apache.org/viewvc?rev=1296269&view=rev
Log:
Reverted previous fixes on MANIFEST.MF generation.
Specific rollback to version 2.3.4 of the org.apache.felix:maven-bundle-plugin (moving to
the newer version makes the RCP application fail with an emtpy perspective.

Modified:
    directory/studio/trunk/libraries/net.sf.ehcache.core/pom.xml
    directory/studio/trunk/libraries/org.antlr.antlr/pom.xml
    directory/studio/trunk/libraries/org.apache.commons.codec/pom.xml
    directory/studio/trunk/libraries/org.apache.commons.collections/pom.xml
    directory/studio/trunk/libraries/org.apache.commons.io/pom.xml
    directory/studio/trunk/libraries/org.apache.commons.lang/pom.xml
    directory/studio/trunk/libraries/org.apache.commons.logging/pom.xml
    directory/studio/trunk/libraries/org.apache.commons.pool/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.config/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.core.avl/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.core.constants/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.core/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.i18n/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.ldif.partition/pom.xml
    directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml
    directory/studio/trunk/libraries/org.apache.httpcomponents.httpclient/pom.xml
    directory/studio/trunk/libraries/org.apache.httpcomponents.httpcore/pom.xml
    directory/studio/trunk/libraries/org.apache.logging.log4j/pom.xml
    directory/studio/trunk/libraries/org.apache.mina.core/pom.xml
    directory/studio/trunk/libraries/org.bouncycastle.bcprov.jdk15/pom.xml
    directory/studio/trunk/libraries/org.dom4j.dom4j/pom.xml
    directory/studio/trunk/libraries/org.slf4j.api/pom.xml
    directory/studio/trunk/libraries/org.slf4j.log4j12/pom.xml
    directory/studio/trunk/libraries/org.xpp3.xpp3/pom.xml
    directory/studio/trunk/plugins/ldapbrowser.core/pom.xml
    directory/studio/trunk/plugins/ldapservers/pom.xml
    directory/studio/trunk/plugins/rcp.fullscreen/pom.xml
    directory/studio/trunk/plugins/rcp/pom.xml
    directory/studio/trunk/plugins/schemaeditor/pom.xml
    directory/studio/trunk/plugins/valueeditors/pom.xml
    directory/studio/trunk/pom.xml

Modified: directory/studio/trunk/libraries/net.sf.ehcache.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/net.sf.ehcache.core/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/net.sf.ehcache.core/pom.xml (original)
+++ directory/studio/trunk/libraries/net.sf.ehcache.core/pom.xml Fri Mar  2 16:02:39 2012
@@ -86,10 +86,12 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Require-Bundle>org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
-            <Import-Package>!org.hibernate*,*</Import-Package>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.antlr.antlr/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.antlr.antlr/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.antlr.antlr/pom.xml (original)
+++ directory/studio/trunk/libraries/org.antlr.antlr/pom.xml Fri Mar  2 16:02:39 2012
@@ -88,7 +88,9 @@
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.commons.codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.commons.codec/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.commons.codec/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.commons.codec/pom.xml Fri Mar  2 16:02:39
2012
@@ -88,7 +88,9 @@
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.commons.collections/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.commons.collections/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.commons.collections/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.commons.collections/pom.xml Fri Mar  2 16:02:39
2012
@@ -88,7 +88,9 @@
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.commons.io/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.commons.io/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.commons.io/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.commons.io/pom.xml Fri Mar  2 16:02:39 2012
@@ -88,7 +88,9 @@
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.commons.lang/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.commons.lang/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.commons.lang/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.commons.lang/pom.xml Fri Mar  2 16:02:39 2012
@@ -88,7 +88,9 @@
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,!org.apache.commons.lang.enum,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.commons.logging/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.commons.logging/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.commons.logging/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.commons.logging/pom.xml Fri Mar  2 16:02:39
2012
@@ -88,12 +88,9 @@
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
-            <Import-Package>
-              !org.apache.avalon.framework.logger,
-              !org.apache.log,
-              *
-            </Import-Package>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.commons.pool/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.commons.pool/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.commons.pool/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.commons.pool/pom.xml Fri Mar  2 16:02:39 2012
@@ -88,7 +88,9 @@
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.directory.server.config/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.config/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.config/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.config/pom.xml Fri Mar  2
16:02:39 2012
@@ -86,9 +86,20 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Require-Bundle>org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
+ org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.ldif.partition;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.core.api/pom.xml Fri Mar
 2 16:02:39 2012
@@ -86,9 +86,29 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Require-Bundle>net.sf.ehcache.core;bundle-version="${net.sf.ehcache.version}",
+ org.antlr.antlr;bundle-version="${org.antlr.version}",
+ org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
+ org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
+ org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
+ org.apache.directory.server.core.constants;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.client.api;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.asn1.api;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.codec.core;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.extras.aci;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.extras.util;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.mina.core;bundle-version="${org.apache.mina.core.version}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.directory.server.core.avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.core.avl/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.core.avl/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.core.avl/pom.xml Fri Mar
 2 16:02:39 2012
@@ -86,9 +86,16 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Require-Bundle>org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
+ org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.directory.server.core.constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.core.constants/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.core.constants/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.core.constants/pom.xml Fri
Mar  2 16:02:39 2012
@@ -86,9 +86,12 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Require-Bundle>org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.directory.server.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.core/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.core/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.core/pom.xml Fri Mar  2 16:02:39
2012
@@ -86,9 +86,27 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Require-Bundle>net.sf.ehcache.core;bundle-version="${net.sf.ehcache.version}",
+ org.apache.commons.collections;bundle-version="${org.apache.commons.collections.version}",
+ org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
+ org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.client.api;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.codec.core;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.extras.aci;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.extras.trigger;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.extras.util;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
+ org.bouncycastle.bcprov.jdk15;bundle-version="${org.bouncycastle.bcprov.jdk15.version}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.directory.server.i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.i18n/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.i18n/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.i18n/pom.xml Fri Mar  2 16:02:39
2012
@@ -86,9 +86,12 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Require-Bundle>org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.directory.server.ldif.partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.ldif.partition/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.ldif.partition/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.ldif.partition/pom.xml Fri
Mar  2 16:02:39 2012
@@ -86,9 +86,22 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Require-Bundle>org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
+ org.apache.commons.lang;bundle-version="${org.apache.commons.lang.version}",
+ org.apache.directory.server.core;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.directory.server.xdbm.partition/pom.xml Fri
Mar  2 16:02:39 2012
@@ -86,9 +86,20 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Require-Bundle>org.apache.commons.io;bundle-version="${org.apache.commons.io.version}",
+ org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.core.avl;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
+ org.apache.directory.shared.asn1.api;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.util;bundle-version="${org.apache.directory.shared.validversion}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.httpcomponents.httpclient/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.httpcomponents.httpclient/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.httpcomponents.httpclient/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.httpcomponents.httpclient/pom.xml Fri Mar
 2 16:02:39 2012
@@ -86,9 +86,14 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+            <Require-Bundle>org.apache.commons.codec;bundle-version="${org.apache.commons.codec.version}",
+ org.apache.commons.logging;bundle-version="${org.apache.commons.logging.version}",
+ org.apache.httpcomponents.httpcore;bundle-version="${org.apache.httpcomponents.version}"</Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.httpcomponents.httpcore/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.httpcomponents.httpcore/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.httpcomponents.httpcore/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.httpcomponents.httpcore/pom.xml Fri Mar  2
16:02:39 2012
@@ -88,7 +88,9 @@
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.logging.log4j/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.logging.log4j/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.logging.log4j/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.logging.log4j/pom.xml Fri Mar  2 16:02:39
2012
@@ -89,15 +89,9 @@
             <Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
-            <Import-Package>
-              !com.ibm.uvm.tools,
-              !com.sun.jdmk.comm,
-              !javax.jmdns,
-              !javax.jms,
-              !javax.mail*,
-              *
-            </Import-Package>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.apache.mina.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.apache.mina.core/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.apache.mina.core/pom.xml (original)
+++ directory/studio/trunk/libraries/org.apache.mina.core/pom.xml Fri Mar  2 16:02:39 2012
@@ -89,7 +89,9 @@
             <Require-Bundle>org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.bouncycastle.bcprov.jdk15/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.bouncycastle.bcprov.jdk15/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.bouncycastle.bcprov.jdk15/pom.xml (original)
+++ directory/studio/trunk/libraries/org.bouncycastle.bcprov.jdk15/pom.xml Fri Mar  2 16:02:39
2012
@@ -88,7 +88,9 @@
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.dom4j.dom4j/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.dom4j.dom4j/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.dom4j.dom4j/pom.xml (original)
+++ directory/studio/trunk/libraries/org.dom4j.dom4j/pom.xml Fri Mar  2 16:02:39 2012
@@ -88,14 +88,9 @@
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
-            <Import-Package>
-              !com.sun.msv.datatype*,
-              !org.jaxen*,
-              !org.gjt.xpp,
-              !org.relaxng.datatype,
-              *
-            </Import-Package>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.slf4j.api/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.slf4j.api/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.slf4j.api/pom.xml (original)
+++ directory/studio/trunk/libraries/org.slf4j.api/pom.xml Fri Mar  2 16:02:39 2012
@@ -89,8 +89,9 @@
             <Eclipse-BuddyPolicy>registered</Eclipse-BuddyPolicy>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
-            <Import-Package>!org.slf4j.impl,*</Import-Package>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.slf4j.log4j12/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.slf4j.log4j12/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.slf4j.log4j12/pom.xml (original)
+++ directory/studio/trunk/libraries/org.slf4j.log4j12/pom.xml Fri Mar  2 16:02:39 2012
@@ -87,9 +87,13 @@
           <instructions>
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Eclipse-RegisterBuddy>org.slf4j.api</Eclipse-RegisterBuddy>
+            <Require-Bundle>org.apache.logging.log4j;bundle-version="${org.apache.logging.log4j.version}",
+ org.slf4j.api;bundle-version="${org.slf4j.version}"</Require-Bundle>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/libraries/org.xpp3.xpp3/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/libraries/org.xpp3.xpp3/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/libraries/org.xpp3.xpp3/pom.xml (original)
+++ directory/studio/trunk/libraries/org.xpp3.xpp3/pom.xml Fri Mar  2 16:02:39 2012
@@ -88,7 +88,9 @@
             <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
             <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
             <Embed-Directory>lib</Embed-Directory>
+            <Embed-StripGroup>true</Embed-StripGroup>
             <_exportcontents>!lib,*</_exportcontents>
+            <Import-Package>!</Import-Package>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/plugins/ldapbrowser.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.core/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.core/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapbrowser.core/pom.xml Fri Mar  2 16:02:39 2012
@@ -128,7 +128,6 @@
             <Export-Package>org.apache.directory.studio.ldapbrowser.core.*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
-            <_failok>true</_failok>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/plugins/ldapservers/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapservers/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapservers/pom.xml (original)
+++ directory/studio/trunk/plugins/ldapservers/pom.xml Fri Mar  2 16:02:39 2012
@@ -139,7 +139,6 @@
             <Export-Package>org.apache.directory.studio.ldapservers.*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
-            <_failok>true</_failok>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/plugins/rcp.fullscreen/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/rcp.fullscreen/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/plugins/rcp.fullscreen/pom.xml (original)
+++ directory/studio/trunk/plugins/rcp.fullscreen/pom.xml Fri Mar  2 16:02:39 2012
@@ -123,7 +123,6 @@
             <Export-Package>!*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
-            <_failok>true</_failok>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/plugins/rcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/rcp/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/plugins/rcp/pom.xml (original)
+++ directory/studio/trunk/plugins/rcp/pom.xml Fri Mar  2 16:02:39 2012
@@ -131,7 +131,6 @@
             <Export-Package>!*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
-            <_failok>true</_failok>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/plugins/schemaeditor/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/pom.xml (original)
+++ directory/studio/trunk/plugins/schemaeditor/pom.xml Fri Mar  2 16:02:39 2012
@@ -140,7 +140,6 @@
             <Export-Package>org.apache.directory.studio.schemaeditor.model.*, org.apache.directory.studio.schemaeditor.model.io.*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
-            <_failok>true</_failok>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/plugins/valueeditors/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/valueeditors/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/plugins/valueeditors/pom.xml (original)
+++ directory/studio/trunk/plugins/valueeditors/pom.xml Fri Mar  2 16:02:39 2012
@@ -137,7 +137,6 @@
  org.apache.directory.studio.valueeditors.time.*</Export-Package>
             <Import-Package>!</Import-Package>
             <Private-Package>!</Private-Package>
-            <_failok>true</_failok>
           </instructions>
         </configuration>
         <executions>

Modified: directory/studio/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/trunk/pom.xml?rev=1296269&r1=1296268&r2=1296269&view=diff
==============================================================================
--- directory/studio/trunk/pom.xml (original)
+++ directory/studio/trunk/pom.xml Fri Mar  2 16:02:39 2012
@@ -2150,6 +2150,12 @@
     <pluginManagement>
       <plugins>
         <plugin>
+          <groupId>org.apache.felix</groupId>
+          <artifactId>maven-bundle-plugin</artifactId>
+          <version>2.3.4</version>
+        </plugin>
+        
+        <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
           <configuration>



Mime
View raw message