You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/06/02 16:10:37 UTC
svn commit: r950570 - in /directory/shared/trunk: ./ all/ asn1-codec/ asn1/
cursor/ dsml-parser/ i18n/ ldap-constants/ ldap-convert/ ldap-jndi/
ldap-ldif/ ldap-schema-loader/ ldap-schema-manager/ ldap-schema/ ldap/
Author: pamarcelot
Date: Wed Jun 2 14:10:36 2010
New Revision: 950570
URL: http://svn.apache.org/viewvc?rev=950570&view=rev
Log:
Cleaning in pom.xml files:
o Removed versions from the pom.xml files of sub-modules
o Declared a dependency management for each sub-module
o Removed unnecessary tags
Modified:
directory/shared/trunk/all/pom.xml
directory/shared/trunk/asn1-codec/pom.xml
directory/shared/trunk/asn1/pom.xml
directory/shared/trunk/cursor/pom.xml
directory/shared/trunk/dsml-parser/pom.xml
directory/shared/trunk/i18n/pom.xml
directory/shared/trunk/ldap-constants/pom.xml
directory/shared/trunk/ldap-convert/pom.xml
directory/shared/trunk/ldap-jndi/pom.xml
directory/shared/trunk/ldap-ldif/pom.xml
directory/shared/trunk/ldap-schema-loader/pom.xml
directory/shared/trunk/ldap-schema-manager/pom.xml
directory/shared/trunk/ldap-schema/pom.xml
directory/shared/trunk/ldap/pom.xml
directory/shared/trunk/pom.xml
Modified: directory/shared/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/all/pom.xml?rev=950570&r1=950569&r2=950570&view=diff
==============================================================================
--- directory/shared/trunk/all/pom.xml (original)
+++ directory/shared/trunk/all/pom.xml Wed Jun 2 14:10:36 2010
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>
@@ -29,85 +27,71 @@
<artifactId>shared-all</artifactId>
<name>Apache Directory Shared All</name>
- <packaging>jar</packaging>
<dependencies>
<dependency>
- <artifactId>shared-asn1</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-asn1</artifactId>
</dependency>
<dependency>
- <artifactId>shared-asn1-codec</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-asn1-codec</artifactId>
</dependency>
<dependency>
- <artifactId>shared-cursor</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-cursor</artifactId>
</dependency>
<dependency>
- <artifactId>shared-dsml-parser</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-dsml-parser</artifactId>
</dependency>
<dependency>
- <artifactId>shared-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-i18n</artifactId>
</dependency>
<dependency>
- <artifactId>shared-ldap</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-ldap</artifactId>
</dependency>
<dependency>
- <artifactId>shared-ldap-constants</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-ldap-constants</artifactId>
</dependency>
<dependency>
- <artifactId>shared-ldap-converter</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-ldap-converter</artifactId>
</dependency>
<dependency>
- <artifactId>shared-ldap-jndi</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-ldap-jndi</artifactId>
</dependency>
<dependency>
- <artifactId>shared-ldap-schema</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-ldap-schema</artifactId>
</dependency>
<dependency>
- <artifactId>shared-ldap-schema-loader</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-ldap-schema-loader</artifactId>
</dependency>
<dependency>
- <artifactId>shared-ldap-schema-manager</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-ldap-schema-manager</artifactId>
</dependency>
<dependency>
- <artifactId>shared-ldif</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-ldif</artifactId>
</dependency>
</dependencies>
Modified: directory/shared/trunk/asn1-codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1-codec/pom.xml?rev=950570&r1=950569&r2=950570&view=diff
==============================================================================
--- directory/shared/trunk/asn1-codec/pom.xml (original)
+++ directory/shared/trunk/asn1-codec/pom.xml Wed Jun 2 14:10:36 2010
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>
@@ -29,28 +27,21 @@
<artifactId>shared-asn1-codec</artifactId>
<name>Apache Directory Shared ASN.1 Codec</name>
- <packaging>jar</packaging>
<dependencies>
-
-
<dependency>
- <artifactId>shared-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-asn1</artifactId>
</dependency>
-
+
<dependency>
- <artifactId>shared-asn1</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-i18n</artifactId>
</dependency>
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
- <version>${mina.core.version}</version>
</dependency>
</dependencies>
</project>
-
Modified: directory/shared/trunk/asn1/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/pom.xml?rev=950570&r1=950569&r2=950570&view=diff
==============================================================================
--- directory/shared/trunk/asn1/pom.xml (original)
+++ directory/shared/trunk/asn1/pom.xml Wed Jun 2 14:10:36 2010
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>
@@ -29,14 +27,11 @@
<artifactId>shared-asn1</artifactId>
<name>Apache Directory Shared ASN.1</name>
- <packaging>jar</packaging>
<dependencies>
<dependency>
- <artifactId>shared-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-i18n</artifactId>
</dependency>
</dependencies>
</project>
-
Modified: directory/shared/trunk/cursor/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/cursor/pom.xml?rev=950570&r1=950569&r2=950570&view=diff
==============================================================================
--- directory/shared/trunk/cursor/pom.xml (original)
+++ directory/shared/trunk/cursor/pom.xml Wed Jun 2 14:10:36 2010
@@ -15,7 +15,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- $Rev: $ $Date: $ -->
<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>
@@ -27,18 +26,12 @@
<artifactId>shared-cursor</artifactId>
<name>Apache Directory Shared Cursor</name>
- <description>
- Shared Cursor interfaces.
- </description>
-
- <packaging>jar</packaging>
+ <description>Shared Cursor interfaces</description>
<dependencies>
<dependency>
- <artifactId>shared-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-i18n</artifactId>
</dependency>
</dependencies>
</project>
-
Modified: directory/shared/trunk/dsml-parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/pom.xml?rev=950570&r1=950569&r2=950570&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/pom.xml (original)
+++ directory/shared/trunk/dsml-parser/pom.xml Wed Jun 2 14:10:36 2010
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>
@@ -29,58 +27,47 @@
<artifactId>shared-dsml-parser</artifactId>
<name>Apache Directory Shared DSML Parser</name>
- <packaging>jar</packaging>
-
- <description />
- <dependencies>
+ <dependencies>
<dependency>
- <artifactId>shared-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-asn1</artifactId>
</dependency>
<dependency>
- <artifactId>shared-asn1</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-i18n</artifactId>
</dependency>
<dependency>
- <artifactId>shared-ldap</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-ldap</artifactId>
</dependency>
<dependency>
- <artifactId>shared-ldif</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-ldif</artifactId>
</dependency>
<dependency>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
- <version>${dom4j.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
- <version>${xml.apis.version}</version>
</dependency>
<dependency>
<groupId>xpp3</groupId>
<artifactId>xpp3</artifactId>
- <version>${xpp3.version}</version>
- </dependency>
-
- <dependency>
- <groupId>findbugs</groupId>
- <artifactId>annotations</artifactId>
- <version>${findbugs.annotations.version}</version>
- <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified: directory/shared/trunk/i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/i18n/pom.xml?rev=950570&r1=950569&r2=950570&view=diff
==============================================================================
--- directory/shared/trunk/i18n/pom.xml (original)
+++ directory/shared/trunk/i18n/pom.xml Wed Jun 2 14:10:36 2010
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>
@@ -26,6 +24,7 @@
<artifactId>shared-parent</artifactId>
<version>0.9.20-SNAPSHOT</version>
</parent>
+
<artifactId>shared-i18n</artifactId>
<name>Apache Directory Shared I18n</name>
@@ -42,4 +41,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: directory/shared/trunk/ldap-constants/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-constants/pom.xml?rev=950570&r1=950569&r2=950570&view=diff
==============================================================================
--- directory/shared/trunk/ldap-constants/pom.xml (original)
+++ directory/shared/trunk/ldap-constants/pom.xml Wed Jun 2 14:10:36 2010
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>
@@ -29,23 +27,13 @@
<artifactId>shared-ldap-constants</artifactId>
<name>Apache Directory Shared LDAP Constants</name>
- <inceptionYear>2007</inceptionYear>
-
- <issueManagement>
- <system>jira</system>
- <url>http://issues.apache.org/jira/browse/DIRSERVER</url>
- </issueManagement>
- <description>
- Common LDAP constants used by clients and servers.
- </description>
+ <description>Common LDAP constants used by clients and servers</description>
<dependencies>
<dependency>
- <artifactId>shared-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-i18n</artifactId>
</dependency>
</dependencies>
</project>
-
Modified: directory/shared/trunk/ldap-convert/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-convert/pom.xml?rev=950570&r1=950569&r2=950570&view=diff
==============================================================================
--- directory/shared/trunk/ldap-convert/pom.xml (original)
+++ directory/shared/trunk/ldap-convert/pom.xml Wed Jun 2 14:10:36 2010
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>
@@ -29,40 +27,23 @@
<artifactId>shared-ldap-converter</artifactId>
<name>Apache Directory Shared LDAP Converters</name>
- <inceptionYear>2007</inceptionYear>
- <issueManagement>
- <system>jira</system>
- <url>http://issues.apache.org/jira/browse/DIRSERVER</url>
- </issueManagement>
-
- <description>
- Common LDAP converters : LDIF, DSML, CSV, etc
- </description>
+ <description>Common LDAP converters : LDIF, DSML, CSV, etc</description>
<dependencies>
<dependency>
- <artifactId>shared-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
+ <artifactId>shared-i18n</artifactId>
+ </dependency>
<dependency>
- <artifactId>shared-ldif</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<artifactId>shared-ldap</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
</dependency>
-
+
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons.lang.version}</version>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldif</artifactId>
</dependency>
<dependency>
@@ -70,6 +51,11 @@
<artifactId>antlr</artifactId>
<version>${antlr.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -115,4 +101,3 @@
</plugins>
</build>
</project>
-
Modified: directory/shared/trunk/ldap-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-jndi/pom.xml?rev=950570&r1=950569&r2=950570&view=diff
==============================================================================
--- directory/shared/trunk/ldap-jndi/pom.xml (original)
+++ directory/shared/trunk/ldap-jndi/pom.xml Wed Jun 2 14:10:36 2010
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>
@@ -29,19 +27,14 @@
<artifactId>shared-ldap-jndi</artifactId>
<name>Apache Directory Shared JNDI</name>
- <packaging>jar</packaging>
- <description>
- Shared libraries for client side JNDI handling that may be used
- both in the server and in studio.
- </description>
+ <description>Shared libraries for client side JNDI handling that may be used
+ both in the server and in studio</description>
<dependencies>
<dependency>
- <artifactId>shared-ldap</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-ldap</artifactId>
</dependency>
</dependencies>
</project>
-
Modified: directory/shared/trunk/ldap-ldif/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-ldif/pom.xml?rev=950570&r1=950569&r2=950570&view=diff
==============================================================================
--- directory/shared/trunk/ldap-ldif/pom.xml (original)
+++ directory/shared/trunk/ldap-ldif/pom.xml Wed Jun 2 14:10:36 2010
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>
@@ -29,34 +27,23 @@
<artifactId>shared-ldif</artifactId>
<name>Apache Directory Shared LDIF</name>
- <inceptionYear>2010</inceptionYear>
- <issueManagement>
- <system>jira</system>
- <url>http://issues.apache.org/jira/browse/DIRSHARED</url>
- </issueManagement>
-
- <description>
- Common LDIF packages used by clients and servers.
- </description>
+ <description>Common LDIF packages used by clients and servers</description>
<dependencies>
<dependency>
- <artifactId>shared-asn1</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-asn1</artifactId>
</dependency>
<dependency>
- <artifactId>shared-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-i18n</artifactId>
</dependency>
<dependency>
- <artifactId>shared-ldap</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-ldap</artifactId>
</dependency>
</dependencies>
@@ -87,4 +74,3 @@
</plugins>
</build>
</project>
-
Modified: directory/shared/trunk/ldap-schema-loader/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema-loader/pom.xml?rev=950570&r1=950569&r2=950570&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema-loader/pom.xml (original)
+++ directory/shared/trunk/ldap-schema-loader/pom.xml Wed Jun 2 14:10:36 2010
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>
@@ -29,7 +27,6 @@
<artifactId>shared-ldap-schema-loader</artifactId>
<name>Apache Directory Shared LDAP Schema Loader</name>
- <packaging>jar</packaging>
<description>
Initial schema loader used during server bootstrapping and client startup
@@ -38,34 +35,29 @@
<dependencies>
<dependency>
- <artifactId>shared-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-asn1</artifactId>
</dependency>
-
+
<dependency>
- <artifactId>shared-asn1</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-i18n</artifactId>
</dependency>
<dependency>
- <artifactId>shared-ldap</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-ldap</artifactId>
</dependency>
<dependency>
- <artifactId>shared-ldif</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
+ <artifactId>shared-ldap-schema</artifactId>
+ </dependency>
<dependency>
- <artifactId>shared-ldap-schema</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
+ <artifactId>shared-ldif</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: directory/shared/trunk/ldap-schema-manager/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema-manager/pom.xml?rev=950570&r1=950569&r2=950570&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema-manager/pom.xml (original)
+++ directory/shared/trunk/ldap-schema-manager/pom.xml Wed Jun 2 14:10:36 2010
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>
@@ -29,42 +27,34 @@
<artifactId>shared-ldap-schema-manager</artifactId>
<name>Apache Directory Shared LDAP Schema Manager</name>
- <packaging>jar</packaging>
- <description>
- SchemaManager implementation bundle.
- </description>
+ <description>SchemaManager implementation bundle</description>
<dependencies>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- <scope>test</scope>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-i18n</artifactId>
</dependency>
<dependency>
- <artifactId>shared-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
+ <artifactId>shared-ldap</artifactId>
+ </dependency>
<dependency>
- <artifactId>shared-ldap-schema-loader</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<artifactId>shared-ldap-schema</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
</dependency>
<dependency>
- <artifactId>shared-ldap</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-ldap-schema-loader</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: directory/shared/trunk/ldap-schema/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap-schema/pom.xml?rev=950570&r1=950569&r2=950570&view=diff
==============================================================================
--- directory/shared/trunk/ldap-schema/pom.xml (original)
+++ directory/shared/trunk/ldap-schema/pom.xml Wed Jun 2 14:10:36 2010
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>
@@ -29,7 +27,6 @@
<artifactId>shared-ldap-schema</artifactId>
<name>Apache Directory Shared LDAP Schema</name>
- <packaging>jar</packaging>
<description>
Jar bundled LDIF files containing schema data using the Apache Directory
@@ -39,34 +36,25 @@
<dependencies>
<dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>${commons.io.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <artifactId>shared-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
+ <artifactId>shared-i18n</artifactId>
+ </dependency>
<dependency>
- <artifactId>shared-ldap</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-ldap</artifactId>
</dependency>
<dependency>
- <artifactId>shared-ldif</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
-
+ <artifactId>shared-ldif</artifactId>
+ </dependency>
+
<dependency>
- <artifactId>shared-asn1</artifactId>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>${commons.io.version}</version>
+ <scope>test</scope>
</dependency>
</dependencies>
Modified: directory/shared/trunk/ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/pom.xml?rev=950570&r1=950569&r2=950570&view=diff
==============================================================================
--- directory/shared/trunk/ldap/pom.xml (original)
+++ directory/shared/trunk/ldap/pom.xml Wed Jun 2 14:10:36 2010
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -18,7 +17,6 @@
specific language governing permissions and limitations
under the License.
-->
-
<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>
@@ -29,58 +27,43 @@
<artifactId>shared-ldap</artifactId>
<name>Apache Directory Shared LDAP</name>
- <inceptionYear>2004</inceptionYear>
- <issueManagement>
- <system>jira</system>
- <url>http://issues.apache.org/jira/browse/DIRSERVER</url>
- </issueManagement>
-
- <description>
- Common LDAP packages used by clients and servers.
- </description>
+ <description>Common LDAP packages used by clients and servers</description>
<dependencies>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${commons.lang.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>${commons.collections.version}</version>
- </dependency>
-
- <dependency>
- <artifactId>shared-asn1</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
+ <artifactId>shared-asn1</artifactId>
</dependency>
<dependency>
- <artifactId>shared-ldap-constants</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
+ <artifactId>shared-i18n</artifactId>
+ </dependency>
<dependency>
- <artifactId>shared-i18n</artifactId>
<groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- </dependency>
+ <artifactId>shared-ldap-constants</artifactId>
+ </dependency>
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
- <version>${antlr.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
</dependency>
<dependency>
<groupId>findbugs</groupId>
<artifactId>annotations</artifactId>
- <version>${findbugs.annotations.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
@@ -127,4 +110,3 @@
</plugins>
</build>
</project>
-
Modified: directory/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/pom.xml?rev=950570&r1=950569&r2=950570&view=diff
==============================================================================
--- directory/shared/trunk/pom.xml (original)
+++ directory/shared/trunk/pom.xml Wed Jun 2 14:10:36 2010
@@ -34,11 +34,13 @@
<properties>
<projectName>ApacheDS-Shared</projectName>
<distMgmtSiteUrl>scpexe://people.apache.org/www/directory.apache.org/shared/gen-docs/${version}/</distMgmtSiteUrl>
+
+ <!-- Set versions for depending projects -->
<skin.version>1.0.1</skin.version>
<org.apache.directory.shared.version>0.9.20-SNAPSHOT</org.apache.directory.shared.version>
<org.apache.directory.buildtools.directory-checkstyle.version>0.1-SNAPSHOT</org.apache.directory.buildtools.directory-checkstyle.version>
- <!-- Jar's version -->
+ <!-- Set versions for depending jars -->
<antlr.version>2.7.7</antlr.version>
<commons.collections.version>3.2.1</commons.collections.version>
<commons.io.version>1.4</commons.io.version>
@@ -102,6 +104,95 @@
<dependencyManagement>
<dependencies>
+ <!-- Project sub-modules dependencies -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-asn1</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-asn1-codec</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-cursor</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-dsml-parser</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-i18n</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-constants</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-converter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-jndi</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-schema</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-schema-loader</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-schema-manager</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldif</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <!-- Mina dependencies -->
+
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>${mina.core.version}</version>
+ </dependency>
+
+ <!-- Commons dependencies -->
+
<dependency>
<groupId>commons-collections</groupId>
<artifactId>commons-collections</artifactId>
@@ -121,6 +212,14 @@
</dependency>
<dependency>
+ <groupId>commons-pool</groupId>
+ <artifactId>commons-pool</artifactId>
+ <version>${commons.pool.version}</version>
+ </dependency>
+
+ <!-- Logging dependencies -->
+
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.api.version}</version>
@@ -137,35 +236,37 @@
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
</dependency>
-
- <dependency>
- <groupId>commons-pool</groupId>
- <artifactId>commons-pool</artifactId>
- <version>${commons.pool.version}</version>
- </dependency>
+
+ <!-- Other dependencies -->
<dependency>
<groupId>antlr</groupId>
<artifactId>antlr</artifactId>
<version>${antlr.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>${dom4j.version}</version>
+ </dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
+ <groupId>findbugs</groupId>
+ <artifactId>annotations</artifactId>
+ <version>${findbugs.annotations.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.mina</groupId>
- <artifactId>mina-core</artifactId>
- <version>${mina.core.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
</dependency>
<dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>${dom4j.version}</version>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml.apis.version}</version>
</dependency>
<dependency>