merging in to milestones from trunk
git-svn-id: https://svn.apache.org/repos/asf/directory/shared/branches/milestones@1079425 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/all/pom.xml b/all/pom.xml
index ee8ca5c..a829088 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -31,54 +31,76 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-i18n</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>shared-asn1-api</artifactId>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>shared-asn1-ber</artifactId>
</dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-client-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-model</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-schema-data</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-schema-converter</artifactId>
- </dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>shared-dsml-engine</artifactId>
</dependency>
-
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>shared-dsml-parser</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-i18n</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-client-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-codec-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-codec-standalone</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-extras-aci</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-extras-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-extras-codec-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-extras-sp</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-extras-trigger</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-extras-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-net-mina</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-schema-converter</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-schema-data</artifactId>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>shared-util</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 72381a6..8b358aa 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -52,11 +52,15 @@
<goal>copy</goal>
</goals>
<configuration>
+ <outputDirectory>${project.build.directory}/additional-jars</outputDirectory>
<artifactItems>
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <outputDirectory>${project.build.directory}/additional-jars</outputDirectory>
+ </artifactItem>
+ <artifactItem>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</artifactItem>
</artifactItems>
</configuration>
diff --git a/distribution/src/main/release/NOTICE b/distribution/src/main/release/NOTICE
index 9a6d5ff..9dd67af 100644
--- a/distribution/src/main/release/NOTICE
+++ b/distribution/src/main/release/NOTICE
@@ -5,6 +5,6 @@
The Apache Software Foundation (http://www.apache.org/).
Additional copyright notices and license terms applicable are
-present in the distribution/src/main/release/licenses or
-licenses directory.
+present in the 'distribution/src/main/release/licenses' or
+'licenses' directory.
diff --git a/pom.xml b/pom.xml
index 44c4ad4..0d78cbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -362,12 +362,6 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-util</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>shared-asn1-api</artifactId>
<version>${project.version}</version>
</dependency>
@@ -389,82 +383,94 @@
<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-model</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-codec-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-net-mina</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-codec-standalone</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-extras-codec</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-extras-codec-api</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-extras-aci</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-extras-trigger</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-extras-util</artifactId>
- <version>${project.version}</version>
- </dependency>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>shared-ldap-client-api</artifactId>
<version>${project.version}</version>
</dependency>
-
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-codec-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-codec-standalone</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-extras-aci</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-extras-codec</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-extras-codec-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-extras-sp</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-extras-trigger</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-extras-util</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-model</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-net-mina</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>shared-ldap-schema-converter</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>shared-ldap-schema-data</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>shared-ldap-schema-converter</artifactId>
+ <artifactId>shared-util</artifactId>
<version>${project.version}</version>
</dependency>
