X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=runtime%2Forg.argeo.slc.core%2Fpom.xml;h=9b305e67eebacb7e37bc5055e3c5efcae03e2302;hb=3afad17166ce36229206b3bcdc627e9d7993809e;hp=aaa7cfaf65ab582d8e7aed941693c5cbba132e6d;hpb=9288d9dae323820959c28213603fd560c1cabe67;p=gpl%2Fargeo-slc.git

diff --git a/runtime/org.argeo.slc.core/pom.xml b/runtime/org.argeo.slc.core/pom.xml
index aaa7cfaf6..9b305e67e 100644
--- a/runtime/org.argeo.slc.core/pom.xml
+++ b/runtime/org.argeo.slc.core/pom.xml
@@ -1,9 +1,10 @@
-<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.12.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc.runtime</groupId>
@@ -11,6 +12,17 @@
 	<name>SLC Core</name>
 	<description>Basic implementations of SLC Specifications</description>
 	<build>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<directory>.</directory>
+				<includes>
+					<include>META-INF/**</include>
+				</includes>
+			</resource>
+		</resources>
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -27,18 +39,18 @@
 			<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>
-				-->
+				<configuration>
+					<archive>
+						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
+					</archive>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
 				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
+					<manifestLocation>META-INF</manifestLocation>
 					<instructions>
 						<Export-Package>
 							org.argeo.slc.*,org.argeo.slc.core.test.spring
@@ -48,7 +60,9 @@
 							org.dbunit.database;resolution:="optional",
 							org.dbunit.dataset;resolution:="optional",
 							org.dbunit.dataset.xml;resolution:="optional",
-							org.dbunit.operation;resolution:="optional"
+							org.dbunit.operation;resolution:="optional",
+							junit.framework;resolution:="optional",
+							org.springframework.context.support;resolution:=optional
 						</Import-Package>
 					</instructions>
 				</configuration>
@@ -80,13 +94,6 @@
 			<artifactId>org.argeo.dep.osgi.commons.exec</artifactId>
 		</dependency>
 
-		<!--
-			<dependency> <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.org.apache.commons.logging</artifactId>