Use centralized parent and versions

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

diff --git a/basic/dep/org.argeo.basic.dep.log4j/pom.xml b/basic/dep/org.argeo.basic.dep.log4j/pom.xml
index 1cedd6eb1062a273e90ccc195078d2f2d4906208..748fb5218e97483c10bd02a439c8db2934b0a05f 100644 (file)
--- a/basic/dep/org.argeo.basic.dep.log4j/pom.xml
+++ b/basic/dep/org.argeo.basic.dep.log4j/pom.xml
@@ -23,5 +23,9 @@
                        <groupId>org.slf4j</groupId>
                        <artifactId>com.springsource.slf4j.log4j</artifactId>
                </dependency>
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>com.springsource.slf4j.api</artifactId>
+               </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index d3edb663a4631f55d57c2f2f2ce92a49ae02bd84..e3e0df7a585135316e5016dcb7438e9ac8cf0193 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -2,9 +2,14 @@
 <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</groupId>
+               <artifactId>parent</artifactId>
+               <version>1.0.0</version>
+       </parent>
        <groupId>org.argeo.commons</groupId>
-       <version>0.1.1-SNAPSHOT</version>
        <artifactId>argeo-commons</artifactId>
+       <version>0.1.1-SNAPSHOT</version>
        <name>Argeo Commons</name>
        <packaging>pom</packaging>
        <properties>
@@ -20,10 +25,6 @@
                <developerConnection>scm:svn:https://www.argeo.org/svn/commons/trunk</developerConnection>
                <url>https://www.argeo.org/svn/commons/trunk</url>
        </scm>
-       <issueManagement>
-               <system>Bugzilla</system>
-               <url>https://www.argeo.org/bugzilla/</url>
-       </issueManagement>
        <licenses>
                <license>
                        <name>Apache 2</name>
@@ -49,10 +50,6 @@ limitations under the License.
                        </comments>
                </license>
        </licenses>
-       <organization>
-               <name>Argeo</name>
-               <url>http://www.argeo.org</url>
-       </organization>
        <developers>
                <developer>
                        <id>mbaudier</id>
@@ -184,69 +181,15 @@ limitations under the License.
        <dependencyManagement>
                <dependencies>
                        <dependency>
-                               <groupId>org.argeo.slc</groupId>
-                               <artifactId>argeo-slc</artifactId>
-                               <version>${version.slc}</version>
+                               <groupId>org.argeo.dep</groupId>
+                               <artifactId>versions</artifactId>
+                               <version>1.0.0</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>
                </dependencies>
        </dependencyManagement>
        <repositories>
-               <repository>
-                       <id>central</id>
-                       <url>http://repo1.maven.org/maven2</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>warn</checksumPolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
-               </repository>
-               <repository>
-                       <id>com.springsource.repository.bundles.release</id>
-                       <name>
-                               SpringSource Enterprise Bundle Repository - SpringSource
-                               Bundle Releases
-                       </name>
-                       <url>
-                               http://repository.springsource.com/maven/bundles/release
-                       </url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
-               </repository>
-               <repository>
-                       <id>com.springsource.repository.bundles.external</id>
-                       <name>
-                               SpringSource Enterprise Bundle Repository - External
-                               Bundle Releases
-                       </name>
-                       <url>
-                               http://repository.springsource.com/maven/bundles/external
-                       </url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
-               </repository>
                <repository>
                        <id>argeo</id>
                        <url>http://www.argeo.org/maven/argeo</url>
@@ -261,63 +204,5 @@ limitations under the License.
                                <checksumPolicy>fail</checksumPolicy>
                        </snapshots>
                </repository>
-               <repository>
-                       <id>argeo-snapshots</id>
-                       <url>http://www.argeo.org/maven/argeo-snapshots</url>
-                       <releases>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>true</enabled>
-                               <updatePolicy>always</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
-               </repository>
        </repositories>
-       <pluginRepositories>
-               <pluginRepository>
-                       <id>argeo</id>
-                       <url>http://www.argeo.org/maven/argeo</url>
-                       <releases>
-                               <enabled>true</enabled>
-                               <updatePolicy>daily</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
-               </pluginRepository>
-               <pluginRepository>
-                       <id>argeo-snapshots</id>
-                       <url>http://www.argeo.org/maven/argeo-snapshots</url>
-                       <releases>
-                               <enabled>false</enabled>
-                               <updatePolicy>never</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </releases>
-                       <snapshots>
-                               <enabled>true</enabled>
-                               <updatePolicy>always</updatePolicy>
-                               <checksumPolicy>fail</checksumPolicy>
-                       </snapshots>
-               </pluginRepository>
-       </pluginRepositories>
-       <distributionManagement>
-               <repository>
-                       <uniqueVersion>false</uniqueVersion>
-                       <id>argeo-restricted</id>
-                       <name>Argeo FOSS Repository</name>
-                       <url>file:///var/argeo/maven2/argeo</url>
-               </repository>
-               <snapshotRepository>
-                       <uniqueVersion>true</uniqueVersion>
-                       <id>argeo-snapshots-restricted</id>
-                       <name>Argeo FOSS Snapshots Repository</name>
-                       <url>file:///var/argeo/maven2/argeo-snapshots</url>
-               </snapshotRepository>
-       </distributionManagement>
 </project>
\ No newline at end of file

diff --git a/security/demo/pom.xml b/security/demo/pom.xml
index bc19cb063f5cdb202e0ae2878ab0d680d422c488..8c9dfe992e77d892d67f674c925f46b20f5487a2 100644 (file)
--- a/security/demo/pom.xml
+++ b/security/demo/pom.xml
@@ -20,13 +20,6 @@
                                <extensions>true</extensions>
                                <configuration>
                                        <bundlesPomArtifactId>org.argeo.security.demo</bundlesPomArtifactId>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <version>${version.maven-argeo-osgi}</version>
-                               <configuration>
                                        <execDir>target/exec</execDir>
                                        <osgiBootArtifactId>org.argeo.osgi.boot</osgiBootArtifactId>
                                        <argsToAppend>
@@ -71,173 +64,35 @@
                        <version>0.1.1-SNAPSHOT</version>
                </dependency>
 
-               <!--  Third Parties -->
-
                <!-- OSGi -->
-               <dependency>
-                       <groupId>org.eclipse.osgi</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.commons.osgi</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
                        <version>0.1.1-SNAPSHOT</version>
                </dependency>
 
-               <!-- Logging -->
+               <!--  Commons Dep -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.log4j</groupId>
-                       <artifactId>com.springsource.org.apache.log4j</artifactId>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.dep.tomcat</artifactId>
+                       <version>0.1.1-SNAPSHOT</version>
+                       <type>pom</type>
                </dependency>
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.log4j</artifactId>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.dep.ads</artifactId>
+                       <version>0.1.1-SNAPSHOT</version>
+                       <type>pom</type>
                </dependency>
 
                <!-- Spring -->
-               <dependency>
-                       <groupId>org.springframework.osgi</groupId>
-                       <artifactId>org.springframework.osgi.web.extender</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.springframework.osgi</groupId>
                        <artifactId>org.springframework.osgi.extender</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.springframework.osgi</groupId>
-                       <artifactId>org.springframework.osgi.web</artifactId>
-               </dependency>
-
-               <!-- JEE -->
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.annotation</groupId>
-                       <artifactId>com.springsource.javax.annotation</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.persistence</groupId>
-                       <artifactId>com.springsource.javax.persistence</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.activation</groupId>
-                       <artifactId>com.springsource.javax.activation</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.geronimo.specs</groupId>
-                       <artifactId>com.springsource.javax.management.j2ee</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.ejb</groupId>
-                       <artifactId>com.springsource.javax.ejb</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.rpc</groupId>
-                       <artifactId>com.springsource.javax.xml.rpc</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.soap</groupId>
-                       <artifactId>com.springsource.javax.xml.soap</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.transaction</groupId>
-                       <artifactId>com.springsource.javax.transaction</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.stream</groupId>
-                       <artifactId>com.springsource.javax.xml.stream</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet.jsp</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.el</groupId>
-                       <artifactId>com.springsource.javax.el</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.ws</groupId>
-                       <artifactId>com.springsource.javax.xml.ws</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.bind</groupId>
-                       <artifactId>com.springsource.javax.xml.bind</artifactId>
-               </dependency>
-
-               <!--
-                       Taglibs <dependency> <groupId>org.apache.taglibs</groupId>
-                       <artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
-                       </dependency>
-               -->
-
-
-               <!-- Tomcat -->
-               <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.catalina</groupId>
-                       <artifactId>com.springsource.org.apache.catalina</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.jasper</groupId>
-                       <artifactId>com.springsource.org.apache.jasper</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.el</groupId>
-                       <artifactId>com.springsource.org.apache.el</artifactId>
-               </dependency>
-
-               <!--
-                       ActiveMQ <dependency> <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.activemq</artifactId> </dependency>
-               -->
-
-               <!-- Apache Directory -->
-               <dependency>
-                       <groupId>org.apache.directory</groupId>
-                       <artifactId>com.springsource.org.apache.directory.server.core</artifactId>
-                       <version>1.0.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.directory.shared.asn.codec</artifactId>
-                       <version>0.9.5.5.0001</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.mina.filter.ssl</artifactId>
-                       <version>1.0.2.0001</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.directory</groupId>
-                       <artifactId>com.springsource.org.apache.directory.server.jndi</artifactId>
-                       <version>1.0.2</version>
-               </dependency>
-               <dependency>
-                       <groupId>net.sourceforge.jdbm</groupId>
-                       <artifactId>com.springsource.jdbm</artifactId>
-                       <version>1.0.0</version>
-               </dependency>
-               <!--
-                       TODO: version 2.4.0 is required by Spring-LDAP while Apache Directory
-                       takes 2.1.0
-               -->
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.lang</artifactId>
-                       <version>2.4.0</version>
+                       <artifactId>org.springframework.osgi.web.extender</artifactId>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/server/demo/pom.xml b/server/demo/pom.xml
index 8c80ce2e473a49189cdfaae1e236d481b5934a58..ea5038b48acb4d2a8a49d634c5e8a879b90bf504 100644 (file)
--- a/server/demo/pom.xml
+++ b/server/demo/pom.xml
@@ -16,15 +16,10 @@
                        <plugin>
                                <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
+                               <version>${version.maven-argeo-osgi}</version>
                                <extensions>true</extensions>
                                <configuration>
                                        <bundlesPomArtifactId>org.argeo.server.demo</bundlesPomArtifactId>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <configuration>
                                        <execDir>target/exec/server</execDir>
                                        <osgiBootArtifactId>org.argeo.osgi.boot</osgiBootArtifactId>
                                        <systemProperties>
@@ -44,31 +39,19 @@
                </plugins>
        </build>
        <dependencies>
-               <!--  Third Parties -->
-
                <!-- OSGi -->
-               <dependency>
-                       <groupId>org.eclipse.osgi</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.commons.osgi</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
                        <version>0.1.1-SNAPSHOT</version>
                </dependency>
 
-               <!-- Logging -->
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.org.apache.commons.logging</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.log4j</groupId>
-                       <artifactId>com.springsource.org.apache.log4j</artifactId>
-               </dependency>
+               <!--  Commons Dep -->
                <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>com.springsource.slf4j.log4j</artifactId>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.dep.tomcat</artifactId>
+                       <version>0.1.1-SNAPSHOT</version>
+                       <type>pom</type>
                </dependency>
 
                <!-- Spring -->
@@ -76,105 +59,6 @@
                        <groupId>org.springframework.osgi</groupId>
                        <artifactId>org.springframework.osgi.web.extender</artifactId>
                </dependency>
-               <dependency>
-                       <groupId>org.springframework.osgi</groupId>
-                       <artifactId>org.springframework.osgi.extender</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework.osgi</groupId>
-                       <artifactId>org.springframework.osgi.web</artifactId>
-               </dependency>
-
-               <!-- JEE -->
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.annotation</groupId>
-                       <artifactId>com.springsource.javax.annotation</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.persistence</groupId>
-                       <artifactId>com.springsource.javax.persistence</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.activation</groupId>
-                       <artifactId>com.springsource.javax.activation</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.geronimo.specs</groupId>
-                       <artifactId>com.springsource.javax.management.j2ee</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.ejb</groupId>
-                       <artifactId>com.springsource.javax.ejb</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.rpc</groupId>
-                       <artifactId>com.springsource.javax.xml.rpc</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.soap</groupId>
-                       <artifactId>com.springsource.javax.xml.soap</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.transaction</groupId>
-                       <artifactId>com.springsource.javax.transaction</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.stream</groupId>
-                       <artifactId>com.springsource.javax.xml.stream</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet.jsp</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.el</groupId>
-                       <artifactId>com.springsource.javax.el</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.ws</groupId>
-                       <artifactId>com.springsource.javax.xml.ws</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.bind</groupId>
-                       <artifactId>com.springsource.javax.xml.bind</artifactId>
-               </dependency>
-
-               <!-- Taglibs
-               <dependency>
-                       <groupId>org.apache.taglibs</groupId>
-                       <artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
-               </dependency> -->
-
-
-               <!-- Tomcat -->
-               <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.catalina</groupId>
-                       <artifactId>com.springsource.org.apache.catalina</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.jasper</groupId>
-                       <artifactId>com.springsource.org.apache.jasper</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.el</groupId>
-                       <artifactId>com.springsource.org.apache.el</artifactId>
-               </dependency>
 
-               <!--
-                       ActiveMQ <dependency> <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.activemq</artifactId> </dependency>
-               -->
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/server/dep/org.argeo.server.dep.ads/pom.xml b/server/dep/org.argeo.server.dep.ads/pom.xml
new file mode 100644 (file)
index 0000000..69ddfa7
--- /dev/null
+++ b/server/dep/org.argeo.server.dep.ads/pom.xml
@@ -0,0 +1,58 @@
+<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.server</groupId>
+               <version>0.1.1-SNAPSHOT</version>
+               <artifactId>dep</artifactId>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.server.dep.ads</artifactId>
+       <packaging>pom</packaging>
+       <name>Apache Directory Server</name>
+       <dependencies>
+               <!--  Commons Dep -->
+               <dependency>
+                       <groupId>org.argeo.commons.basic</groupId>
+                       <artifactId>org.argeo.basic.dep.log4j</artifactId>
+                       <version>0.1.1-SNAPSHOT</version>
+                       <type>pom</type>
+               </dependency>
+
+               <!-- Apache Directory -->
+               <dependency>
+                       <groupId>org.apache.directory</groupId>
+                       <artifactId>com.springsource.org.apache.directory.server.core</artifactId>
+                       <version>1.0.2</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.directory.shared.asn.codec</artifactId>
+                       <version>0.9.5.5.0001</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.argeo.dep.osgi</groupId>
+                       <artifactId>org.argeo.dep.osgi.mina.filter.ssl</artifactId>
+                       <version>1.0.2.0001</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.directory</groupId>
+                       <artifactId>com.springsource.org.apache.directory.server.jndi</artifactId>
+                       <version>1.0.2</version>
+               </dependency>
+               <dependency>
+                       <groupId>net.sourceforge.jdbm</groupId>
+                       <artifactId>com.springsource.jdbm</artifactId>
+                       <version>1.0.0</version>
+               </dependency>
+               <!--
+                       TODO: version 2.4.0 is required by Spring-LDAP while Apache Directory
+                       takes 2.1.0
+               -->
+               <dependency>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>com.springsource.org.apache.commons.lang</artifactId>
+                       <version>2.4.0</version>
+               </dependency>
+       </dependencies>
+</project>
\ No newline at end of file

diff --git a/server/dep/org.argeo.server.dep.tomcat/pom.xml b/server/dep/org.argeo.server.dep.tomcat/pom.xml
index 14fc2bfab21c4a0906a5dbf01d520d9329f55969..261d241c2e9c0e2c1225ccdb8f597825bb35d163 100644 (file)
--- a/server/dep/org.argeo.server.dep.tomcat/pom.xml
+++ b/server/dep/org.argeo.server.dep.tomcat/pom.xml
@@ -16,6 +16,7 @@
                        <groupId>org.argeo.commons.basic</groupId>
                        <artifactId>org.argeo.basic.dep.log4j</artifactId>
                        <version>0.1.1-SNAPSHOT</version>
+                       <type>pom</type>
                </dependency>
 
                <!-- JEE -->

diff --git a/server/dep/pom.xml b/server/dep/pom.xml
index b97eb1938cc678012ebcedc487747d6859f1fa7a..31d38c9a4864bda23715e8a93b6b68c63779df41 100644 (file)
--- a/server/dep/pom.xml
+++ b/server/dep/pom.xml
@@ -14,5 +14,6 @@
        <packaging>pom</packaging>
        <modules>
                <module>org.argeo.server.dep.tomcat</module>
+               <module>org.argeo.server.dep.ads</module>
        </modules>
 </project>
\ No newline at end of file