Merge from 0.11.mbaudier (OSGi libraries)

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

diff --git a/org.argeo.slc.core/pom.xml b/org.argeo.slc.core/pom.xml
index 70508d4cd1973cdb3e59876900714f122073604f..576a3333f6cdc55dc7ee0e223bedbc2265506c20 100644 (file)
--- a/org.argeo.slc.core/pom.xml
+++ b/org.argeo.slc.core/pom.xml
@@ -1,17 +1,22 @@
-<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">
+<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>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>0.10.1-SNAPSHOT</version>
+               <version>0.11.2-SNAPSHOT</version>
                <relativePath>../org.argeo.slc</relativePath>
        </parent>
-       <artifactId>argeo-slc-core</artifactId>
+       <artifactId>org.argeo.slc.core</artifactId>
        <name>Argeo SLC Core</name>
        <description>SLC Core</description>
        <scm>
-               <connection>scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core</connection>
-               <url>https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core</url>
+               <connection>
+                       scm:svn:https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core
+               </connection>
+               <url>
+                       https://www.argeo.org/svn/slc/trunk/org.argeo.slc.core
+               </url>
        </scm>
        <build>
                <plugins>
@@ -28,47 +33,93 @@
                                <groupId>org.apache.maven.plugins</groupId>
                                <artifactId>maven-surefire-plugin</artifactId>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-jar-plugin</artifactId>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <Export-Package>
+                                                       org.argeo.slc.*
+                                               </Export-Package>
+                                               <Import-Package>*,org.apache.commons.logging;version="1.1"</Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+
                </plugins>
        </build>
        <dependencies>
                <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>com.springsource.org.apache.commons.logging</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.apache.log4j</groupId>
+                       <artifactId>
+                                       com.springsource.org.apache.log4j
+                               </artifactId>
+               </dependency>
+               <!--
+                       <dependency> <groupId>org.slf4j</groupId>
+                       <artifactId>com.springsource.slf4j.log4j</artifactId>
+                       <version>1.5.3</version> </dependency> <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
+                       <version>1.5.3</version> </dependency>
+               -->
 
                <dependency>
                        <groupId>org.springframework</groupId>
-                       <artifactId>spring-context</artifactId>
+                       <artifactId>org.springframework.context</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.springframework.ws</groupId>
-                       <artifactId>spring-oxm</artifactId>
+                       <artifactId>org.springframework.oxm</artifactId>
                </dependency>
 
                <dependency>
                        <groupId>org.codehaus.castor</groupId>
-                       <artifactId>castor</artifactId>
+                       <artifactId>com.springsource.org.castor</artifactId>
                </dependency>
                <dependency>
-                       <groupId>xerces</groupId>
-                       <artifactId>xercesImpl</artifactId>
+                       <groupId>org.apache.xerces</groupId>
+                       <artifactId>com.springsource.org.apache.xerces</artifactId>
                </dependency>
                <dependency>
-                       <groupId>xalan</groupId>
-                       <artifactId>xalan</artifactId>
+                       <groupId>org.apache.xalan</groupId>
+                       <artifactId>com.springsource.org.apache.xalan</artifactId>
                </dependency>
-
                <dependency>
-                       <groupId>commons-io</groupId>
-                       <artifactId>commons-io</artifactId>
+                       <groupId>edu.emory.mathcs.backport</groupId>
+                       <artifactId>
+                               com.springsource.edu.emory.mathcs.backport
+                       </artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>javax.xml.stream</groupId>
+                       <artifactId>com.springsource.javax.xml.stream</artifactId>
+               </dependency>
+               <!--
+                       <dependency> <groupId>javax.xml.stream</groupId>
+                       <artifactId>stax-api</artifactId> </dependency>
+               -->
+               <dependency>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>
+                               com.springsource.org.apache.commons.io
+                       </artifactId>
                </dependency>
                <dependency>
                        <groupId>org.dbunit</groupId>
-                       <artifactId>dbunit</artifactId>
+                       <artifactId>com.springsource.org.dbunit</artifactId>
                </dependency>
                <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
+                       <groupId>org.junit</groupId>
+                       <artifactId>com.springsource.junit</artifactId>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file