You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2017/08/16 10:46:56 UTC

svn commit: r1805171 - in /directory/studio/branches/studio-value: eclipse-trgt-platform/template/ plugins/aciitemeditor/ plugins/apacheds.configuration/ plugins/connection.core/ plugins/ldapbrowser.common/ plugins/ldapbrowser.core/ plugins/ldapbrowser...

Author: elecharny
Date: Wed Aug 16 10:46:56 2017
New Revision: 1805171

URL: http://svn.apache.org/viewvc?rev=1805171&view=rev
Log:
Uses 'version' instead of 'bundleversion' for the API and ApacheDS dependencies, as the versions are now OSGi compliant

Modified:
    directory/studio/branches/studio-value/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
    directory/studio/branches/studio-value/plugins/aciitemeditor/pom-first.xml
    directory/studio/branches/studio-value/plugins/apacheds.configuration/pom-first.xml
    directory/studio/branches/studio-value/plugins/connection.core/pom-first.xml
    directory/studio/branches/studio-value/plugins/ldapbrowser.common/pom-first.xml
    directory/studio/branches/studio-value/plugins/ldapbrowser.core/pom-first.xml
    directory/studio/branches/studio-value/plugins/ldapbrowser.ui/pom-first.xml
    directory/studio/branches/studio-value/plugins/ldapservers.apacheds/pom-first.xml
    directory/studio/branches/studio-value/plugins/ldapservers/pom-first.xml
    directory/studio/branches/studio-value/plugins/ldifeditor/pom-first.xml
    directory/studio/branches/studio-value/plugins/ldifparser/pom-first.xml
    directory/studio/branches/studio-value/plugins/openldap.acl.editor/pom-first.xml
    directory/studio/branches/studio-value/plugins/openldap.common.ui/pom-first.xml
    directory/studio/branches/studio-value/plugins/openldap.config.editor/pom-first.xml
    directory/studio/branches/studio-value/plugins/openldap.syncrepl/pom-first.xml
    directory/studio/branches/studio-value/plugins/schemaeditor/pom-first.xml
    directory/studio/branches/studio-value/plugins/valueeditors/pom-first.xml
    directory/studio/branches/studio-value/tests/test.integration.core/pom-first.xml
    directory/studio/branches/studio-value/tests/test.integration.ui/pom-first.xml

Modified: directory/studio/branches/studio-value/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template (original)
+++ directory/studio/branches/studio-value/eclipse-trgt-platform/template/org.apache.directory.studio.eclipse-trgt-platform.template Wed Aug 16 10:46:56 2017
@@ -36,67 +36,67 @@
       <unit id="org.apache.commons.pool" version="${org.apache.commons.pool.bundleversion}"/>
 
       <!-- LDAP API modules -->
-      <unit id="org.apache.directory.api.asn1.api" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.asn1.ber" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.dsmlv2.engine" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.dsmlv2.parser" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.i18n" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.ldap.client.api" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.ldap.codec.core" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.ldap.extras.aci" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.ldap.extras.codec" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.ldap.extras.codec.api" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.ldap.extras.sp" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.ldap.extras.trigger" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.ldap.extras.util" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.ldap.model" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.ldap.net.mina" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.ldap.schema" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.ldap.schema.converter" version="${org.apache.directory.api.bundleversion}"/>
-      <unit id="org.apache.directory.api.util" version="${org.apache.directory.api.bundleversion}"/>
+      <unit id="org.apache.directory.api.asn1.api" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.asn1.ber" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.dsmlv2.engine" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.dsmlv2.parser" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.i18n" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.ldap.client.api" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.ldap.codec.core" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.ldap.extras.aci" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.ldap.extras.codec" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.ldap.extras.codec.api" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.ldap.extras.sp" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.ldap.extras.trigger" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.ldap.extras.util" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.ldap.model" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.ldap.net.mina" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.ldap.schema" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.ldap.schema.converter" version="${org.apache.directory.api.version}"/>
+      <unit id="org.apache.directory.api.util" version="${org.apache.directory.api.version}"/>
 
       <!-- LDAP server modules -->
-      <unit id="org.apache.directory.server.core" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.core.api" version="${org.apache.directory.server.bundleversion}"/>
-      <unit id="org.apache.directory.server.core.avl" version="${org.apache.directory.server.bundleversion}"/>
-      <unit id="org.apache.directory.server.core.constants" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.core.jndi" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.core.shared" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.i18n" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptor.kerberos" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.admin" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.authn" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.authz" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.changelog" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.collective" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.event" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.exception" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.hash" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.journal" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.logger" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.normalization" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.number" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.operational" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.referral" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.schema" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.subtree" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.interceptors.trigger" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.jdbm.partition" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.kerberos.codec" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.ldif.partition" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.xdbm.partition" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.protocol.dhcp" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.protocol.dns" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.protocol.kerberos" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.protocol.ldap" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.protocol.ntp" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.protocol.shared" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.config" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.jndi" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.service.builder" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.core.annotations" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.annotations" version="${org.apache.directory.server.bundleversion}" />
-      <unit id="org.apache.directory.server.apacheds-test-framework" version="${org.apache.directory.server.bundleversion}" />
+      <unit id="org.apache.directory.server.core" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.core.api" version="${org.apache.directory.server.version}"/>
+      <unit id="org.apache.directory.server.core.avl" version="${org.apache.directory.server.version}"/>
+      <unit id="org.apache.directory.server.core.constants" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.core.jndi" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.core.shared" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.i18n" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptor.kerberos" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.admin" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.authn" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.authz" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.changelog" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.collective" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.event" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.exception" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.hash" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.journal" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.logger" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.normalization" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.number" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.operational" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.referral" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.schema" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.subtree" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.interceptors.trigger" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.jdbm.partition" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.kerberos.codec" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.ldif.partition" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.xdbm.partition" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.protocol.dhcp" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.protocol.dns" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.protocol.kerberos" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.protocol.ldap" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.protocol.ntp" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.protocol.shared" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.config" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.jndi" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.service.builder" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.core.annotations" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.annotations" version="${org.apache.directory.server.version}" />
+      <unit id="org.apache.directory.server.apacheds-test-framework" version="${org.apache.directory.server.version}" />
 
       <!-- MINA module -->
       <unit id="org.apache.mina.core" version="${org.apache.mina.bundleversion}"/>

Modified: directory/studio/branches/studio-value/plugins/aciitemeditor/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/aciitemeditor/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/aciitemeditor/pom-first.xml (original)
+++ directory/studio/branches/studio-value/plugins/aciitemeditor/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -50,8 +50,8 @@
             <Export-Package>org.apache.directory.studio.aciitemeditor</Export-Package>
             
             <Require-Bundle>
- org.apache.directory.api.ldap.extras.aci;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.api.ldap.extras.aci;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.version}",
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,
  org.apache.directory.studio.connection.ui,

Modified: directory/studio/branches/studio-value/plugins/apacheds.configuration/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/apacheds.configuration/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/apacheds.configuration/pom-first.xml (original)
+++ directory/studio/branches/studio-value/plugins/apacheds.configuration/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -59,15 +59,15 @@
              </Import-Package>
             
             <Require-Bundle>
- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.schema;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.server.config;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.core.constants;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.kerberos.codec;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.ldif.partition;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.bundleversion}",
+ org.apache.directory.api.util;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.schema;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.server.config;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.core.constants;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.kerberos.codec;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.ldif.partition;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.version}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,

Modified: directory/studio/branches/studio-value/plugins/connection.core/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/connection.core/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/connection.core/pom-first.xml (original)
+++ directory/studio/branches/studio-value/plugins/connection.core/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -62,12 +62,12 @@
             </Import-Package>
             
             <Require-Bundle>
- org.apache.directory.api.asn1.api;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.client.api;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.codec.core;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.net.mina;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.api.asn1.api;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.client.api;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.codec.core;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.net.mina;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.util;bundle-version="${org.apache.directory.api.version}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.ldifparser,
  org.eclipse.core.runtime,

Modified: directory/studio/branches/studio-value/plugins/ldapbrowser.common/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/ldapbrowser.common/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/ldapbrowser.common/pom-first.xml (original)
+++ directory/studio/branches/studio-value/plugins/ldapbrowser.common/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -66,8 +66,8 @@
             </Import-Package>
 
             <Require-Bundle>
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.util;bundle-version="${org.apache.directory.api.version}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,

Modified: directory/studio/branches/studio-value/plugins/ldapbrowser.core/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/ldapbrowser.core/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/ldapbrowser.core/pom-first.xml (original)
+++ directory/studio/branches/studio-value/plugins/ldapbrowser.core/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -136,11 +136,11 @@
             </Import-Package>
             
             <Require-Bundle>
- org.apache.directory.api.asn1.api;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.codec.core;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.dsmlv2.parser;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.api.asn1.api;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.codec.core;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.dsmlv2.parser;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.util;bundle-version="${org.apache.directory.api.version}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.connection.core,
  org.apache.directory.studio.ldifparser,

Modified: directory/studio/branches/studio-value/plugins/ldapbrowser.ui/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/ldapbrowser.ui/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/ldapbrowser.ui/pom-first.xml (original)
+++ directory/studio/branches/studio-value/plugins/ldapbrowser.ui/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -70,8 +70,8 @@
             </Import-Package>
             
             <Require-Bundle>
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.util;bundle-version="${org.apache.directory.api.version}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,

Modified: directory/studio/branches/studio-value/plugins/ldapservers.apacheds/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/ldapservers.apacheds/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/ldapservers.apacheds/pom-first.xml (original)
+++ directory/studio/branches/studio-value/plugins/ldapservers.apacheds/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -54,10 +54,10 @@
             </Import-Package>
             
             <Require-Bundle>
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.server.config;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.bundleversion}",
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.server.config;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.version}",
  org.apache.directory.studio.apacheds.configuration,
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,

Modified: directory/studio/branches/studio-value/plugins/ldapservers/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/ldapservers/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/ldapservers/pom-first.xml (original)
+++ directory/studio/branches/studio-value/plugins/ldapservers/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -62,7 +62,7 @@
             </Import-Package>
             
             <Require-Bundle>
- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.api.util;bundle-version="${org.apache.directory.api.version}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,

Modified: directory/studio/branches/studio-value/plugins/ldifeditor/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/ldifeditor/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/ldifeditor/pom-first.xml (original)
+++ directory/studio/branches/studio-value/plugins/ldifeditor/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -60,8 +60,8 @@
             <Import-Package/>
             
             <Require-Bundle>
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.util;bundle-version="${org.apache.directory.api.version}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,

Modified: directory/studio/branches/studio-value/plugins/ldifparser/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/ldifparser/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/ldifparser/pom-first.xml (original)
+++ directory/studio/branches/studio-value/plugins/ldifparser/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -66,7 +66,7 @@
             </Import-Package>
             
             <Require-Bundle>
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}"
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.version}"
             </Require-Bundle>
           </instructions>
         </configuration>

Modified: directory/studio/branches/studio-value/plugins/openldap.acl.editor/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.acl.editor/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.acl.editor/pom-first.xml (original)
+++ directory/studio/branches/studio-value/plugins/openldap.acl.editor/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -77,8 +77,8 @@
  org.slf4j
             </Import-Package>
             <Require-Bundle>
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.util;bundle-version="${org.apache.directory.api.version}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,

Modified: directory/studio/branches/studio-value/plugins/openldap.common.ui/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.common.ui/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.common.ui/pom-first.xml (original)
+++ directory/studio/branches/studio-value/plugins/openldap.common.ui/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -53,8 +53,8 @@
  org.apache.directory.studio.openldap.common.ui.widgets</Export-Package>
  
             <Require-Bundle>
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.util;bundle-version="${org.apache.directory.api.version}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,

Modified: directory/studio/branches/studio-value/plugins/openldap.config.editor/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.config.editor/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.config.editor/pom-first.xml (original)
+++ directory/studio/branches/studio-value/plugins/openldap.config.editor/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -57,14 +57,14 @@
             </Import-Package> 
             
             <Require-Bundle>
- org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.ldif.partition;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.api.asn1.api;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.schema;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.extras.util;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.ldif.partition;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.api.asn1.api;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.schema;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.extras.util;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.util;bundle-version="${org.apache.directory.api.version}",
  org.apache.directory.studio.openldap.common.ui,
  org.apache.directory.studio.openldap.syncrepl,
  org.apache.directory.studio.common.core,

Modified: directory/studio/branches/studio-value/plugins/openldap.syncrepl/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/openldap.syncrepl/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/openldap.syncrepl/pom-first.xml (original)
+++ directory/studio/branches/studio-value/plugins/openldap.syncrepl/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -46,7 +46,7 @@
             <Bundle-Localization>plugin</Bundle-Localization>
             <Eclipse-LazyStart>true</Eclipse-LazyStart>
             <Require-Bundle>
-              org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}"
+              org.apache.directory.api.util;bundle-version="${org.apache.directory.api.version}"
             </Require-Bundle>
             <Export-Package>org.apache.directory.studio.openldap.syncrepl</Export-Package>
           </instructions>

Modified: directory/studio/branches/studio-value/plugins/schemaeditor/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/schemaeditor/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/schemaeditor/pom-first.xml (original)
+++ directory/studio/branches/studio-value/plugins/schemaeditor/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -76,11 +76,11 @@
             </Import-Package>
 
             <Require-Bundle>
- org.apache.directory.api.asn1.api;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.schema;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.schema.converter;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.api.asn1.api;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.schema;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.schema.converter;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.util;bundle-version="${org.apache.directory.api.version}",
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,

Modified: directory/studio/branches/studio-value/plugins/valueeditors/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/plugins/valueeditors/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/plugins/valueeditors/pom-first.xml (original)
+++ directory/studio/branches/studio-value/plugins/valueeditors/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -70,8 +70,8 @@
             </Import-Package>
             
             <Require-Bundle>
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.util;bundle-version="${org.apache.directory.api.version}",
  org.apache.directory.studio.common.ui,
  org.apache.directory.studio.connection.core,
  org.apache.directory.studio.connection.ui,

Modified: directory/studio/branches/studio-value/tests/test.integration.core/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/tests/test.integration.core/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/tests/test.integration.core/pom-first.xml (original)
+++ directory/studio/branches/studio-value/tests/test.integration.core/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -48,18 +48,20 @@
             <Bundle-Activator>org.apache.directory.studio.test.integration.core.Activator</Bundle-Activator>
             
             <Require-Bundle>org.junit;bundle-version="4.11.0",
- org.apache.directory.server.apacheds-test-framework;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.annotations;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.core.annotations;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.protocol.ldap;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.api.asn1.api;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.client.api;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.codec.core;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.net.mina;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.mina.core;bundle-version="${org.apache.mina.bundleversion}",
+ org.apache.directory.server.apacheds-test-framework;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.annotations;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.jdbm.partition;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.core.annotations;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.protocol.ldap;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.api.asn1.api;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.client.api;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.codec.core;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.net.mina;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.util;bundle-version="${org.apache.directory.api.version}",
+ org.apache.mina.core;bundle-version="${org.apache.mina.version}",
  org.apache.directory.studio.connection.core,
  org.apache.directory.studio.common.core,
  org.apache.directory.studio.ldapbrowser.core,

Modified: directory/studio/branches/studio-value/tests/test.integration.ui/pom-first.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/studio-value/tests/test.integration.ui/pom-first.xml?rev=1805171&r1=1805170&r2=1805171&view=diff
==============================================================================
--- directory/studio/branches/studio-value/tests/test.integration.ui/pom-first.xml (original)
+++ directory/studio/branches/studio-value/tests/test.integration.ui/pom-first.xml Wed Aug 16 10:46:56 2017
@@ -55,22 +55,22 @@
  org.eclipse.swtbot.junit4_x;bundle-version="2.2.1",
  bcprov;bundle-version="1.52.0",
  
- org.apache.directory.server.apacheds-test-framework;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.annotations;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.core.annotations;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.protocol.ldap;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.protocol.shared;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.jdbm.partition;bundle-version="${org.apache.directory.server.bundleversion}",
- org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.bundleversion}",
+ org.apache.directory.server.apacheds-test-framework;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.annotations;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.core.annotations;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.core.api;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.protocol.ldap;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.protocol.shared;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.jdbm.partition;bundle-version="${org.apache.directory.server.version}",
+ org.apache.directory.server.xdbm.partition;bundle-version="${org.apache.directory.server.version}",
  
- org.apache.directory.api.asn1.api;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.client.api;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.codec.core;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.ldap.net.mina;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.directory.api.util;bundle-version="${org.apache.directory.api.bundleversion}",
- org.apache.mina.core;bundle-version="${org.apache.mina.bundleversion}",
+ org.apache.directory.api.asn1.api;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.client.api;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.codec.core;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.model;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.ldap.net.mina;bundle-version="${org.apache.directory.api.version}",
+ org.apache.directory.api.util;bundle-version="${org.apache.directory.api.version}",
+ org.apache.mina.core;bundle-version="${org.apache.mina.version}",
  
  org.apache.directory.studio.aciitemeditor,
  org.apache.directory.studio.apacheds.configuration,