Fix MANIFEST

diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF
index 2a2e9e705a0b073967605f6f408f0e02486a2b4c..809159c6fbace8df50a6eec3526473f922f9a1dd 100644 (file)
--- a/META-INF/MANIFEST.MF
+++ b/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0\r
-Bnd-LastModified: 1420633348546\r
+Bnd-LastModified: 1420633708164\r
 Build-Jdk: 1.6.0_33\r
 Built-By: mbaudier\r
 Bundle-Description: SLC execution modules for generic tasks, to be used \r
@@ -11,12 +11,21 @@ Bundle-Name: Argeo Distribution Factory
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
 Bundle-SymbolicName: org.argeo.tp.slc.factory\r
 Bundle-Vendor: Argeo\r
-Bundle-Version: 1.1.19.r150107_1322\r
+Bundle-Version: 1.1.19.r150107_1328\r
 Created-By: Apache Maven Bundle Plugin\r
-Import-Package: javax.jcr;version="[2.0,3)",javax.security.auth.callback\r
- ;resolution:=optional,org.argeo.security.core;version="[1.2,2)",org.arg\r
- eo.slc.repo;version="[1.1,2)",org.argeo.slc.repo.osgi;version="[1.1,2)"\r
- ,org.springframework.security;version="[2.0,3)"\r
+Import-Package: *,javax.jcr;version="[2.0,3)",javax.security.auth.callba\r
+ ck;resolution:=optional,net.sf.cglib.core;version="[2.1,3)",net.sf.cgli\r
+ b.proxy;version="[2.1,3)",net.sf.cglib.reflect;version="[2.1,3)",org.ao\r
+ palliance.aop;version="[1.0,2)",org.argeo.security.core;version="[1.2,2\r
+ )",org.argeo.slc.core.execution;version="[1.1,2)",org.argeo.slc.core.ex\r
+ ecution.tasks;version="[1.1,2)",org.argeo.slc.execution;version="[1.1,2\r
+ )",org.argeo.slc.osgi;version="[1.1,2)",org.argeo.slc.repo;version="[1.\r
+ 1,2)",org.argeo.slc.repo.osgi;version="[1.1,2)",org.argeo.slc.test;vers\r
+ ion="[1.1,2)",org.springframework.aop;version="[2.5,3)",org.springframe\r
+ work.aop.framework;version="[2.5,3)",org.springframework.aop.scope;vers\r
+ ion="[2.5,3)",org.springframework.beans.factory.config;version="[2.5,3)\r
+ ",org.springframework.core.io;version="[2.5,3)",org.springframework.sec\r
+ urity;version="[2.0,3)"\r
 SLC-ExecutionModule: default\r
 SLC-GroupId: org.argeo.tp.slc\r
 Tool: Bnd-1.50.0\r

diff --git a/pom.xml b/pom.xml
index e181b8ec4f3fc3a5f45bd96b85ccc6292e562e14..54e8b3efbee652d570d2fa94d08b23079e9fe178 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,6 +9,12 @@
        <groupId>org.argeo.tp.slc</groupId>
        <artifactId>org.argeo.tp.slc.factory</artifactId>
        <name>Argeo Distribution Factory</name>
+       <properties>
+               <additionalImports.slc-lib>
+                       javax.security.auth.callback;resolution:="optional",
+                       *
+               </additionalImports.slc-lib>
+       </properties>
        <build>
                <resources>
                        <resource>
@@ -32,18 +38,6 @@
                                        </execution>
                                </executions>
                        </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <configuration>
-                                       <instructions>
-                                               <Import-Package>
-                                                       javax.security.auth.callback;resolution:="optional",
-                                                       *
-                                               </Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
                </plugins>
        </build>
        <dependencies>