Put secuirty services directly in node dep

git-svn-id: https://svn.argeo.org/commons/trunk@4322 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/security/dep/org.argeo.security.dep.ads/pom.xml b/security/dep/org.argeo.security.dep.ads/pom.xml
index 7dc55537640e0d609ce6e5a8ab358a8740af2353..eef98a10a82423fe2911bf7c4814d28d31c7e76f 100644 (file)
--- a/security/dep/org.argeo.security.dep.ads/pom.xml
+++ b/security/dep/org.argeo.security.dep.ads/pom.xml
@@ -11,33 +11,6 @@
        <packaging>pom</packaging>
        <name>Commons Security ADS Dependencies</name>
        <dependencies>
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.core</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.ldap</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.services</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.manager.ldap</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.dep.ldap</artifactId>
-                       <version>${version.argeo-commons}</version>
-                       <type>pom</type>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.server.dep.ads</artifactId>

diff --git a/security/dep/org.argeo.security.dep.node/pom.xml b/security/dep/org.argeo.security.dep.node/pom.xml
index c688581314190aa39f2f19019c8003cf0ef7ea89..0d0952f1b0c155b3bb66b20b770c338bc13518e9 100644 (file)
--- a/security/dep/org.argeo.security.dep.node/pom.xml
+++ b/security/dep/org.argeo.security.dep.node/pom.xml
@@ -49,7 +49,34 @@
                        <groupId>org.apache.xmlcommons</groupId>
                        <artifactId>com.springsource.org.apache.xmlcommons</artifactId>
                </dependency>
-               <!-- LDAP server and security services -->
+               <!-- Security services -->
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.core</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.ldap</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.services</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.services.admin</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.dao.ldap</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+
+               <!-- LDAP server -->
                <dependency>
                        <groupId>org.argeo.commons.security</groupId>
                        <artifactId>org.argeo.security.dep.ads</artifactId>