[maven-release-plugin] prepare release v2.1.18

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

diff --git a/dep/pom.xml b/dep/pom.xml
index 2bf7f791da5c1977e11d0243c4819cc95a91bf9e..57d48f6cc3e6b25c6b734fb027aaa6d87eb73f7d 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.17-SNAPSHOT</version>
+               <version>2.1.18</version>
                <relativePath>..</relativePath>
        </parent>
        <artifactId>dep</artifactId>
@@ -11,26 +11,44 @@
        <packaging>pom</packaging>
        <modules>
                <module>org.argeo.slc.dep.minimal</module>
-               <module>org.argeo.slc.dep.spring</module>
                <module>org.argeo.slc.dep.e4.rap</module>
-               <!--  Legacy -->
-               <module>org.argeo.slc.dep.backend</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.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>
+                               <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>${version.argeo-commons}</version>
-                                       </dependency>
-                               </dependencies>
                                <configuration>
                                        <attach>false</attach>
                                </configuration>
@@ -48,6 +66,11 @@
                        <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>
@@ -82,34 +105,4 @@
                        </dependencies>
                </profile>
        </profiles>
-<!--   <profiles> -->
-<!--           <profile> -->
-<!--                   <id>rpmbuild</id> -->
-<!--                   <build> -->
-<!--                           <plugins> -->
-<!--                                   <plugin> -->
-<!--                                           <artifactId>maven-antrun-plugin</artifactId> -->
-<!--                                           <executions> -->
-<!--                                                   <execution> -->
-<!--                                                           <phase>install</phase> -->
-<!--                                                           <goals> -->
-<!--                                                                   <goal>run</goal> -->
-<!--                                                           </goals> -->
-<!--                                                           <configuration> -->
-<!--                                                                   <target> -->
-<!--                                                                           <copy todir="${rpm.stagingRepository}" verbose="true" -->
-<!--                                                                                   failonerror="false"> -->
-<!--                                                                                   <fileset dir="${project.build.directory}/rpm" -->
-<!--                                                                                           includes="*/RPMS/**/*.rpm" /> -->
-<!--                                                                                   <flattenmapper /> -->
-<!--                                                                           </copy> -->
-<!--                                                                   </target> -->
-<!--                                                           </configuration> -->
-<!--                                                   </execution> -->
-<!--                                           </executions> -->
-<!--                                   </plugin> -->
-<!--                           </plugins> -->
-<!--                   </build> -->
-<!--           </profile> -->
-<!--   </profiles> -->
 </project>
\ No newline at end of file