X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=dep%2Fpom.xml;h=4d5f11d4f516e147959b9ae71878408ce0c697ff;hb=6a0f4cf1c0a1b49004b8c3dbc075f7202f7536f1;hp=e94b55a801b1d52d169a04d94accd5a0b26b08ed;hpb=9288d9dae323820959c28213603fd560c1cabe67;p=gpl%2Fargeo-slc.git

diff --git a/dep/pom.xml b/dep/pom.xml
index e94b55a80..4d5f11d4f 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -1,26 +1,31 @@
-<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.11.5-SNAPSHOT</version>
+		<version>0.13.1-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
-	<groupId>org.argeo.slc</groupId>
 	<artifactId>dep</artifactId>
-	<packaging>pom</packaging>
 	<name>SLC Dependencies</name>
+	<packaging>pom</packaging>
 	<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.backend</module>
+		<module>org.argeo.slc.dep.sdk.rcp</module>
+		<module>org.argeo.slc.dep.sdk.rap</module>
 	</modules>
 	<build>
 		<resources>
 			<resource>
 				<directory>.</directory>
 				<includes>
-					<include>META-INF/MANIFEST.MF</include>
+					<include>*.inf</include>
 				</includes>
 			</resource>
 		</resources>
@@ -36,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>
@@ -45,24 +50,72 @@
 				<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>
 		</plugins>
+		<pluginManagement>
+			<plugins>
+				<plugin>
+					<groupId>org.argeo.maven.plugins</groupId>
+					<artifactId>maven-argeo-osgi-plugin</artifactId>
+					<executions>
+						<execution>
+							<id>resolve-pde-sources</id>
+							<goals>
+								<goal>pde-sources</goal>
+							</goals>
+							<phase>generate-resources</phase>
+						</execution>
+						<execution>
+							<id>generate-descriptors</id>
+							<goals>
+								<goal>descriptors</goal>
+							</goals>
+							<phase>generate-resources</phase>
+						</execution>
+						<execution>
+							<id>check-osgi</id>
+							<phase>test</phase>
+							<goals>
+								<goal>equinox</goal>
+							</goals>
+							<configuration>
+								<onlyCheck>true</onlyCheck>
+								<argsToAppend>
+									<arg>-clean</arg>
+								</argsToAppend>
+							</configuration>
+						</execution>
+					</executions>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+		<!-- TO BE DELETED <plugin> <groupId>org.argeo.maven.plugins</groupId> 
+			<artifactId>maven-argeo-osgi-plugin</artifactId> <executions> <execution> 
+			<id>resolve-pde-sources</id> <goals> <goal>pde-sources</goal> </goals> <phase>generate-resources</phase> 
+			<configuration> <copyArtifacts>true</copyArtifacts> </configuration> </execution> 
+			<execution> <goals> <goal>descriptors</goal> </goals> <phase>generate-resources</phase> 
+			</execution> </executions> </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