X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.core%2Fpom.xml;h=973f69a0e78e536e476ed2a836b4f9d5b2d17764;hb=805f03392d3e1a561257614db979f0c2c82c1328;hp=0bfe626ec967f89fb2381b503bb60eebc7e1a6a0;hpb=00bec32c992254bba99f21eee2dbb6323a2ca2f3;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.core/pom.xml b/org.argeo.slc.core/pom.xml
index 0bfe626ec..973f69a0e 100644
--- a/org.argeo.slc.core/pom.xml
+++ b/org.argeo.slc.core/pom.xml
@@ -1,15 +1,13 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>0.9-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>
@@ -33,68 +31,98 @@
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-assembly-plugin</artifactId>
-				<configuration>
-					<descriptors>
-						<descriptor>src/assembly/base.xml</descriptor>
-					</descriptors>
-				</configuration>
-				<executions>
-					<execution>
-						<id>assembly-base</id>
-						<phase>package</phase>
-						<goals>
-							<goal>single</goal>
-						</goals>
-					</execution>
-				</executions>
+				<artifactId>maven-surefire-plugin</artifactId>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
+				<artifactId>maven-jar-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
 				<configuration>
-					<excludes>
-						<exclude>**/*IntegrationTest*.java</exclude>
-					</excludes>
+					<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>org.apache.xalan</groupId>
+			<artifactId>com.springsource.org.apache.xalan</artifactId>
+		</dependency>
+		 -->
+		<dependency>
+			<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>commons-io</artifactId>
+			<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