Start using new Maven/bnd approach.

[lgpl/argeo-commons.git] / dep / pom.xml

diff --git a/dep/pom.xml b/dep/pom.xml
index 9387768c13848c382b42c9a2c11cd7590bcf9c5a..0f0a97c46cbaf66c09ef602078d0e1c055b92794 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -1,10 +1,12 @@
 <?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.79</version>
+               <version>2.3.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>
@@ -13,9 +15,9 @@
        <modules>
                <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.ui.rap</module>
                <module>org.argeo.dep.cms.e4.rap</module>
-               <module>org.argeo.dep.cms.sdk</module>
+               <module>org.argeo.dep.cms.ext</module>
        </modules>
        <build>
                <plugins>
@@ -43,13 +45,6 @@
                        </plugin>
                        <plugin>
                                <artifactId>maven-assembly-plugin</artifactId>
-                               <dependencies>
-                                       <dependency>
-                                               <groupId>org.argeo.commons</groupId>
-                                               <artifactId>assembly-descriptors</artifactId>
-                                               <version>2.1.79</version>
-                                       </dependency>
-                               </dependencies>
                                <configuration>
                                        <attach>false</attach>
                                </configuration>
@@ -67,8 +62,28 @@
                        <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>
@@ -95,7 +110,7 @@
                                <dependency>
                                        <groupId>org.argeo.commons</groupId>
                                        <artifactId>org.argeo.osgi.boot</artifactId>
-                                       <version>2.1.79</version>
+                                       <version>2.3.1-SNAPSHOT</version>
                                        <scope>test</scope>
                                </dependency>
                        </dependencies>