Add security

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

diff --git a/pom.xml b/pom.xml
index 744f46480b92a8f5c2d097d09821ae7dc87e4f9c..9d6fe1da095c7791bd550eb9dcb86dacec06adf3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -9,6 +9,7 @@
        <modules>
                <module>runtime</module>
                <module>dep</module>
+               <module>modules</module>
                <module>server</module>
                <module>demo</module>
                <module>integration-tests</module>
@@ -16,6 +17,7 @@
        </modules>
        <properties>
                <developmentCycle>0.11</developmentCycle>
+               <version.argeo-ria>0.11.4-SNAPSHOT</version.argeo-ria>
                <version.spring>2.5.6.SEC01</version.spring>
                <version.spring-ws>1.5.7.A</version.spring-ws>
                <version.spring-osgi>1.2.0</version.spring-osgi>
@@ -27,8 +29,8 @@
                <version.slf4j>1.5.6</version.slf4j>
                <version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
                <version.activemq>5.2.0.0006</version.activemq>
-               <version.maven-argeo-osgi>0.1.14</version.maven-argeo-osgi>
-               <version.maven-argeo-qooxdoo>0.8.1.7</version.maven-argeo-qooxdoo>
+               <version.maven-argeo-osgi>0.1.15-SNAPSHOT</version.maven-argeo-osgi>
+               <version.maven-argeo-qooxdoo>0.8.2-SNAPSHOT</version.maven-argeo-qooxdoo>
                <site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
                <site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
        </properties>
@@ -203,6 +205,16 @@ limitations under the License.
                                <artifactId>org.argeo.slc.specs</artifactId>
                                <version>${project.version}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
+                               <artifactId>org.argeo.slc.core</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
+                               <artifactId>org.argeo.slc.unit</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.launcher</artifactId>
@@ -218,11 +230,11 @@ limitations under the License.
                                <artifactId>org.argeo.slc.support.simple</artifactId>
                                <version>${project.version}</version>
                        </dependency>
-                       <!--
-                               <dependency> <groupId>org.argeo.slc.runtime</groupId>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.ant</artifactId>
-                               <version>${project.version}</version> </dependency>
-                       -->
+                               <version>${project.version}</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.hibernate</artifactId>
@@ -248,6 +260,11 @@ limitations under the License.
                                <artifactId>org.argeo.slc.osgiboot</artifactId>
                                <version>${project.version}</version>
                        </dependency>
+                       <dependency>
+                               <groupId>org.argeo.slc.runtime</groupId>
+                               <artifactId>org.argeo.slc.support.osgi</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
                                <artifactId>org.argeo.slc.support.equinox</artifactId>
@@ -266,6 +283,12 @@ limitations under the License.
                                <artifactId>org.argeo.slc.ria</artifactId>
                                <version>${project.version}</version>
                        </dependency>
+
+                       <dependency>
+                               <groupId>org.argeo.ria</groupId>
+                               <artifactId>org.argeo.ria.core</artifactId>
+                               <version>${version.argeo-ria}</version>
+                       </dependency>
                        <!--
                                <dependency> <groupId>org.argeo.slc.server</groupId>
                                <artifactId>bundles</artifactId> <version>0.11.3-SNAPSHOT</version>
@@ -476,11 +499,24 @@ limitations under the License.
                                <version>${version.spring-osgi}</version>
                        </dependency>
                        <dependency>
-                               <groupId>org.argeo.slc.dep.osgi</groupId>
+                               <groupId>org.argeo.dep.osgi</groupId>
                                <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
                                <version>1.0.0.argeo4</version>
                        </dependency>
 
+                       <!-- Security -->
+                       <dependency>
+                               <groupId>org.springframework.security</groupId>
+                               <artifactId>org.springframework.security</artifactId>
+                               <version>2.0.4.A</version>
+                               <exclusions>
+                                       <exclusion>
+                                               <groupId>org.springframework</groupId>
+                                               <artifactId>org.springframework.web</artifactId>
+                                       </exclusion>
+                               </exclusions>
+                       </dependency>
+
                        <!-- AOP -->
                        <dependency>
                                <groupId>org.aspectj</groupId>
@@ -558,7 +594,7 @@ limitations under the License.
                        <dependency>
                                <groupId>org.argeo.dep.osgi</groupId>
                                <artifactId>org.argeo.dep.osgi.commons.cli</artifactId>
-                               <version>1.1</version>
+                               <version>1.1.0.argeo1</version>
                        </dependency>
                        <dependency>
                                <groupId>org.argeo.dep.osgi</groupId>