X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Fpom.xml;h=9eea5c71fed6adb7bea0735969f2fe747c5123ae;hb=8a64648ad2425e164755ab0889fdb77fc0b94147;hp=cb0a8d60a6456ed1011aa471993606af23394656;hpb=47269a8ff77ab893a0df36386d5e579e6344ad2a;p=gpl%2Fargeo-slc.git

diff --git a/dep/pom.xml b/dep/pom.xml
index cb0a8d60a..9eea5c71f 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -3,19 +3,16 @@
 	<parent>
 		<groupId>org.argeo.slc</groupId>
 		<artifactId>argeo-slc</artifactId>
-		<version>1.1.13-SNAPSHOT</version>
+		<version>2.1.16-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>dep</artifactId>
 	<name>SLC Dependencies</name>
 	<packaging>pom</packaging>
 	<modules>
-		<module>org.argeo.slc.dep.detached</module>
 		<module>org.argeo.slc.dep.minimal</module>
 		<module>org.argeo.slc.dep.backend</module>
-		<module>org.argeo.slc.dep.eclipse</module>
-		<module>org.argeo.slc.dep.rcp</module>
-		<module>org.argeo.slc.dep.rap</module>
+		<module>org.argeo.slc.dep.e4.rap</module>
 	</modules>
 	<build>
 		<plugins>
@@ -23,34 +20,89 @@
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<dependencies>
+					<dependency>
+						<groupId>org.argeo.commons</groupId>
+						<artifactId>assembly-descriptors</artifactId>
+						<version>${version.argeo-commons}</version>
+					</dependency>
+				</dependencies>
+				<configuration>
+					<attach>false</attach>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 	<profiles>
 		<profile>
-			<id>rpmbuild</id>
+			<id>check-osgi</id>
 			<build>
 				<plugins>
 					<plugin>
-						<artifactId>maven-antrun-plugin</artifactId>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
 						<executions>
 							<execution>
-								<phase>install</phase>
+								<id>check-osgi</id>
+								<phase>test</phase>
 								<goals>
-									<goal>run</goal>
+									<goal>equinox</goal>
 								</goals>
 								<configuration>
-									<target>
-										<copy todir="${rpm.stagingRepository}" verbose="true" failonerror="false">
-											<fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
-											<flattenmapper />
-										</copy>
-									</target>
+									<onlyCheck>true</onlyCheck>
 								</configuration>
 							</execution>
 						</executions>
 					</plugin>
 				</plugins>
 			</build>
+			<dependencies>
+				<dependency>
+					<groupId>org.argeo.commons</groupId>
+					<artifactId>org.argeo.osgi.boot</artifactId>
+					<version>${version.argeo-commons}</version>
+					<scope>test</scope>
+				</dependency>
+			</dependencies>
 		</profile>
 	</profiles>
+<!-- 	<profiles> -->
+<!-- 		<profile> -->
+<!-- 			<id>rpmbuild</id> -->
+<!-- 			<build> -->
+<!-- 				<plugins> -->
+<!-- 					<plugin> -->
+<!-- 						<artifactId>maven-antrun-plugin</artifactId> -->
+<!-- 						<executions> -->
+<!-- 							<execution> -->
+<!-- 								<phase>install</phase> -->
+<!-- 								<goals> -->
+<!-- 									<goal>run</goal> -->
+<!-- 								</goals> -->
+<!-- 								<configuration> -->
+<!-- 									<target> -->
+<!-- 										<copy todir="${rpm.stagingRepository}" verbose="true" -->
+<!-- 											failonerror="false"> -->
+<!-- 											<fileset dir="${project.build.directory}/rpm" -->
+<!-- 												includes="*/RPMS/**/*.rpm" /> -->
+<!-- 											<flattenmapper /> -->
+<!-- 										</copy> -->
+<!-- 									</target> -->
+<!-- 								</configuration> -->
+<!-- 							</execution> -->
+<!-- 						</executions> -->
+<!-- 					</plugin> -->
+<!-- 				</plugins> -->
+<!-- 			</build> -->
+<!-- 		</profile> -->
+<!-- 	</profiles> -->
 </project>
\ No newline at end of file