You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2011/02/28 19:13:36 UTC
svn commit: r1075456 - in /directory/studio/branches/milestones/libraries: org.apache.directory.server.core.api/pom.xml org.apache.directory.server.core/pom.xml

Author: pamarcelot
Date: Mon Feb 28 18:13:36 2011
New Revision: 1075456

URL: http://svn.apache.org/viewvc?rev=1075456&view=rev
Log:
Fixed libraries pom.xml files.

Modified:
    directory/studio/branches/milestones/libraries/org.apache.directory.server.core.api/pom.xml
    directory/studio/branches/milestones/libraries/org.apache.directory.server.core/pom.xml

Modified: directory/studio/branches/milestones/libraries/org.apache.directory.server.core.api/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/milestones/libraries/org.apache.directory.server.core.api/pom.xml?rev=1075456&r1=1075455&r2=1075456&view=diff
==============================================================================
--- directory/studio/branches/milestones/libraries/org.apache.directory.server.core.api/pom.xml (original)
+++ directory/studio/branches/milestones/libraries/org.apache.directory.server.core.api/pom.xml Mon Feb 28 18:13:36 2011
@@ -95,7 +95,7 @@
  org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.client.api;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.asn1.api;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.codec;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.codec.core;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.extras.util;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.model;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.schema;bundle-version="${org.apache.directory.shared.validversion}",
@@ -171,7 +171,7 @@
         </exclusion>
         <exclusion>
           <groupId>org.apache.directory.shared</groupId>
-          <artifactId>shared-ldap-extras-util</artifactId>
+          <artifactId>shared-ldap-codec-core</artifactId>
         </exclusion>
         <exclusion>
           <groupId>org.apache.directory.shared</groupId>
@@ -186,6 +186,10 @@
           <artifactId>shared-util</artifactId>
         </exclusion>
         <exclusion>
+          <groupId>org.apache.directory.shared</groupId>
+          <artifactId>shared-ldap-extras-util</artifactId>
+        </exclusion>
+        <exclusion>
           <groupId>net.sf.ehcache</groupId>
           <artifactId>ehcache-core</artifactId>
         </exclusion>
@@ -247,7 +251,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-extras-util</artifactId>
+      <artifactId>shared-ldap-codec-core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -266,6 +270,11 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-extras-util</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>org.apache.directory.studio</groupId>
       <artifactId>org.slf4j.api</artifactId>
       <scope>provided</scope>

Modified: directory/studio/branches/milestones/libraries/org.apache.directory.server.core/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/milestones/libraries/org.apache.directory.server.core/pom.xml?rev=1075456&r1=1075455&r2=1075456&view=diff
==============================================================================
--- directory/studio/branches/milestones/libraries/org.apache.directory.server.core/pom.xml (original)
+++ directory/studio/branches/milestones/libraries/org.apache.directory.server.core/pom.xml Mon Feb 28 18:13:36 2011
@@ -93,7 +93,7 @@
  org.apache.directory.server.i18n;bundle-version="${org.apache.directory.server.validversion}",
  org.apache.directory.shared.i18n;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.client.api;bundle-version="${org.apache.directory.shared.validversion}",
- org.apache.directory.shared.ldap.codec;bundle-version="${org.apache.directory.shared.validversion}",
+ org.apache.directory.shared.ldap.codec.core;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.extras.aci;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.extras.trigger;bundle-version="${org.apache.directory.shared.validversion}",
  org.apache.directory.shared.ldap.extras.util;bundle-version="${org.apache.directory.shared.validversion}",
@@ -172,6 +172,10 @@
         </exclusion>
         <exclusion>
           <groupId>org.apache.directory.shared</groupId>
+          <artifactId>shared-ldap-codec-standalone</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.directory.shared</groupId>
           <artifactId>shared-ldap-extras-aci</artifactId>
         </exclusion>
         <exclusion>
@@ -232,7 +236,12 @@
     </dependency>
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
-      <artifactId>shared-ldap-codec</artifactId>
+      <artifactId>shared-ldap-codec-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-ldap-codec-core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>