Merge remote-tracking branch 'origin/unstable' into testing

[gpl/argeo-suite.git] / dist / pom.xml

diff --git a/dist/pom.xml b/dist/pom.xml
index 2336e8fc46a8cf005fb238c413c54f9730fe4f69..dae809c50097dde861c9d59045ba46f302a15b6e 100644 (file)
--- a/dist/pom.xml
+++ b/dist/pom.xml
@@ -4,28 +4,25 @@
        <parent>
                <groupId>org.argeo.suite</groupId>
                <artifactId>argeo-suite</artifactId>
-               <version>2.1.16-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dist</artifactId>
        <name>Argeo Suite Distributions</name>
        <packaging>pom</packaging>
        <modules>
-               <module>argeo-office</module>
+               <module>argeo-suite-standard</module>
        </modules>
        <build>
                <plugins>
                        <plugin>
-                               <artifactId>maven-assembly-plugin</artifactId>
-                               <dependencies>
-                                       <dependency>
-                                               <groupId>org.argeo.commons</groupId>
-                                               <artifactId>assembly-descriptors</artifactId>
-                                               <version>${version.argeo-commons}</version>
-                                       </dependency>
-                               </dependencies>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>properties-maven-plugin</artifactId>
                                <configuration>
-                                       <attach>false</attach>
+                                       <quiet>true</quiet>
+                                       <files>
+                                               <file>../../cnf/${version.context}.bnd</file>
+                                       </files>
                                </configuration>
                        </plugin>
                </plugins>