X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=dep%2Fpom.xml;h=a7a9e5456b84cbde59cb011c25a0eb154a81c521;hb=0f2684acd8274f302020a5d2628c4e5d3cc84500;hp=2c0fccf77423149ed6107cdff1fc9caf44f7c446;hpb=afd9f47933f6cd1f9d80da8181eb8cb8a53ef55f;p=lgpl%2Fargeo-commons.git

diff --git a/dep/pom.xml b/dep/pom.xml
index 2c0fccf77..75dede6a1 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -4,58 +4,97 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>2.1.12-SNAPSHOT</version>
+		<version>2.1.81-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.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.eclipse</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.e4.rap</module>
+		<module>org.argeo.dep.cms.sdk</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>argeo-osgi-plugin</artifactId>
+				<executions>
+					<execution>
+						<id>generate-descriptors</id>
+						<goals>
+							<goal>descriptors</goal>
+						</goals>
+						<phase>generate-resources</phase>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<dependencies>
+					<dependency>
+						<groupId>org.argeo.commons</groupId>
+						<artifactId>assembly-descriptors</artifactId>
+						<version>2.1.81-SNAPSHOT</version>
+					</dependency>
+				</dependencies>
+				<configuration>
+					<attach>false</attach>
+				</configuration>
 			</plugin>
 		</plugins>
-		<pluginManagement>
-			<plugins>
-				<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>
-		</pluginManagement>
 	</build>
+	<dependencies>
+		<dependency>
+			<groupId>org.argeo.tp.equinox</groupId>
+			<artifactId>org.eclipse.osgi</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>org.junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 	<profiles>
 		<profile>
 			<id>check-osgi</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.argeo.maven.plugins</groupId>
+						<artifactId>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.81-SNAPSHOT</version>
 					<scope>test</scope>
 				</dependency>
 			</dependencies>