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

[gpl/argeo-slc.git] / dep / pom.xml

diff --git a/dep/pom.xml b/dep/pom.xml
index 924f06a7f7d75c28e76bc455b8c7cb4d190fe670..9938793222653646f0d8d6926485ad3a26c18e60 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.argeo.slc</groupId>
                <artifactId>argeo-slc</artifactId>
-               <version>2.1.18-SNAPSHOT</version>
+               <version>2.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>
@@ -12,9 +12,6 @@
        <modules>
                <module>org.argeo.slc.dep.minimal</module>
                <module>org.argeo.slc.dep.e4.rap</module>
-               <!--  Legacy -->
-               <module>org.argeo.slc.dep.spring</module>
-               <module>org.argeo.slc.dep.backend</module>
        </modules>
        <build>
                <plugins>
@@ -27,6 +24,16 @@
                                        </instructions>
                                </configuration>
                        </plugin>
+                       <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.argeo.maven.plugins</groupId>
                                <artifactId>argeo-osgi-plugin</artifactId>