Merge RAP 2.x adaptation from 2.tp branch

[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 7ac1796f58daaa52993f91d98be09faa41c16066..da0ead5014905218dba2213518bc54e1637b0644 100644 (file)
--- a/security/dep/org.argeo.security.dep.node.rap/pom.xml
+++ b/security/dep/org.argeo.security.dep.node.rap/pom.xml
@@ -63,6 +63,32 @@
                        <artifactId>org.argeo.security.dep.node</artifactId>
                        <version>2.1.2-SNAPSHOT</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>
@@ -70,12 +96,13 @@
                        <version>2.1.2-SNAPSHOT</version>
                </dependency>
 
-               <!-- For Tomcat deployment -->
+               <!-- For Tomcat deployment
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.server.rap.webapp</artifactId>
-                       <version>2.1.2-SNAPSHOT</version>
+                       <version>2.1.1.tp-SNAPSHOT</version>
                </dependency>
+                -->
        </dependencies>
        <profiles>
                <profile>