X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Fpom.xml;h=98e0789a1e97fe8eea4c4e901e73ea39f1258139;hb=3752a6c8a8a721276d2ecf60efab9dbab111d945;hp=72efb82abef9cd36263da015ef0228e63df62e1a;hpb=834c7cc205601ef011c512dcd49bd3c9cb09abd7;p=gpl%2Fargeo-slc.git

diff --git a/dep/pom.xml b/dep/pom.xml
index 72efb82ab..98e0789a1 100644
--- a/dep/pom.xml
+++ b/dep/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>argeo-slc</artifactId>
-		<version>0.12.1-SNAPSHOT</version>
+		<version>0.12.2-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
@@ -11,9 +12,13 @@
 	<packaging>pom</packaging>
 	<name>SLC Dependencies</name>
 	<modules>
-		<module>org.argeo.slc.dep.server</module>
 		<module>org.argeo.slc.dep.agent</module>
+		<module>org.argeo.slc.dep.agent.extras</module>
+		<module>org.argeo.slc.dep.server</module>
 		<module>org.argeo.slc.dep.detached</module>
+		<module>org.argeo.slc.dep.gis</module>
+		<module>org.argeo.slc.dep.sdk</module>
+		<module>org.argeo.slc.dep.sdk.sources</module>
 	</modules>
 	<build>
 		<resources>
@@ -21,7 +26,6 @@
 				<directory>.</directory>
 				<includes>
 					<include>*.inf</include>
-					<include>META-INF/MANIFEST.MF</include>
 				</includes>
 			</resource>
 		</resources>
@@ -37,7 +41,7 @@
 				<artifactId>maven-jar-plugin</artifactId>
 				<configuration>
 					<archive>
-						<manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
+						<manifestFile>META-INF/MANIFEST.MF</manifestFile>
 					</archive>
 				</configuration>
 			</plugin>
@@ -46,11 +50,21 @@
 				<artifactId>maven-bundle-plugin</artifactId>
 				<version>${version.maven-bundle-plugin}</version>
 				<configuration>
+					<manifestLocation>META-INF</manifestLocation>
 					<instructions>
 						<Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
 						<Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
 					</instructions>
 				</configuration>
+				<executions>
+					<execution>
+						<id>bundle-manifest</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>manifest</goal>
+						</goals>
+					</execution>
+				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
@@ -63,7 +77,7 @@
 						<phase>generate-resources</phase>
 					</execution>
 				</executions>
-			</plugin>
+			</plugin><!--
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>build-helper-maven-plugin</artifactId>
@@ -86,6 +100,6 @@
 					</execution>
 				</executions>
 			</plugin>
-		</plugins>
+		--></plugins>
 	</build>
 </project>
\ No newline at end of file