[maven-release-plugin] prepare release argeo-slc-1.1.6

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

diff --git a/dep/org.argeo.slc.dep.rap/pom.xml b/dep/org.argeo.slc.dep.rap/pom.xml
index 0b23f2c5ba69d6f2b0aed55cf8f1b699b5d9d60c..059692e9d2ca0e5e89ea5a7fdb50a976756a7d70 100644 (file)
--- a/dep/org.argeo.slc.dep.rap/pom.xml
+++ b/dep/org.argeo.slc.dep.rap/pom.xml
@@ -1,17 +1,24 @@
-<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.slc</groupId>
                <artifactId>dep</artifactId>
-               <version>0.13.1-SNAPSHOT</version>
+               <version>1.1.6</version>
                <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc.dep</groupId>
        <artifactId>org.argeo.slc.dep.rap</artifactId>
        <name>SLC Eclipse RAP Dependencies</name>
        <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.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
@@ -23,33 +30,20 @@
                                                </goals>
                                                <phase>generate-resources</phase>
                                        </execution>
-                                       <execution>
-                                               <id>check-osgi</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>equinox</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <onlyCheck>true</onlyCheck>
-                                                       <argsToAppend>
-                                                               <arg>-clean</arg>
-                                                       </argsToAppend>
-                                               </configuration>
-                                       </execution>
                                </executions>
                        </plugin>
                </plugins>
        </build>
        <dependencies>
                <dependency>
-                       <groupId>org.argeo.slc.dep</groupId>
+                       <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.dep.eclipse</artifactId>
-                       <version>0.13.1-SNAPSHOT</version>
+                       <version>1.1.6</version>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.slc.eclipse</groupId>
+                       <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.client.rap</artifactId>
-                       <version>0.13.1-SNAPSHOT</version>
+                       <version>1.1.6</version>
                </dependency>
 
                <!-- Secure Application -->
@@ -58,8 +52,45 @@
                        <artifactId>org.argeo.security.dep.node.rap</artifactId>
                        <version>${version.argeo-commons}</version>
                </dependency>
+
+               <!-- For target platform generation -->
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.unit</artifactId>
+                       <version>1.1.6</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.support.maven</artifactId>
+                       <version>1.1.6</version>
+                       <scope>test</scope>
+               </dependency>
        </dependencies>
        <profiles>
+               <profile>
+                       <id>check-osgi</id>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               <groupId>org.argeo.maven.plugins</groupId>
+                                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               <id>check-osgi</id>
+                                                               <phase>test</phase>
+                                                               <goals>
+                                                                       <goal>equinox</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       <onlyCheck>true</onlyCheck>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
                <profile>
                        <id>rpmbuild</id>
                        <build>
@@ -76,7 +107,6 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>slc-rap</name>
-                                                                       <copyright>2011 Argeo</copyright>
                                                                        <mappings>
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi/rap</directory>
@@ -86,7 +116,7 @@
                                                                                        <directoryIncluded>false</directoryIncluded>
                                                                                        <dependency>
                                                                                                <includes>
-                                                                                                       <include>org.argeo.slc.eclipse:org.argeo.slc.client.rap</include>
+                                                                                                       <include>org.argeo.slc:org.argeo.slc.client.rap</include>
                                                                                                </includes>
                                                                                        </dependency>
                                                                                </mapping>
@@ -110,8 +140,7 @@
                                                                <configuration>
                                                                        <target>
                                                                                <copy todir="${rpm.stagingRepository}" verbose="true">
-                                                                                       <fileset dir="${project.build.directory}/rpm"
-                                                                                               includes="*/RPMS/**/*.rpm" />
+                                                                                       <fileset dir="${project.build.directory}/rpm" includes="*/RPMS/**/*.rpm" />
                                                                                        <flattenmapper />
                                                                                </copy>
                                                                        </target>