From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 4 Oct 2019 09:07:26 +0000 (+0200)
Subject: Use recent Maven BND plugin.
X-Git-Tag: argeo-commons-2.1.81~24
X-Git-Url: http://git.argeo.org/?p=lgpl%2Fargeo-commons.git;a=commitdiff_plain;h=68d99cd12b5709625db4d4955e7ad75cdcb65c5a

Use recent Maven BND plugin.
---

diff --git a/org.argeo.cms/bnd.bnd b/org.argeo.cms/bnd.bnd
index 4a2da22b9..50041e682 100644
--- 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 778525895..d6b784f4d 100644
--- 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>