Return-Path: <commits-return-48525-archive-asf-public=cust-asf.ponee.io@directory.apache.org>
X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io
Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io
Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183])
	by cust-asf2.ponee.io (Postfix) with ESMTP id 9D24A200CF1
	for <archive-asf-public-internal@cust-asf2.ponee.io>; Mon, 14 Aug 2017 00:24:29 +0200 (CEST)
Received: by cust-asf.ponee.io (Postfix)
	id 9B7BB16405C; Sun, 13 Aug 2017 22:24:29 +0000 (UTC)
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by cust-asf.ponee.io (Postfix) with SMTP id 2681B164054
	for <archive-asf-public@cust-asf.ponee.io>; Mon, 14 Aug 2017 00:24:26 +0200 (CEST)
Received: (qmail 95070 invoked by uid 500); 13 Aug 2017 22:24:26 -0000
Mailing-List: contact commits-help@directory.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@directory.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@directory.apache.org>
List-Post: <mailto:commits@directory.apache.org>
List-Id: <commits.directory.apache.org>
Reply-To: dev@directory.apache.org
Delivered-To: mailing list commits@directory.apache.org
Received: (qmail 95059 invoked by uid 99); 13 Aug 2017 22:24:26 -0000
Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 Aug 2017 22:24:26 +0000
Received: from svn01-us-west.apache.org (localhost [127.0.0.1])
	by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id CF6933A1ECA
	for <commits@directory.apache.org>; Sun, 13 Aug 2017 22:24:23 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1804948 [2/3] - in /directory/apacheds/branches/apacheds-value:
 ./ all/ apache-felix/ core-annotations/ core-api/ core-avl/ core-constants/
 core-integ/ core-jndi/ core-shared/ core/ http-directory-bridge/
 http-integration/ i18n/ installers...
Date: Sun, 13 Aug 2017 22:24:20 -0000
To: commits@directory.apache.org
From: elecharny@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20170813222423.CF6933A1ECA@svn01-us-west.apache.org>
archived-at: Sun, 13 Aug 2017 22:24:29 -0000

Modified: directory/apacheds/branches/apacheds-value/interceptors/schema/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/schema/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/schema/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/schema/pom.xml Sun Aug 13 22:24:19 2017
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-interceptors-schema</artifactId>
@@ -125,8 +125,38 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.interceptors.schema</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+                org.apache.directory.server.core.schema;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                org.apache.directory.api.i18n;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.constants;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.csn;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.cursor;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.entry;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.filter;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.ldif;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.message;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.message.controls;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.name;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema.parsers;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema.registries;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema.syntaxCheckers;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.schema.extractor;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.schema.extractor.impl;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util;version=${org.apache.directory.api.version},
+                org.apache.directory.server.core.api;version=${project.version},
+                org.apache.directory.server.core.api.entry;version=${project.version},
+                org.apache.directory.server.core.api.filtering;version=${project.version},
+                org.apache.directory.server.core.api.interceptor;version=${project.version},
+                org.apache.directory.server.core.api.interceptor.context;version=${project.version},
+                org.apache.directory.server.core.api.partition;version=${project.version},
+                org.apache.directory.server.core.api.schema;version=${project.version},
+                org.apache.directory.server.core.shared;version=${project.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/interceptors/subtree/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/subtree/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/subtree/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/subtree/pom.xml Sun Aug 13 22:24:19 2017
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-interceptors-subtree</artifactId>
@@ -130,8 +130,31 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.interceptors.subtree</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+                org.apache.directory.server.core.subtree;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                javax.naming.directory,
+                org.apache.directory.api.ldap.codec.controls.search.subentries;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.constants;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.entry;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.filter;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.message;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.message.controls;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.name;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.subtree;version=${org.apache.directory.api.version},
+                org.apache.directory.server.constants;version=${project.version},
+                org.apache.directory.server.core.api;version=${project.version},
+                org.apache.directory.server.core.api.entry;version=${project.version},
+                org.apache.directory.server.core.api.filtering;version=${project.version},
+                org.apache.directory.server.core.api.interceptor;version=${project.version},
+                org.apache.directory.server.core.api.interceptor.context;version=${project.version},
+                org.apache.directory.server.core.api.partition;version=${project.version},
+                org.apache.directory.server.core.api.subtree;version=${project.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/interceptors/trigger/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/interceptors/trigger/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/interceptors/trigger/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/interceptors/trigger/pom.xml Sun Aug 13 22:24:19 2017
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-interceptors</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-interceptors-trigger</artifactId>
@@ -109,8 +109,32 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.interceptors.trigger</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+                org.apache.directory.server.core.trigger;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                javax.naming.directory,
+                org.apache.directory.api.ldap.model.constants;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.entry;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.filter;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.message;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.name;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema.normalizers;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.trigger;version=${org.apache.directory.api.version},
+                org.apache.directory.server.constants;version=${project.version},
+                org.apache.directory.server.core.api;version=${project.version},
+                org.apache.directory.server.core.api.entry;version=${project.version},
+                org.apache.directory.server.core.api.filtering;version=${project.version},
+                org.apache.directory.server.core.api.interceptor;version=${project.version},
+                org.apache.directory.server.core.api.interceptor.context;version=${project.version},
+                org.apache.directory.server.core.api.partition;version=${project.version},
+                org.apache.directory.server.core.api.sp;version=${project.version},
+                org.apache.directory.server.core.api.sp.java;version=${project.version},
+                org.apache.directory.server.core.api.subtree;version=${project.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/jdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/jdbm-partition/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/jdbm-partition/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/jdbm-partition/pom.xml Sun Aug 13 22:24:19 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-jdbm-partition</artifactId>
@@ -143,8 +143,37 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.jdbm.partition</Bundle-SymbolicName>
             <Export-Package>
-                org.apache.directory.server.core.partition.impl.btree.jdbm;version=${project.version};-noimport:=true
+                org.apache.directory.server.core.partition.impl.btree.jdbm;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                jdbm,
+                jdbm.btree,
+                jdbm.helper,
+                jdbm.recman,
+                net.sf.ehcache;version=${ehcache.version},
+                org.apache.directory.api.ldap.model.constants;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.csn;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.cursor;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.entry;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.message;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.name;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema.comparators;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.server.constants;version=${project.version},
+                org.apache.directory.server.core.api;version=${project.version},
+                org.apache.directory.server.core.api.entry;version=${project.version},
+                org.apache.directory.server.core.api.interceptor.context;version=${project.version},
+                org.apache.directory.server.core.api.partition;version=${project.version},
+                org.apache.directory.server.core.avltree;version=${project.version},
+                org.apache.directory.server.core.partition.impl.btree;version=${project.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.apache.directory.server.xdbm;version=${project.version},
+                org.apache.directory.server.xdbm.search.impl;version=${project.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/kerberos-client/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/kerberos-client/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/kerberos-client/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/kerberos-client/pom.xml Sun Aug 13 22:24:19 2017
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   <artifactId>kerberos-client</artifactId>
   <name>kerberos-client</name>

Modified: directory/apacheds/branches/apacheds-value/kerberos-codec/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/kerberos-codec/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/kerberos-codec/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/kerberos-codec/pom.xml Sun Aug 13 22:24:19 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-kerberos-codec</artifactId>
@@ -111,8 +111,45 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.kerberos.codec</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+                org.apache.directory.shared.kerberos;version=${project.version},
+                org.apache.directory.server.kerberos.changepwd.exceptions;version=${project.version},
+                org.apache.directory.server.kerberos.changepwd.io;version=${project.version},
+                org.apache.directory.server.kerberos.changepwd.messages;version=${project.version},
+                org.apache.directory.shared.kerberos.codec;version=${project.version},
+                org.apache.directory.shared.kerberos.codec.changePwdData;version=${project.version},
+                org.apache.directory.shared.kerberos.codec.options;version=${project.version},
+                org.apache.directory.shared.kerberos.codec.types;version=${project.version},
+                org.apache.directory.shared.kerberos.components;version=${project.version},
+                org.apache.directory.shared.kerberos.crypto.checksum;version=${project.version},
+                org.apache.directory.shared.kerberos.exceptions;version=${project.version},
+                org.apache.directory.shared.kerberos.flags;version=${project.version},
+                org.apache.directory.shared.kerberos.messages;version=${project.version},
+                org.apache.directory.server.kerberos.shared.crypto.checksum;version=${project.version},
+                org.apache.directory.server.kerberos.shared.crypto.encryption;version=${project.version},
+                org.apache.directory.server.kerberos.shared.keytab;version=${project.version},
+                org.apache.directory.server.kerberos.shared.replay;version=${project.version},
+                org.apache.directory.server.kerberos.shared.store;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                javax.crypto,
+                javax.crypto.spec,
+                javax.security.auth.kerberos,
+                net.sf.ehcache;version=${ehcache.version},
+                net.sf.ehcache.store;version=${ehcache.version},
+                org.apache.directory.api.asn1;version=${org.apache.directory.api.version},
+                org.apache.directory.api.asn1.actions;version=${org.apache.directory.api.version},
+                org.apache.directory.api.asn1.ber;version=${org.apache.directory.api.version},
+                org.apache.directory.api.asn1.ber.grammar;version=${org.apache.directory.api.version},
+                org.apache.directory.api.asn1.ber.tlv;version=${org.apache.directory.api.version},
+                org.apache.directory.api.asn1.util;version=${org.apache.directory.api.version},
+                org.apache.directory.api.i18n;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.constants;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.entry;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util;version=${org.apache.directory.api.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/kerberos-test/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/kerberos-test/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/kerberos-test/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/kerberos-test/pom.xml Sun Aug 13 22:24:19 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-kerberos-test</artifactId>

Modified: directory/apacheds/branches/apacheds-value/ldap-client-test/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/ldap-client-test/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/ldap-client-test/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/ldap-client-test/pom.xml Sun Aug 13 22:24:19 2017
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
 
   <artifactId>ldap-client-test</artifactId>

Modified: directory/apacheds/branches/apacheds-value/ldif-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/ldif-partition/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/ldif-partition/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/ldif-partition/pom.xml Sun Aug 13 22:24:19 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-ldif-partition</artifactId>
@@ -112,8 +112,28 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.ldif.partition</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+                org.apache.directory.server.core.partition.ldif;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                javax.naming,
+                org.apache.directory.api.ldap.model.constants;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.csn;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.cursor;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.entry;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.ldif;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.name;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util;version=${org.apache.directory.api.version},
+                org.apache.directory.server.core.api;version=${project.version},
+                org.apache.directory.server.core.api.interceptor.context;version=${project.version},
+                org.apache.directory.server.core.api.partition;version=${project.version},
+                org.apache.directory.server.core.partition.impl.avl;version=${project.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.apache.directory.server.xdbm;version=${project.version},
+                org.apache.directory.server.xdbm.search.cursor;version=${project.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/mavibot-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/mavibot-partition/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/mavibot-partition/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/mavibot-partition/pom.xml Sun Aug 13 22:24:19 2017
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   <artifactId>apacheds-mavibot-partition</artifactId>
   <name>ApacheDS Mavibot Partition</name>
@@ -135,8 +135,36 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.mavibot.partition</Bundle-SymbolicName>
             <Export-Package>
-                org.apache.directory.server.core.partition.impl.btree.mavibot;version=${project.version};-noimport:=true
+                org.apache.directory.server.core.partition.impl.btree.mavibot;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                net.sf.ehcache;version=${ehcache.version},
+                org.apache.directory.api.ldap.model.constants;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.cursor;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.entry;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.ldif;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.name;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema.comparators;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.mavibot.btree;version=${org.apache.directory.mavibot.version},
+                org.apache.directory.mavibot.btree.exception;version=${org.apache.directory.mavibot.version},
+                org.apache.directory.mavibot.btree.serializer;version=${org.apache.directory.mavibot.version},
+                org.apache.directory.mavibot.btree.util;version=${org.apache.directory.mavibot.version},
+                org.apache.directory.server.constants;version=${project.version},
+                org.apache.directory.server.core.api;version=${project.version},
+                org.apache.directory.server.core.api.entry;version=${project.version},
+                org.apache.directory.server.core.api.interceptor.context;version=${project.version},
+                org.apache.directory.server.core.api.partition;version=${project.version},
+                org.apache.directory.server.core.avltree;version=${project.version},
+                org.apache.directory.server.core.partition.impl.btree;version=${project.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.apache.directory.server.xdbm;version=${project.version},
+                org.apache.directory.server.xdbm.search.impl;version=${project.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/osgi-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/osgi-integ/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/osgi-integ/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/osgi-integ/pom.xml Sun Aug 13 22:24:19 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
 
   <artifactId>apacheds-osgi-integ</artifactId>

Modified: directory/apacheds/branches/apacheds-value/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/pom.xml Sun Aug 13 22:24:19 2017
@@ -30,7 +30,7 @@
 
   <groupId>org.apache.directory.server</groupId>
   <artifactId>apacheds-parent</artifactId>
-  <version>2.0.0-M25-SNAPSHOT</version>
+  <version>2.0.0.AM25-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <name>ApacheDS</name>
@@ -46,7 +46,7 @@
     <additionalparam>-Xdoclint:none</additionalparam>
 
     <!-- Set versions for depending projects -->
-    <org.apache.directory.api.version>2.0.0-M1-SNAPSHOT</org.apache.directory.api.version>
+    <org.apache.directory.api.version>2.0.0.AM1-SNAPSHOT</org.apache.directory.api.version>
     <org.apache.directory.mavibot.version>1.0.0-M8</org.apache.directory.mavibot.version>
     <org.apache.directory.checkstyle-configuration.version>0.3</org.apache.directory.checkstyle-configuration.version>
     <org.apache.directory.junit.junit-addons.version>0.1</org.apache.directory.junit.junit-addons.version>
@@ -66,6 +66,8 @@
     <ehcache.version>2.10.4</ehcache.version>
     <findbugs.annotations.version>1.0.0</findbugs.annotations.version>
     <jetty.version>9.4.5.v20170502</jetty.version>
+    <!-- The Jetty bundle exports are using version 9.4.5, not 9.4.5.v20170502... -->
+    <jetty.bundle.version>9.4.5</jetty.bundle.version>
     <junit.version>4.12</junit.version>
     <ldapsdk.version>4.1</ldapsdk.version>
     <log4j.version>1.2.17</log4j.version>

Modified: directory/apacheds/branches/apacheds-value/protocol-dhcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/protocol-dhcp/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/protocol-dhcp/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/protocol-dhcp/pom.xml Sun Aug 13 22:24:19 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-protocol-dhcp</artifactId>
@@ -77,8 +77,32 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.protocol.dhcp</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+                org.apache.directory.server.dhcp;version=${project.version},
+                org.apache.directory.server.dhcp.io;version=${project.version},
+                org.apache.directory.server.dhcp.messages;version=${project.version},
+                org.apache.directory.server.dhcp.options;version=${project.version},
+                org.apache.directory.server.dhcp.options.dhcp;version=${project.version},
+                org.apache.directory.server.dhcp.options.linklayer;version=${project.version},
+                org.apache.directory.server.dhcp.option.miscs;version=${project.version},
+                org.apache.directory.server.dhcp.options.perhost;version=${project.version},
+                org.apache.directory.server.dhcp.options.perinterface;version=${project.version},
+                org.apache.directory.server.dhcp.options.tcp;version=${project.version},
+                org.apache.directory.server.dhcp.options.vendor;version=${project.version},
+                org.apache.directory.server.dhcp.protocol;version=${project.version},
+                org.apache.directory.server.dhcp.service;version=${project.version},
+                org.apache.directory.server.dhcp.store;version=${project.version},
             </Export-Package>
+            <Import-Package>
+                javax.naming,
+                javax.naming.directory,
+                org.apache.directory.api.ldap.model.constants;version=${org.apache.directory.api.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.apache.mina.core.buffer;version=${mina.core.version},
+                org.apache.mina.core.service;version=${mina.core.version},
+                org.apache.mina.core.session;version=${mina.core.version},
+                org.apache.mina.filter.codec;version=${mina.core.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/protocol-dns/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/protocol-dns/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/protocol-dns/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/protocol-dns/pom.xml Sun Aug 13 22:24:19 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-protocol-dns</artifactId>
@@ -111,8 +111,41 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.protocol.dns</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+                org.apache.directory.server.dns;version=${project.version},
+                org.apache.directory.server.dns.io.decoder;version=${project.version},
+                org.apache.directory.server.dns.io.encoder;version=${project.version},
+                org.apache.directory.server.dns.messages;version=${project.version},
+                org.apache.directory.server.dns.protocol;version=${project.version},
+                org.apache.directory.server.dns.service;version=${project.version},
+                org.apache.directory.server.dns.store;version=${project.version},
+                org.apache.directory.server.dns.store.jndi;version=${project.version},
+                org.apache.directory.server.dns.store.jndi.operations;version=${project.version},
+                org.apache.directory.server.dns.util;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                javax.naming,
+                javax.naming.directory,
+                javax.naming.ldap,
+                org.apache.commons.lang.builder;version=${commons.lang.version},
+                org.apache.directory.api.ldap.model.constants;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util;version=${org.apache.directory.api.version},
+                org.apache.directory.server.core;version=${project.version},
+                org.apache.directory.server.core.api;version=${project.version},
+                org.apache.directory.server.core.jndi;version=${project.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.apache.directory.server.protocol.shared;version=${project.version},
+                org.apache.directory.server.protocol.shared.catalog;version=${project.version},
+                org.apache.directory.server.protocol.shared.transport;version=${project.version},
+                org.apache.mina.core.buffer;version=${mina.core.version},
+                org.apache.mina.core.service;version=${mina.core.version},
+                org.apache.mina.core.session;version=${mina.core.version},
+                org.apache.mina.filter.codec;version=${mina.core.version},
+                org.apache.mina.handler.chain;version=${mina.core.version},
+                org.apache.mina.transport.socket;version=${mina.core.version},
+                org.apache.mina.transport.socket.nio;version=${mina.core.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/protocol-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/protocol-kerberos/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/protocol-kerberos/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/protocol-kerberos/pom.xml Sun Aug 13 22:24:19 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-protocol-kerberos</artifactId>
@@ -124,8 +124,64 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.protocol.kerberos</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+                org.apache.directory.server.kerberos;version=${project.version},
+                org.apache.directory.server.kerberos.changepwd;version=${project.version},
+                org.apache.directory.server.kerberos.changepwd.protocol;version=${project.version},
+                org.apache.directory.server.kerberos.changepwd.service;version=${project.version},
+                org.apache.directory.server.kerberos.kdc;version=${project.version},
+                org.apache.directory.server.kerberos.kdc.authentication;version=${project.version},
+                org.apache.directory.server.kerberos.kdc.ticketgrant;version=${project.version},
+                org.apache.directory.server.kerberos.protocol;version=${project.version},
+                org.apache.directory.server.kerberos.protocol.codec;version=${project.version},
+                org.apache.directory.server.kerberos.sam;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                javax.naming,
+                javax.naming.directory,
+                javax.security.auth.kerberos,
+                net.sf.ehcache;version=${ehcache.version},
+                org.apache.directory.api.asn1;version=${org.apache.directory.api.version},
+                org.apache.directory.api.asn1.ber;version=${org.apache.directory.api.version},
+                org.apache.directory.api.asn1.ber.tlv;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.constants;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.entry;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.name;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util;version=${org.apache.directory.api.version},
+                org.apache.directory.server.constants;version=${project.version},
+                org.apache.directory.server.core.api;version=${project.version},
+                org.apache.directory.server.core.shared;version=${project.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.apache.directory.server.kerberos.changepwd.exceptions;version=${project.version},
+                org.apache.directory.server.kerberos.changepwd.io;version=${project.version},
+                org.apache.directory.server.kerberos.changepwd.messages;version=${project.version},
+                org.apache.directory.server.kerberos.shared.crypto.checksum;version=${project.version},
+                org.apache.directory.server.kerberos.shared.crypto.encryption;version=${project.version},
+                org.apache.directory.server.kerberos.shared.replay;version=${project.version},
+                org.apache.directory.server.kerberos.shared.store;version=${project.version},
+                org.apache.directory.server.protocol.shared;version=${project.version},
+                org.apache.directory.server.protocol.shared.kerberos;version=${project.version},
+                org.apache.directory.server.protocol.shared.transport;version=${project.version},
+                org.apache.directory.shared.kerberos;version=${project.version},
+                org.apache.directory.shared.kerberos.codec;version=${project.version},
+                org.apache.directory.shared.kerberos.codec.changePwdData;version=${project.version},
+                org.apache.directory.shared.kerberos.codec.options;version=${project.version},
+                org.apache.directory.shared.kerberos.codec.types;version=${project.version},
+                org.apache.directory.shared.kerberos.components;version=${project.version},
+                org.apache.directory.shared.kerberos.crypto.checksum;version=${project.version},
+                org.apache.directory.shared.kerberos.exceptions;version=${project.version},
+                org.apache.directory.shared.kerberos.flags;version=${project.version},
+                org.apache.directory.shared.kerberos.messages;version=${project.version},
+                org.apache.mina.core.buffer;version=${mina.core.version},
+                org.apache.mina.core.filterchain;version=${mina.core.version},
+                org.apache.mina.core.service;version=${mina.core.version},
+                org.apache.mina.core.session;version=${mina.core.version},
+                org.apache.mina.filter.codec;version=${mina.core.version},
+                org.apache.mina.transport.socket;version=${mina.core.version},
+                org.apache.mina.transport.socket.nio;version=${mina.core.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/protocol-ldap/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/protocol-ldap/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/protocol-ldap/pom.xml Sun Aug 13 22:24:19 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-protocol-ldap</artifactId>
@@ -183,8 +183,103 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.protocol.ldap</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+                org.apache.directory.server.ldap;version=${project.version},
+                org.apache.directory.server.ldap.handlers.extended;version=${project.version},
+                org.apache.directory.server.ldap.handlers.request;version=${project.version},
+                org.apache.directory.server.ldap.handlers.response;version=${project.version},
+                org.apache.directory.server.ldap.handlers.sasl;version=${project.version},
+                org.apache.directory.server.ldap.handlers.sasl.cramMD5;version=${project.version},
+                org.apache.directory.server.ldap.handlers.sasl.digestMD5;version=${project.version},
+                org.apache.directory.server.ldap.handlers.sasl.gssapi;version=${project.version},
+                org.apache.directory.server.ldap.handlers.sasl.ntlm;version=${project.version},
+                org.apache.directory.server.ldap.handlers.sasl.plain;version=${project.version},
+                org.apache.directory.server.ldap.replication;version=${project.version},
+                org.apache.directory.server.ldap.replication.provider;version=${project.version},
+                org.apache.directory.server.ldap.replication.consumer;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                javax.naming,
+                javax.naming.ldap,
+                javax.net.ssl,
+                javax.security.auth,
+                javax.security.auth.callback,
+                javax.security.auth.kerberos,
+                javax.security.sasl,
+                jdbm,
+                jdbm.helper,
+                jdbm.recman,
+                org.apache.commons.collections.map;version=${commons.collections.version},
+                org.apache.commons.lang;version=${commons.lang.version},
+                org.apache.commons.lang.exception;version=${commons.lang.version},
+                org.apache.directory.api.asn1.ber.tlv;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.codec.api;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.codec.controls.manageDsaIT;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.codec.controls.search.pagedSearch;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.extras.controls;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.extras.controls.ppolicy;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.extras.controls.syncrepl.syncDone;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.extras.controls.syncrepl.syncInfoValue;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.extras.controls.syncrepl.syncState;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.extras.controls.syncrepl_impl;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.extras.extended.certGeneration;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.extras.extended.gracefulDisconnect;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.extras.extended.gracefulShutdown;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.extras.extended.pwdModify;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.extras.extended.startTls;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.extras.extended.storedProcedure;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.extras.extended.whoAmI;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.constants;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.csn;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.cursor;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.entry;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.filter;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.message;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.message.controls;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.message.extended;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.name;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.password;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema.comparators;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.url;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.sp;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.util;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util;version=${org.apache.directory.api.version},
+                org.apache.directory.ldap.client.api;version=${org.apache.directory.api.version},
+                org.apache.directory.ldap.client.api.future;version=${org.apache.directory.api.version},
+                org.apache.directory.server.constants;version=${project.version},
+                org.apache.directory.server.core.api;version=${project.version},
+                org.apache.directory.server.core.api.entry;version=${project.version},
+                org.apache.directory.server.core.api.event;version=${project.version},
+                org.apache.directory.server.core.api.filtering;version=${project.version},
+                org.apache.directory.server.core.api.interceptor.context;version=${project.version},
+                org.apache.directory.server.core.api.partition;version=${project.version},
+                org.apache.directory.server.core.api.sp;version=${project.version},
+                org.apache.directory.server.core.api.sp.java;version=${project.version},
+                org.apache.directory.server.core.partition.impl.btree.jdbm;version=${project.version},
+                org.apache.directory.server.core.security;version=${project.version},
+                org.apache.directory.server.core.shared;version=${project.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.apache.directory.server.kerberos.shared.store;version=${project.version},
+                org.apache.directory.server.protocol.shared;version=${project.version},
+                org.apache.directory.server.protocol.shared.kerberos;version=${project.version},
+                org.apache.directory.server.protocol.shared.transport;version=${project.version},
+                org.apache.directory.shared.kerberos.codec.types;version=${project.version},
+                org.apache.directory.shared.kerberos.components;version=${project.version},
+                org.apache.mina.core.buffer;version=${mina.core.version},
+                org.apache.mina.core.filterchain;version=${mina.core.version},
+                org.apache.mina.core.future;version=${mina.core.version},
+                org.apache.mina.core.service;version=${mina.core.version},
+                org.apache.mina.core.session;version=${mina.core.version},
+                org.apache.mina.core.write;version=${mina.core.version},
+                org.apache.mina.filter.codec;version=${mina.core.version},
+                org.apache.mina.filter.executor;version=${mina.core.version},
+                org.apache.mina.filter.ssl;version=${mina.core.version},
+                org.apache.mina.handler.demux;version=${mina.core.version},
+                org.apache.mina.transport.socket;version=${mina.core.version},
+                org.bouncycastle.jce.provider;version=${bcprov.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/protocol-ntp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/protocol-ntp/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/protocol-ntp/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/protocol-ntp/pom.xml Sun Aug 13 22:24:19 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-protocol-ntp</artifactId>
@@ -86,8 +86,23 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.protocol.ntp</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+                org.apache.directory.server.ntp;version=${project.version},
+                org.apache.directory.server.ntp.io;version=${project.version},
+                org.apache.directory.server.ntp.messages;version=${project.version},
+                org.apache.directory.server.ntp.protocol;version=${project.version},
+                org.apache.directory.server.ntp.service;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                org.apache.directory.server.protocol.shared;version=${project.version},
+                org.apache.directory.server.protocol.shared.transport;version=${project.version},
+                org.apache.mina.core.buffer;version=${mina.core.version},
+                org.apache.mina.core.filterchain;version=${mina.core.version},
+                org.apache.mina.core.service;version=${mina.core.version},
+                org.apache.mina.core.session;version=${mina.core.version},
+                org.apache.mina.filter.codec;version=${mina.core.version},
+                org.apache.mina.transport.socket;version=${mina.core.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/protocol-shared/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/protocol-shared/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/protocol-shared/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/protocol-shared/pom.xml Sun Aug 13 22:24:19 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <name>ApacheDS Protocol Shared</name>
@@ -97,8 +97,36 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.protocol.shared</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+                org.apache.directory.server.protocol.shared;version=${project.version},
+                org.apache.directory.server.protocol.shared.catalog;version=${project.version},
+                org.apache.directory.server.protocol.shared.kerberos;version=${project.version},
+                org.apache.directory.server.protocol.shared.store;version=${project.version},
+                org.apache.directory.server.protocol.shared.transport;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                javax.security.auth.kerberos,
+                org.apache.directory.api.ldap.model.constants;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.cursor;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.entry;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.filter;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.ldif;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.message;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.name;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util;version=${org.apache.directory.api.version},
+                org.apache.directory.server.constants;version=${project.version},
+                org.apache.directory.server.core.api;version=${project.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.apache.directory.shared.kerberos;version=${project.version},
+                org.apache.directory.shared.kerberos.codec.types;version=${project.version},
+                org.apache.directory.shared.kerberos.components;version=${project.version},
+                org.apache.directory.shared.kerberos.exceptions;version=${project.version},
+                org.apache.mina.core.service;version=${mina.core.version},
+                org.apache.mina.transport.socket;version=${mina.core.version},
+                org.apache.mina.transport.socket.nio;version=${mina.core.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/server-annotations/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-annotations/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/server-annotations/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/server-annotations/pom.xml Sun Aug 13 22:24:19 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-server-annotations</artifactId>
@@ -133,8 +133,33 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.annotations</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+                org.apache.directory.server.annotations;version=${project.version},
+                org.apache.directory.server.factory;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                org.apache.commons.pool;version=${commons.pool.version},
+                org.apache.directory.api.ldap.model.constants;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.message;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util;version=${org.apache.directory.api.version},
+                org.apache.directory.ldap.client.api;version=${org.apache.directory.api.version},
+                org.apache.directory.server.constants;version=${project.version},
+                org.apache.directory.server.core.annotations;version=${project.version},
+                org.apache.directory.server.core.api;version=${project.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.apache.directory.server.kerberos;version=${project.version},
+                org.apache.directory.server.kerberos.changepwd;version=${project.version},
+                org.apache.directory.server.kerberos.kdc;version=${project.version},
+                org.apache.directory.server.ldap;version=${project.version},
+                org.apache.directory.server.ldap.handlers.sasl;version=${project.version},
+                org.apache.directory.server.ldap.handlers.sasl.cramMD5;version=${project.version},
+                org.apache.directory.server.ldap.handlers.sasl.digestMD5;version=${project.version},
+                org.apache.directory.server.ldap.handlers.sasl.gssapi;version=${project.version},
+                org.apache.directory.server.ldap.handlers.sasl.ntlm;version=${project.version},
+                org.apache.directory.server.ldap.replication;version=${project.version},
+                org.apache.directory.server.ldap.replication.consumer;version=${project.version},
+                org.apache.directory.server.protocol.shared.transport;version=${project.version},
+                org.junit.runner;version=${junit.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/server-config/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-config/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/server-config/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/server-config/pom.xml Sun Aug 13 22:24:19 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
 
   <artifactId>apacheds-server-config</artifactId>
@@ -101,8 +101,33 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.config</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+                 org.apache.directory.server.config;version=${project.version},
+                 org.apache.directory.server.config.beans;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                javax.naming,
+                org.apache.directory.api.ldap.model.constants;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.csn;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.cursor;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.entry;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.filter;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.ldif;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.message;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.name;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.schema.extractor.impl;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util;version=${org.apache.directory.api.version},
+                org.apache.directory.server.constants;version=${project.version},
+                org.apache.directory.server.core.api;version=${project.version},
+                org.apache.directory.server.core.api.interceptor.context;version=${project.version},
+                org.apache.directory.server.core.partition.impl.btree;version=${project.version},
+                org.apache.directory.server.core.partition.ldif;version=${project.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.apache.directory.server.xdbm;version=${project.version},
+                org.apache.directory.server.xdbm.search;version=${project.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/server-integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-integ/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/server-integ/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/server-integ/pom.xml Sun Aug 13 22:24:19 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-server-integ</artifactId>
@@ -234,8 +234,21 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
             <Export-Package>
-              {local-packages};version=${project.version};-noimport:=true
+              org.apache.directory.server.integ;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                javax.naming,
+                javax.naming.ldap,
+                netscape.ldap,
+                org.apache.directory.api.ldap.model.message;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.util;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util;version=${org.apache.directory.api.version},
+                org.apache.directory.ldap.client.api;version=${org.apache.directory.api.version},
+                org.apache.directory.server.constants;version=${project.version},
+                org.apache.directory.server.core.integ;version=${project.version},
+                org.apache.directory.server.ldap;version=${project.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>
@@ -312,6 +325,7 @@
                 <include>**/*PasswordPolicyServiceIT.java</include>
                 <include>**/*StoredProcedureIT.java</include>
               </includes>
+              
               <systemPropertyVariables>
                 <apacheds.partition.factory>org.apache.directory.server.core.factory.JdbmPartitionFactory</apacheds.partition.factory>
                 <felix.cache.rootdir>
@@ -331,58 +345,60 @@
                 </codec.plugin.directory>
               </systemPropertyVariables>              
             </configuration>
+            
             <executions>
               <!-- AVL execution -->
-       		  <execution>
-       		    <id>avl</id>
-       		    <goals>
-       		      <goal>test</goal>
-       		    </goals>
+              <execution>
+                <id>avl</id>
+                <goals>
+                  <goal>test</goal>
+                </goals>
                 <configuration>
                   <systemPropertyVariables>
                     <apacheds.partition.factory>org.apache.directory.server.core.factory.AvlPartitionFactory</apacheds.partition.factory>
-	                <felix.cache.rootdir>
-	                  ${project.build.directory}
-	                </felix.cache.rootdir>
-	                <felix.cache.locking>
-	                  false
-	                </felix.cache.locking>
-	                <org.osgi.framework.storage.clean>
-	                  onFirstInit
-	                </org.osgi.framework.storage.clean>
-	                <org.osgi.framework.storage>
-	                  ${project.build.directory}/osgi-cache
-	                </org.osgi.framework.storage>
-                        <codec.plugin.directory>
-                          ${codec.plugin.directory}
-                        </codec.plugin.directory>
+                    <felix.cache.rootdir>
+                      ${project.build.directory}
+                    </felix.cache.rootdir>
+                    <felix.cache.locking>
+                      false
+                    </felix.cache.locking>
+                    <org.osgi.framework.storage.clean>
+                      onFirstInit
+                    </org.osgi.framework.storage.clean>
+                    <org.osgi.framework.storage>
+                      ${project.build.directory}/osgi-cache
+                    </org.osgi.framework.storage>
+                    <codec.plugin.directory>
+                      ${codec.plugin.directory}
+                    </codec.plugin.directory>
                   </systemPropertyVariables>
                 </configuration>
               </execution>
+              
               <!-- LDIF execution -->
-       		  <execution>
-       		    <id>ldif</id>
-       		    <goals>
-       		      <goal>test</goal>
-       		    </goals>
+              <execution>
+                <id>ldif</id>
+                <goals>
+                  <goal>test</goal>
+                </goals>
                 <configuration>
                   <systemPropertyVariables>
                     <apacheds.partition.factory>org.apache.directory.server.core.factory.LdifPartitionFactory</apacheds.partition.factory>
-	                <felix.cache.rootdir>
-	                  ${project.build.directory}
-	                </felix.cache.rootdir>
-	                <felix.cache.locking>
-	                  false
-	                </felix.cache.locking>
-	                <org.osgi.framework.storage.clean>
-	                  onFirstInit
-	                </org.osgi.framework.storage.clean>
-	                <org.osgi.framework.storage>
-	                  ${project.build.directory}/osgi-cache
-	                </org.osgi.framework.storage>
-                        <codec.plugin.directory>
-                          ${codec.plugin.directory}
-                        </codec.plugin.directory>
+                    <felix.cache.rootdir>
+                      ${project.build.directory}
+                    </felix.cache.rootdir>
+                    <felix.cache.locking>
+                      false
+                    </felix.cache.locking>
+                    <org.osgi.framework.storage.clean>
+                      onFirstInit
+                    </org.osgi.framework.storage.clean>
+                    <org.osgi.framework.storage>
+                      ${project.build.directory}/osgi-cache
+                    </org.osgi.framework.storage>
+                    <codec.plugin.directory>
+                      ${codec.plugin.directory}
+                    </codec.plugin.directory>
                   </systemPropertyVariables>
                 </configuration>
               </execution>

Modified: directory/apacheds/branches/apacheds-value/server-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/server-jndi/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/server-jndi/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/server-jndi/pom.xml Sun Aug 13 22:24:19 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-server-jndi</artifactId>
@@ -138,8 +138,34 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.jndi</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+                org.apache.directory.server.configuration;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                org.apache.commons.lang;version=${commons.lang.version},
+                org.apache.directory.api.ldap.model.constants;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.entry;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.name;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema.registries;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.schema.extractor;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.schema.extractor.impl;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.schema.loader;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.schema.manager.impl;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.server.constants;version=${project.version},
+                org.apache.directory.server.core;version=${project.version},
+                org.apache.directory.server.core.api;version=${project.version},
+                org.apache.directory.server.core.api.entry;version=${project.version},
+                org.apache.directory.server.core.api.partition;version=${project.version},
+                org.apache.directory.server.core.api.schema;version=${project.version},
+                org.apache.directory.server.core.partition.impl.btree;version=${project.version},
+                org.apache.directory.server.core.partition.ldif;version=${project.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.apache.directory.server.ldap;version=${project.version},
+                org.apache.directory.server.protocol.shared.store;version=${project.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/service-builder/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/service-builder/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/service-builder/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/service-builder/pom.xml Sun Aug 13 22:24:19 2017
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
 
   <artifactId>apacheds-service-builder</artifactId>
@@ -164,8 +164,52 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.service.builder</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+                org.apache.directory.server.config.builder;version=${project.version},
+                org.apache.directory.server.config.listener;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                org.apache.directory.api.ldap.model.entry;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.ldif;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.message;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.name;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.schema;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util;version=${org.apache.directory.api.version},
+                org.apache.directory.server.config;version=${project.version},
+                org.apache.directory.server.config.beans;version=${project.version},
+                org.apache.directory.server.constants;version=${project.version},
+                org.apache.directory.server.core;version=${project.version},
+                org.apache.directory.server.core.api;version=${project.version},
+                org.apache.directory.server.core.api.authn.ppolicy;version=${project.version},
+                org.apache.directory.server.core.api.changelog;version=${project.version},
+                org.apache.directory.server.core.api.event;version=${project.version},
+                org.apache.directory.server.core.api.interceptor;version=${project.version},
+                org.apache.directory.server.core.api.interceptor.context;version=${project.version},
+                org.apache.directory.server.core.api.journal;version=${project.version},
+                org.apache.directory.server.core.api.partition;version=${project.version},
+                org.apache.directory.server.core.authn;version=${project.version},
+                org.apache.directory.server.core.authn.ppolicy;version=${project.version},
+                org.apache.directory.server.core.changelog;version=${project.version},
+                org.apache.directory.server.core.journal;version=${project.version},
+                org.apache.directory.server.core.partition.impl.btree.jdbm;version=${project.version},
+                org.apache.directory.server.core.partition.impl.btree.mavibot;version=${project.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.apache.directory.server.integration.http;version=${project.version},
+                org.apache.directory.server.kerberos;version=${project.version},
+                org.apache.directory.server.kerberos.changepwd;version=${project.version},
+                org.apache.directory.server.kerberos.kdc;version=${project.version},
+                org.apache.directory.server.ldap;version=${project.version},
+                org.apache.directory.server.ldap.handlers.sasl;version=${project.version},
+                org.apache.directory.server.ldap.handlers.sasl.ntlm;version=${project.version},
+                org.apache.directory.server.ldap.replication;version=${project.version},
+                org.apache.directory.server.ldap.replication.consumer;version=${project.version},
+                org.apache.directory.server.ldap.replication.provider;version=${project.version},
+                org.apache.directory.server.ntp;version=${project.version},
+                org.apache.directory.server.protocol.shared.transport;version=${project.version},
+                org.apache.directory.server.xdbm;version=${project.version},
+                org.apache.directory.shared.kerberos.codec.types;version=${project.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/service/ApacheDS.launch
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/service/ApacheDS.launch?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/service/ApacheDS.launch (original)
+++ directory/apacheds/branches/apacheds-value/service/ApacheDS.launch Sun Aug 13 22:24:19 2017
@@ -10,10 +10,8 @@
 <mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
 <mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
 </mapAttribute>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.directory.server.UberjarMain"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="./target/instance"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="apacheds-service"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Dlog4j.configuration=file:./log4j.properties -Dapacheds.log.dir=./target/instance/log -Dapacheds.controls=org.apache.directory.api.ldap.codec.controls.cascade.CascadeFactory,org.apache.directory.api.ldap.codec.controls.manageDsaIT.ManageDsaITFactory,org.apache.directory.api.ldap.codec.controls.proxiedauthz.ProxiedAuthzFactory,org.apache.directory.api.ldap.codec.controls.search.entryChange.EntryChangeFactory,org.apache.directory.api.ldap.codec.controls.search.pagedSearch.PagedResultsFactory,org.apache.directory.api.ldap.codec.controls.search.persistentSearch.PersistentSearchFactory,org.apache.directory.api.ldap.codec.controls.search.subentries.SubentriesFactory,org.apache.directory.api.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory,org.apache.dire
 ctory.api.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory,org.apache.directory.api.ldap.extras.controls.syncrepl_impl.SyncStateValueFactory,org.apache.directory.api.ldap.extras.controls.ad_impl.AdDirSyncFactory -Dapacheds.extendedOperations=org.apache.directory.api.ldap.extras.extended.ads_impl.cancel.CancelFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.certGeneration.CertGenerationFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulShutdown.GracefulShutdownFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.storedProcedure.StoredProcedureFactory,org.apache.directory.api.ldap.extras.extended.ads_impl.gracefulDisconnect.GracefulDisconnectFactory"/>
 </launchConfiguration>

Modified: directory/apacheds/branches/apacheds-value/service/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/service/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/service/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/service/pom.xml Sun Aug 13 22:24:19 2017
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-service</artifactId>

Modified: directory/apacheds/branches/apacheds-value/test-framework/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/test-framework/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/test-framework/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/test-framework/pom.xml Sun Aug 13 22:24:19 2017
@@ -23,7 +23,7 @@
     <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-test-framework</artifactId>
@@ -116,8 +116,40 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
             <Export-Package>
-                {local-packages};version=${project.version};-noimport:=true
+                org.apache.directory.server.core.integ;version=${project.version}
             </Export-Package>
+            <Import-Package>
+                org.apache.commons.pool;version=${commons.pool.version},
+                org.apache.commons.pool.impl.GenericObjectPool;version=${commons.pool.version},
+                org.apache.directory.api.ldap.codec.api;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.entry;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.exception;version=${org.apache.directory.api.version},
+                org.apache.directory.api.ldap.model.name;version=${org.apache.directory.api.version},
+                org.apache.directory.api.util;version=${org.apache.directory.api.version},
+                org.apache.directory.ldap.client.api;version=${org.apache.directory.api.version},
+                org.apache.directory.ldap.client.template;version=${org.apache.directory.api.version},
+                org.apache.directory.server.annotations;version=${project.version},
+                org.apache.directory.server.constants;version=${project.version},
+                org.apache.directory.server.core.annotations;version=${project.version},
+                org.apache.directory.server.core.api;version=${project.version},
+                org.apache.directory.server.core.api.changelog;version=${project.version},
+                org.apache.directory.server.core.api.filtering;version=${project.version},
+                org.apache.directory.server.core.api.interceptor;version=${project.version},
+                org.apache.directory.server.core.api.interceptor.context;version=${project.version},
+                org.apache.directory.server.core.factory;version=${project.version},
+                org.apache.directory.server.core.security;version=${project.version},
+                org.apache.directory.server.factory;version=${project.version},
+                org.apache.directory.server.i18n;version=${project.version},
+                org.apache.directory.server.kerberos.kdc;version=${project.version},
+                org.apache.directory.server.ldap;version=${project.version},
+                org.junit;version=${junit.version},
+                org.junit.rules;version=${junit.version},
+                org.junit.runner;version=${junit.version},
+                org.junit.runner.notification;version=${junit.version},
+                org.junit.runners;version=${junit.version},
+                org.junit.runners.model;version=${junit.version},
+                org.slf4j;version=${slf4j.api.version}
+            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/apacheds/branches/apacheds-value/wrapper/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-value/wrapper/pom.xml?rev=1804948&r1=1804947&r2=1804948&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-value/wrapper/pom.xml (original)
+++ directory/apacheds/branches/apacheds-value/wrapper/pom.xml Sun Aug 13 22:24:19 2017
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.directory.server</groupId>
     <artifactId>apacheds-parent</artifactId>
-    <version>2.0.0-M25-SNAPSHOT</version>
+    <version>2.0.0.AM25-SNAPSHOT</version>
   </parent>
   
   <artifactId>apacheds-wrapper</artifactId>