X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Fpom.xml;h=92183d7c8a3080aa2b796e1955a0cdd4b59ce074;hb=f33a1bcc6bf8ce4ff382645d3ba8af38db431b05;hp=581878e86afcd75cfd0de2ab43de023a3de82c45;hpb=5fdd82df06b612c7cb6effa41a3d4b5b87c2b4c6;p=gpl%2Fargeo-slc.git

diff --git a/dep/pom.xml b/dep/pom.xml
index 581878e86..92183d7c8 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</version>
+		<version>0.13.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.argeo.slc</groupId>
@@ -11,9 +12,14 @@
 	<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.eclipse</module>
+		<module>org.argeo.slc.dep.sdk</module>
+		<module>org.argeo.slc.dep.sdk.sources</module>
 	</modules>
 	<build>
 		<resources>
@@ -21,7 +27,6 @@
 				<directory>.</directory>
 				<includes>
 					<include>*.inf</include>
-					<include>META-INF/MANIFEST.MF</include>
 				</includes>
 			</resource>
 		</resources>
@@ -37,7 +42,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,46 +51,49 @@
 				<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>
-			</plugin>
-			<plugin>
-				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
 				<executions>
 					<execution>
+						<id>bundle-manifest</id>
+						<phase>process-resources</phase>
 						<goals>
-							<goal>descriptors</goal>
+							<goal>manifest</goal>
 						</goals>
-						<phase>generate-resources</phase>
 					</execution>
 				</executions>
 			</plugin>
 			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>build-helper-maven-plugin</artifactId>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>maven-argeo-osgi-plugin</artifactId>
 				<executions>
 					<execution>
-						<id>attach-artifacts</id>
-						<phase>package</phase>
+						<id>resolve-pde-sources</id>
 						<goals>
-							<goal>attach-artifact</goal>
+							<goal>pde-sources</goal>
 						</goals>
+						<phase>generate-resources</phase>
 						<configuration>
-							<artifacts>
-								<artifact>
-									<file>target/classes/modularDistribution.csv</file>
-									<type>csv</type>
-									<classifier>modularDistribution</classifier>
-								</artifact>
-							</artifacts>
+							<copyArtifacts>true</copyArtifacts>
 						</configuration>
 					</execution>
+					<execution>
+						<goals>
+							<goal>descriptors</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
 				</executions>
-			</plugin>
+			</plugin><!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> 
+				<executions> <execution> <id>attach-artifacts</id> <phase>package</phase> 
+				<goals> <goal>attach-artifact</goal> </goals> <configuration> <artifacts> 
+				<artifact> <file>target/classes/modularDistribution.csv</file> <type>csv</type> 
+				<classifier>modularDistribution</classifier> </artifact> </artifacts> </configuration> 
+				</execution> </executions> </plugin> -->
 		</plugins>
 	</build>
 </project>
\ No newline at end of file