Repository: incubator-ranger
Updated Branches:
  refs/heads/master 3a0b69e38 -> a1fcbf717


Simplify ApacheDS dependency management for ugsync, make sure test scope is 
specified


Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/a1fcbf71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/a1fcbf71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/a1fcbf71

Branch: refs/heads/master
Commit: a1fcbf71731a10fe94b26fccdffb8d03703bd64f
Parents: 3a0b69e
Author: Colm O hEigeartaigh <[email protected]>
Authored: Tue Jul 19 13:09:52 2016 +0100
Committer: Colm O hEigeartaigh <[email protected]>
Committed: Tue Jul 19 13:10:48 2016 +0100

----------------------------------------------------------------------
 pom.xml        |  1 +
 ugsync/pom.xml | 38 ++++++++++++++------------------------
 2 files changed, 15 insertions(+), 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a1fcbf71/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a82826d..fed5762 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,6 +120,7 @@
         <!-- versions are in alphabetical order -->
         <antlr.version>3.5.2</antlr.version>
         <aopalliance.version>1.0</aopalliance.version>
+        <apacheds.version>2.0.0-M22</apacheds.version>
         <asm.all.version>3.2</asm.all.version>
         <asm.version>3.1</asm.version>
         <aspectj.version>1.8.2</aspectj.version>

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/a1fcbf71/ugsync/pom.xml
----------------------------------------------------------------------
diff --git a/ugsync/pom.xml b/ugsync/pom.xml
index 4703da0..63b3b68 100644
--- a/ugsync/pom.xml
+++ b/ugsync/pom.xml
@@ -106,30 +106,6 @@
             <artifactId>commons-codec</artifactId>
             <version>${commons.codec.version}</version>
         </dependency>
-       <dependency>
-      <groupId>org.apache.directory.server</groupId>
-      <artifactId>apacheds-all</artifactId>
-      <version>2.0.0-M20</version>
-      <exclusions>
-       <exclusion>
-        <groupId>org.apache.directory.api</groupId>
-        <artifactId>api-ldap-schema-data</artifactId>
-       </exclusion>
-       <exclusion>
-        <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-schema-data</artifactId>
-       </exclusion>
-       <exclusion>
-        <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-ldap-schema</artifactId>
-       </exclusion>
-      </exclusions>
-    </dependency> 
-    <dependency>
-         <groupId>org.apache.directory.api</groupId>
-         <artifactId>api-ldap-model</artifactId>
-         <version>1.0.0-M20</version>
-       </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
@@ -144,6 +120,20 @@
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest-all</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.directory.server</groupId>
+            <artifactId>apacheds-core-annotations</artifactId>
+            <version>${apacheds.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.directory.server</groupId>
+            <artifactId>apacheds-core-integ</artifactId>
+            <version>${apacheds.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+
     </dependencies>
 
     <build>

Reply via email to