X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dep%2Fpom.xml;h=3a9026cf46e6be9c19f4c4b361d82eab4b4745ce;hb=22047343f757477c053115f6e88701985f4c071b;hp=d0ef7f738e2a13aa8a49925377c0f469a37fc271;hpb=ad6f0b34f0d7e58bb22ece9188dd934c665efc2b;p=lgpl%2Fargeo-commons.git

diff --git a/dep/pom.xml b/dep/pom.xml
index d0ef7f738..49fda1dae 100644
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -4,24 +4,33 @@
 	<parent>
 		<groupId>org.argeo.commons</groupId>
 		<artifactId>argeo-commons</artifactId>
-		<version>2.1.34</version>
+		<version>2.3.5</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>dep</artifactId>
 	<name>Commons Modular Distributions</name>
 	<packaging>pom</packaging>
 	<modules>
-		<module>org.argeo.dep.cms.client</module>
+		<module>org.argeo.dep.cms.base</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> -->
+		<module>org.argeo.dep.cms.ext</module>
+		<module>org.argeo.dep.cms.ui.rcp</module>
+		<module>org.argeo.dep.cms.e4.rcp</module>
+		<module>org.argeo.dep.cms.ui.rap</module>
+		<module>org.argeo.dep.cms.e4.rap</module>
 	</modules>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>properties-maven-plugin</artifactId>
+				<configuration>
+					<quiet>true</quiet>
+					<files>
+						<file>../../cnf/${version.context}.bnd</file>
+					</files>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>maven-bundle-plugin</artifactId>
@@ -33,7 +42,7 @@
 			</plugin>
 			<plugin>
 				<groupId>org.argeo.maven.plugins</groupId>
-				<artifactId>maven-argeo-osgi-plugin</artifactId>
+				<artifactId>argeo-osgi-plugin</artifactId>
 				<executions>
 					<execution>
 						<id>generate-descriptors</id>
@@ -44,16 +53,54 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<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>
+		<dependency>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>org.junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.argeo.tp.sdk</groupId>
+			<artifactId>org.hamcrest</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 	<profiles>
+		<profile>
+			<id>a2-target</id>
+			<build>
+				<plugins>
+					<plugin>
+						<artifactId>maven-assembly-plugin</artifactId>
+						<configuration>
+							<descriptorRefs>
+								<descriptorRef>a2-target</descriptorRef>
+							</descriptorRefs>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<profile>
 			<id>check-osgi</id>
 			<build>
 				<plugins>
 					<plugin>
 						<groupId>org.argeo.maven.plugins</groupId>
-						<artifactId>maven-argeo-osgi-plugin</artifactId>
+						<artifactId>argeo-osgi-plugin</artifactId>
 						<executions>
 							<execution>
 								<id>check-osgi</id>
@@ -72,8 +119,8 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.argeo.commons</groupId>
-					<artifactId>org.argeo.osgi.boot</artifactId>
-					<version>2.1.34</version>
+					<artifactId>org.argeo.init</artifactId>
+					<version>2.3.5</version>
 					<scope>test</scope>
 				</dependency>
 			</dependencies>