Use recent Maven BND plugin.

diff --git a/org.argeo.cms/bnd.bnd b/org.argeo.cms/bnd.bnd
index 4a2da22b90cb9a26756c3df23fef437807c955fc..50041e682fed7623cf51d0f99dfefba646b6fec3 100644 (file)
--- a/org.argeo.cms/bnd.bnd
+++ b/org.argeo.cms/bnd.bnd
@@ -6,6 +6,7 @@ org.postgresql;resolution:=optional,\
 org.apache.jackrabbit.webdav.server,\
 org.apache.jackrabbit.webdav.jcr,\
 org.apache.commons.httpclient.cookie;resolution:=optional,\
+!com.sun.security.jgss,\
 org.osgi.*;version=0.0.0,\
 *
 Provide-Capability: cms.datamodel;name=cms;cnd=/org/argeo/cms/cms.cnd;abstract=true
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index 7785258953523c452ee98f8e1e5736a83ab86eef..d6b784f4dbcb7664c1166607535bb8419044b78f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -238,7 +238,7 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.apache.felix</groupId>
                                        <artifactId>maven-bundle-plugin</artifactId>
-                                       <version>3.0.1</version>
+                                       <version>4.2.1</version>
                                        <extensions>true</extensions>
                                        <configuration>
                                                <manifestLocation>META-INF</manifestLocation>
@@ -372,6 +372,10 @@ limitations under the License.
                                        <groupId>org.argeo.tp.apache</groupId>
                                        <artifactId>org.apache.xerces</artifactId>
                                </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp.sdk</groupId>
+                                       <artifactId>biz.aQute.bnd</artifactId>
+                               </exclusion>
                        </exclusions>
                </dependency>
        </dependencies>