X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.unit%2Fpom.xml;h=21caeae7246b1142f6b3f1a2b3b6412f02645d4e;hb=7c476baea6f552d783107abf9c6b96ebddde8625;hp=9d8bed7fd4911689fc74be0a7cff2c72632c72c8;hpb=ba94ee573e92ca76fdab8761bb2be0e68be6de06;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.unit/pom.xml b/runtime/org.argeo.slc.unit/pom.xml
index 9d8bed7fd..21caeae72 100644
--- a/runtime/org.argeo.slc.unit/pom.xml
+++ b/runtime/org.argeo.slc.unit/pom.xml
@@ -1,10 +1,9 @@
-<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>runtime</artifactId>
-		<version>0.11.5-SNAPSHOT</version>
+		<version>0.14.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.runtime</groupId>
@@ -12,43 +11,21 @@
 	<name>SLC Unit Tests Helpers</name>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<!--
-					<executions> <execution> <goals> <goal>test-jar</goal> </goals>
-					<configuration> <archive>
-					<manifestFile>target/test-classes/META-INF/MANIFEST.MF</manifestFile>
-					</archive> </configuration> </execution> </executions>
-				-->
-			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
-				<version>${version.maven-bundle-plugin}</version>
+
 				<configuration>
 					<instructions>
 						<Export-Package>
 							org.argeo.slc.*,org.argeo.slc.core.test.spring
 						</Export-Package>
-						<Import-Package>*,org.apache.commons.logging;version="1.1",
-							org.dbunit;resolution:="optional",
-							org.dbunit.database;resolution:="optional",
-							org.dbunit.dataset;resolution:="optional",
-							org.dbunit.dataset.xml;resolution:="optional",
-							org.dbunit.operation;resolution:="optional"
+						<Import-Package>org.apache.commons.logging;version="1.1",
+							org.dbunit.*;resolution:="optional",
+							org.hibernate.*;resolution:="optional",
+							org.springframework.xml.*;resolution:="optional",
+							org.springframework.orm.*;resolution:="optional",
+							*
 						</Import-Package>
 					</instructions>
 				</configuration>
@@ -60,10 +37,12 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.core</artifactId>
+			<version>0.14.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.support.simple</artifactId>
+			<version>0.14.1-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.junit</groupId>
@@ -74,26 +53,31 @@
 		<dependency>
 			<groupId>org.dbunit</groupId>
 			<artifactId>com.springsource.org.dbunit</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>com.springsource.org.apache.commons.collections</artifactId>
+			<optional>true</optional>
 		</dependency>
 
 		<!-- Hibernate -->
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>com.springsource.org.hibernate</artifactId>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>org.springframework.orm</artifactId>
+			<optional>true</optional>
 		</dependency>
 
 		<!-- OSGi -->
 		<dependency>
-			<groupId>org.argeo.slc.runtime</groupId>
-			<artifactId>org.argeo.slc.osgiboot</artifactId>
+			<groupId>org.argeo.commons.osgi</groupId>
+			<artifactId>org.argeo.osgi.boot</artifactId>
+			<version>${version.argeo-commons}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.osgi</groupId>
@@ -104,6 +88,7 @@
 		<dependency>
 			<groupId>org.argeo.slc.runtime</groupId>
 			<artifactId>org.argeo.slc.launcher</artifactId>
+			<version>0.14.1-SNAPSHOT</version>
 		</dependency>
 
 		<!-- OXM -->
@@ -112,5 +97,20 @@
 			<artifactId>org.springframework.oxm</artifactId>
 			<optional>true</optional>
 		</dependency>
+
+		<!-- Logging -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>com.springsource.slf4j.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>
+		</dependency>
+
 	</dependencies>
 </project>