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

diff --git a/dep/pom.xml b/dep/pom.xml
index 581878e86..753e369e2 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -1,19 +1,23 @@
-<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>
 	<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.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>
@@ -21,7 +25,6 @@
 				<directory>.</directory>
 				<includes>
 					<include>*.inf</include>
-					<include>META-INF/MANIFEST.MF</include>
 				</includes>
 			</resource>
 		</resources>
@@ -33,59 +36,50 @@
 					<useLastCommittedRevision>false</useLastCommittedRevision>
 				</configuration>
 			</plugin>
-			<plugin>
-				<artifactId>maven-jar-plugin</artifactId>
-				<configuration>
-					<archive>
-						<manifestFile>target/classes/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>
-					<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>
-						<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>
+		<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>
+							<configuration>
+								<copyArtifacts>false</copyArtifacts>
+							</configuration>
+						</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>
 	</build>
 </project>
\ No newline at end of file