AMBARI-21307 cleand apache ditectory related dependencies
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/748302f6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/748302f6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/748302f6 Branch: refs/heads/feature-branch-AMBARI-21307 Commit: 748302f629d1c83ec8a134a85014a583492480f9 Parents: 4bde7f6 Author: lpuskas <lpus...@apache.org> Authored: Wed Oct 11 17:54:57 2017 +0200 Committer: lpuskas <lpus...@apache.org> Committed: Thu Oct 12 19:25:52 2017 +0200 ---------------------------------------------------------------------- ambari-funtest/pom.xml | 67 ------------------------------------ ambari-project/pom.xml | 51 --------------------------- ambari-server/pom.xml | 84 ++++++++------------------------------------- 3 files changed, 14 insertions(+), 188 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/748302f6/ambari-funtest/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-funtest/pom.xml b/ambari-funtest/pom.xml index bb2068d..6466af3 100644 --- a/ambari-funtest/pom.xml +++ b/ambari-funtest/pom.xml @@ -197,73 +197,6 @@ <artifactId>spring-ldap-core</artifactId> </dependency> <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-server-annotations</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-core-integ</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-server-integ</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-jdbm</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-kerberos-codec</artifactId> - <exclusions> - <exclusion> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-core</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-protocol-ldap</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>kerberos-client</artifactId> - </dependency> - <dependency> - <groupId>org.apache.directory.shared</groupId> - <artifactId>shared-ldap</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>1.7.20</version> http://git-wip-us.apache.org/repos/asf/ambari/blob/748302f6/ambari-project/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-project/pom.xml b/ambari-project/pom.xml index e4d4423..f6e3bc7 100644 --- a/ambari-project/pom.xml +++ b/ambari-project/pom.xml @@ -162,57 +162,6 @@ <version>2.0.4.RELEASE</version> </dependency> <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-server-annotations</artifactId> - <version>2.0.0-M19</version> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-core-integ</artifactId> - <version>2.0.0-M19</version> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-server-integ</artifactId> - <version>2.0.0-M19</version> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-jdbm</artifactId> - <version>2.0.0-M5</version> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-kerberos-codec</artifactId> - <version>2.0.0-M19</version> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-core</artifactId> - <version>2.0.0-M19</version> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>kerberos-client</artifactId> - <version>2.0.0-M19</version> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-protocol-ldap</artifactId> - <version>2.0.0-M19</version> - <exclusions> - <exclusion> - <groupId>org.apache.directory.jdbm</groupId> - <artifactId>apacheds-jdbm1</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.directory.shared</groupId> - <artifactId>shared-ldap</artifactId> - <version>0.9.17</version> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> <version>${slf4j.version}</version> http://git-wip-us.apache.org/repos/asf/ambari/blob/748302f6/ambari-server/pom.xml ---------------------------------------------------------------------- diff --git a/ambari-server/pom.xml b/ambari-server/pom.xml index 8d52821..a86acf5 100644 --- a/ambari-server/pom.xml +++ b/ambari-server/pom.xml @@ -1225,73 +1225,6 @@ <artifactId>spring-ldap-core</artifactId> </dependency> <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-server-annotations</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-core-integ</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-server-integ</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-jdbm</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-kerberos-codec</artifactId> - <exclusions> - <exclusion> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-core</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache-core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>apacheds-protocol-ldap</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.directory.server</groupId> - <artifactId>kerberos-client</artifactId> - </dependency> - <dependency> - <groupId>org.apache.directory.shared</groupId> - <artifactId>shared-ldap</artifactId> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> @@ -1622,6 +1555,12 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-auth</artifactId> <version>${hadoop.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.directory.server</groupId> + <artifactId>apacheds-kerberos-codec</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -1689,9 +1628,14 @@ <version>4.2.2</version> </dependency> <dependency> - <groupId>org.apache.directory.api</groupId> - <artifactId>api-all</artifactId> - <version>${ldap-api.version}</version> + <groupId>org.apache.directory.server</groupId> + <artifactId>apacheds-all</artifactId> + <version>2.0.0-M24</version> + </dependency> + <dependency> + <groupId>org.apache.directory.server</groupId> + <artifactId>kerberos-client</artifactId> + <version>2.0.0-M24</version> </dependency> <dependency> <groupId>com.networknt</groupId>
