X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Fpom.xml;h=36df3252b32ce04a4a4b847a18cf05e9a14f5631;hb=553ae73d5b4efd8c3436b39f04cd925bf4f4e4b2;hp=f247acdd28d6bf0ad2363070b6fb47942b7194bc;hpb=f490413cbd3b622a584a27a15d96ce03407b284e;p=lgpl%2Fargeo-commons.git

diff --git a/dep/pom.xml b/dep/pom.xml
index f247acdd2..36df3252b 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -1,37 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>2.1.12-SNAPSHOT</version>
+		<version>2.1.42-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>dep</artifactId>
-	<name>Commons Base Dependencies</name>
+	<name>Commons Modular Distributions</name>
 	<packaging>pom</packaging>
 	<modules>
-		<module>org.argeo.dep.log4j</module>
-		<module>org.argeo.dep.jackrabbit</module>
-		<module>org.argeo.eclipse.dep.rap</module>
-		<module>org.argeo.eclipse.dep.rwt</module>
-		<module>org.argeo.eclipse.dep.rcp</module>
-		<module>org.argeo.server.dep.ads</module>
-		<module>org.argeo.server.dep.jackrabbit.server</module>
-		<module>org.argeo.security.dep.node</module>
-		<module>org.argeo.security.dep.node.rap</module>
-		<module>org.argeo.security.dep.node.rcp</module>
-		<module>org.argeo.dep.cms</module>
+		<module>org.argeo.dep.cms.client</module>
+		<module>org.argeo.dep.cms.node</module>
+		<module>org.argeo.dep.cms.platform</module>
+		<module>org.argeo.dep.cms.sdk</module>
+		<!-- legacy -->
+		<!-- <module>org.argeo.security.dep.node</module> -->
+		<!-- <module>org.argeo.dep.cms</module> -->
+		<!-- <module>org.argeo.security.dep.node.rap</module> -->
 	</modules>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.felix</groupId>
+				<artifactId>maven-bundle-plugin</artifactId>
+				<configuration>
+					<instructions>
+						<SLC-ModularDistribution>default</SLC-ModularDistribution>
+					</instructions>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.argeo.maven.plugins</groupId>
+				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-descriptors</id>
+						<goals>
+							<goal>descriptors</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
+				</executions>
+			</plugin>
+		</plugins>
+	</build>
 	<profiles>
 		<profile>
 			<id>check-osgi</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>check-osgi</id>
+								<phase>test</phase>
+								<goals>
+									<goal>equinox</goal>
+								</goals>
+								<configuration>
+									<onlyCheck>true</onlyCheck>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
 			<dependencies>
 				<dependency>
 					<groupId>org.argeo.commons</groupId>
 					<artifactId>org.argeo.osgi.boot</artifactId>
-					<version>2.1.12-SNAPSHOT</version>
+					<version>2.1.42-SNAPSHOT</version>
 					<scope>test</scope>
 				</dependency>
 			</dependencies>