[maven-release-plugin] prepare release argeo-commons-2.1.11

[lgpl/argeo-commons.git] / security / dep / org.argeo.security.dep.node.rap / pom.xml

diff --git a/security/dep/org.argeo.security.dep.node.rap/pom.xml b/security/dep/org.argeo.security.dep.node.rap/pom.xml
index fc4a68e75dbf560a369fe4562ef338b1829381e4..efee60246f740cfa028961a2fabe0443242c649a 100644 (file)
--- a/security/dep/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/dep/org.argeo.security.dep.node.rap/pom.xml
@@ -1,9 +1,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.security</groupId>
-               <version>0.3.4-SNAPSHOT</version>
+               <version>2.1.11</version>
                <artifactId>dep</artifactId>
                <relativePath>..</relativePath>
        </parent>
@@ -11,6 +10,15 @@
        <name>Node Eclipse RAP</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>
@@ -22,16 +30,6 @@
                                                </goals>
                                                <phase>generate-resources</phase>
                                        </execution>
-                                       <execution>
-                                               <id>check-osgi</id>
-                                               <phase>test</phase>
-                                               <goals>
-                                                       <goal>equinox</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <onlyCheck>true</onlyCheck>
-                                               </configuration>
-                                       </execution>
                                </executions>
                        </plugin>
                </plugins>
@@ -41,40 +39,104 @@
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.jcr.ui.explorer</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
+                       <version>2.1.11</version>
                </dependency>
                <dependency>
-                       <groupId>org.argeo.commons.osgi</groupId>
+                       <groupId>org.argeo.commons.base</groupId>
                        <artifactId>org.argeo.osgi.ui.explorer</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
+                       <version>2.1.11</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.security</groupId>
                        <artifactId>org.argeo.security.ui.admin</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
+                       <version>2.1.11</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.mvc</artifactId>
+                       <version>2.1.11</version>
                </dependency>
 
                <!-- Basis -->
                <dependency>
                        <groupId>org.argeo.commons.security</groupId>
                        <artifactId>org.argeo.security.dep.node</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
+                       <version>2.1.11</version>
                        <type>pom</type>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>org.argeo.commons.security</groupId>
+                                       <artifactId>org.argeo.security.dao.jackrabbit</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.commons.security</groupId>
+                                       <artifactId>org.argeo.security.dao.os</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.commons.server</groupId>
+                                       <artifactId>org.argeo.server.catalina.start</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.commons.server</groupId>
+                                       <artifactId>org.argeo.server.webextender</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp</groupId>
+                                       <artifactId>org.apache.jasper</artifactId>
+                               </exclusion>
+                               <exclusion>
+                                       <groupId>org.argeo.tp</groupId>
+                                       <artifactId>org.springframework.osgi.web.extender</artifactId>
+                               </exclusion>
+                       </exclusions>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.security</groupId>
                        <artifactId>org.argeo.security.ui.rap</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
+                       <version>2.1.11</version>
                </dependency>
 
-               <!-- For Tomcat deployment -->
+               <!-- For Tomcat deployment
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.server.rap.webapp</artifactId>
-                       <version>0.3.4-SNAPSHOT</version>
+                       <version>2.1.1.tp-SNAPSHOT</version>
                </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>
+                       <dependencies>
+                               <!-- OSGi test -->
+                               <dependency>
+                                       <groupId>org.argeo.commons.base</groupId>
+                                       <artifactId>org.argeo.osgi.boot</artifactId>
+                                       <version>2.1.11</version>
+                                       <scope>test</scope>
+                               </dependency>
+                       </dependencies>
+               </profile>
                <profile>
                        <id>rpmbuild</id>
                        <build>
@@ -91,8 +153,20 @@
                                                                </goals>
                                                                <configuration>
                                                                        <name>argeo-node-rap</name>
-                                                                       <copyright>2011 Argeo</copyright>
                                                                        <mappings>
+                                                                               <!-- <mapping> -->
+                                                                               <!-- <directory>/etc/argeo-node-rap</directory> -->
+                                                                               <!-- <username>root</username> -->
+                                                                               <!-- <groupname>root</groupname> -->
+                                                                               <!-- <filemode>644</filemode> -->
+                                                                               <!-- <configuration>true</configuration> -->
+                                                                               <!-- <directoryIncluded>false</directoryIncluded> -->
+                                                                               <!-- <sources> -->
+                                                                               <!-- <source> -->
+                                                                               <!-- <location>src/main/rpm/etc/argeo-node-rap</location> -->
+                                                                               <!-- </source> -->
+                                                                               <!-- </sources> -->
+                                                                               <!-- </mapping> -->
                                                                                <mapping>
                                                                                        <directory>/usr/share/osgi/rap</directory>
                                                                                        <username>root</username>
@@ -101,7 +175,7 @@
                                                                                        <directoryIncluded>false</directoryIncluded>
                                                                                        <dependency>
                                                                                                <includes>
-                                                                                                       <include>org.argeo.commons.eclipse:org.argeo.eclipse.ui.rap</include>
+                                                                                                       <include>org.argeo.commons.base:org.argeo.eclipse.ui.rap</include>
                                                                                                        <include>org.argeo.commons.server:org.argeo.server.rap.webapp</include>
                                                                                                        <include>org.argeo.commons.security:org.argeo.security.ui.rap</include>
                                                                                                </includes>