You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by kr...@apache.org on 2018/12/12 20:34:37 UTC
knox git commit: KNOX-1638 - Migrate from apacheds-all to specific
apacheds dependencies
Repository: knox
Updated Branches:
refs/heads/master aa4ef4758 -> 59954fb32
KNOX-1638 - Migrate from apacheds-all to specific apacheds dependencies
Signed-off-by: Kevin Risden <kr...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/59954fb3
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/59954fb3
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/59954fb3
Branch: refs/heads/master
Commit: 59954fb32b4a7bc5ec439751495a7491f158a492
Parents: aa4ef47
Author: Kevin Risden <kr...@apache.org>
Authored: Thu Dec 6 15:46:23 2018 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Wed Dec 12 15:09:52 2018 -0500
----------------------------------------------------------------------
gateway-demo-ldap/pom.xml | 46 ++++++++++++++++++++----
gateway-test-release-utils/pom.xml | 25 +++++--------
gateway-test/pom.xml | 19 ++++++----
pom.xml | 63 ++++++++++++++++++++++++++++-----
4 files changed, 114 insertions(+), 39 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/59954fb3/gateway-demo-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-demo-ldap/pom.xml b/gateway-demo-ldap/pom.xml
index f6f936c..fcbb531 100644
--- a/gateway-demo-ldap/pom.xml
+++ b/gateway-demo-ldap/pom.xml
@@ -32,13 +32,45 @@
<dependencies>
<dependency>
<groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-all</artifactId>
- <exclusions>
- <exclusion>
- <groupId>ldapsdk</groupId>
- <artifactId>ldapsdk</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>apacheds-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-shared</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-ldap</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-client-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-codec-standalone</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-model</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-util</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/knox/blob/59954fb3/gateway-test-release-utils/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test-release-utils/pom.xml b/gateway-test-release-utils/pom.xml
index 1f5c730..f23775e 100644
--- a/gateway-test-release-utils/pom.xml
+++ b/gateway-test-release-utils/pom.xml
@@ -46,23 +46,8 @@
<groupId>org.apache.knox</groupId>
<artifactId>gateway-release</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-all</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-all</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.apache.directory.api</groupId>
- <artifactId>api-ldap-schema-data</artifactId>
- </exclusion>
- </exclusions>
</dependency>
+
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
@@ -118,5 +103,13 @@
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-shared</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/knox/blob/59954fb3/gateway-test/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test/pom.xml b/gateway-test/pom.xml
index 8db50ee..302d839 100644
--- a/gateway-test/pom.xml
+++ b/gateway-test/pom.xml
@@ -135,6 +135,18 @@
</dependency>
<dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-shared</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
<scope>test</scope>
@@ -296,17 +308,10 @@
</dependency>
<dependency>
- <groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-all</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.jboss.shrinkwrap</groupId>
<artifactId>shrinkwrap-api</artifactId>
<scope>test</scope>
</dependency>
-
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/knox/blob/59954fb3/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7d1c0ca..416ffb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,7 +136,8 @@
<maven.compiler.target>8</maven.compiler.target>
<!-- Dependencies sorted alphabetically -->
- <apacheds.version>2.0.0-M24</apacheds.version>
+ <apacheds.directory.api.version>1.0.2</apacheds.directory.api.version>
+ <apacheds.directory.server.version>2.0.0-M24</apacheds.directory.server.version>
<apacheds-jdbm.version>2.0.0-M5</apacheds-jdbm.version>
<ant-nodeps.version>1.8.1</ant-nodeps.version>
<asm.version>7.0</asm.version>
@@ -200,6 +201,7 @@
<maven-enforcer-plugin.version>3.0.0-M2</maven-enforcer-plugin.version>
<maven-pmd-plugin.version>3.11.0</maven-pmd-plugin.version>
<metrics.version>4.0.3</metrics.version>
+ <mina.version>2.0.19</mina.version>
<nimbus-jose-jwt.version>6.5</nimbus-jose-jwt.version>
<okhttp.version>2.7.5</okhttp.version>
<pac4j.version>2.1.0</pac4j.version>
@@ -1501,21 +1503,64 @@
<artifactId>shrinkwrap-descriptors-impl-javaee</artifactId>
<version>${shrinkwrap.descriptors.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm</artifactId>
<version>${apacheds-jdbm.version}</version>
</dependency>
+
<dependency>
<groupId>org.apache.directory.server</groupId>
- <artifactId>apacheds-all</artifactId>
- <version>${apacheds.version}</version>
- <exclusions>
- <exclusion>
- <groupId>ldapsdk</groupId>
- <artifactId>ldapsdk</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>apacheds-core</artifactId>
+ <version>${apacheds.directory.server.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-annotations</artifactId>
+ <version>${apacheds.directory.server.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-core-api</artifactId>
+ <version>${apacheds.directory.server.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-shared</artifactId>
+ <version>${apacheds.directory.server.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.server</groupId>
+ <artifactId>apacheds-protocol-ldap</artifactId>
+ <version>${apacheds.directory.server.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-client-api</artifactId>
+ <version>${apacheds.directory.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-codec-standalone</artifactId>
+ <version>${apacheds.directory.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-ldap-model</artifactId>
+ <version>${apacheds.directory.api.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.directory.api</groupId>
+ <artifactId>api-util</artifactId>
+ <version>${apacheds.directory.api.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.mina</groupId>
+ <artifactId>mina-core</artifactId>
+ <version>${mina.version}</version>
</dependency>
<dependency>