Merge from 0.11.mbaudier (OSGi libraries)

[gpl/argeo-slc.git] / org.argeo.slc.detached / pom.xml

diff --git a/org.argeo.slc.detached/pom.xml b/org.argeo.slc.detached/pom.xml
index 80edd1a8611a59d8ce271ccf4b6a5b8b5fbc00fe..ed3f0ba63174dfa5c399258f5714d4cbcc2984e0 100644 (file)
--- a/org.argeo.slc.detached/pom.xml
+++ b/org.argeo.slc.detached/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
@@ -9,34 +10,23 @@
        </parent>
        <artifactId>org.argeo.slc.detached</artifactId>
        <name>Argeo SLC Detached</name>
-       <packaging>jar</packaging>
+       <packaging>bundle</packaging>
        <build>
                <plugins>
                        <plugin>
                                <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile>
-                                       </archive>
-                               </configuration>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.felix</groupId>
                                <artifactId>maven-bundle-plugin</artifactId>
-                               <version>1.4.3</version>
-                               <extensions>true</extensions>
                                <configuration>
-                                       <manifestLocation>src/main/resources/META-INF</manifestLocation>
                                        <instructions>
-                                               <Bundle-SymbolicName>
-                                                       ${pom.artifactId}
-                                                       </Bundle-SymbolicName>
                                                <Bundle-Activator>
                                                        org.argeo.slc.detached.Activator
-                        </Bundle-Activator>
+                                               </Bundle-Activator>
                                                <Export-Package>
                                                        org.argeo.slc.detached.*
-                        </Export-Package>
+                                               </Export-Package>
                                                <Import-Package>
                                                        *,
                                                        org.springframework.beans.factory;version="2.0",
@@ -45,19 +35,9 @@
                                                        org.springframework.context;version="2.0",
                                                        org.springframework.context.support;version="2.0",
                                                        org.springframework.core.io;version="2.0"
-                        </Import-Package>
-                                               <_removeheaders>Bnd-LastModified</_removeheaders>
+                                               </Import-Package>
                                        </instructions>
                                </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>bundle-manifest</id>
-                                               <phase>process-classes</phase>
-                                               <goals>
-                                                       <goal>manifest</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
                        </plugin>
                        <plugin>
                                <groupId>org.apache.maven.plugins</groupId>
@@ -75,33 +55,42 @@
        </build>
        <dependencies>
                <dependency>
-                       <groupId>org.apache.felix</groupId>
-                       <artifactId>org.osgi.core</artifactId>
+                       <groupId>org.eclipse.osgi</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>
+                       <version>3.4.2.R34x_v20080826-1230</version>
                </dependency>
-
                <dependency>
                        <groupId>org.springframework</groupId>
-                       <artifactId>spring-context</artifactId>
+                       <artifactId>org.springframework.context</artifactId>
                </dependency>
 
                <dependency>
-                       <groupId>xerces</groupId>
-                       <artifactId>xercesImpl</artifactId>
+                       <groupId>org.apache.xerces</groupId>
+                       <artifactId>com.springsource.org.apache.xerces</artifactId>
                </dependency>
 
+
                <dependency>
-                       <groupId>commons-io</groupId>
-                       <artifactId>commons-io</artifactId>
+                       <groupId>xml-apis</groupId>
+                       <artifactId>xml-apis</artifactId>
+                       <version>1.3.04</version>
+                       <scope>provided</scope>
                </dependency>
 
                <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>
+                               com.springsource.org.apache.commons.io
+                       </artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.junit</groupId>
+                       <artifactId>com.springsource.junit</artifactId>
                        <scope>test</scope>
                </dependency>
                <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
+                       <groupId>org.apache.log4j</groupId>
+                       <artifactId>com.springsource.org.apache.log4j</artifactId>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file