Skip to content

Commit

Permalink
KNOX-1638 - Migrate from apacheds-all to specific apacheds dependencies
Browse files Browse the repository at this point in the history 
Signed-off-by: Kevin Risden <[email protected]>
  • Loading branch information
@risdenk
risdenk committed Dec 12, 2018
1 parent aa4ef47 commit 59954fb
Show file tree
Hide file tree
Showing 4 changed files with 114 additions and 39 deletions.
46 changes: 39 additions & 7 deletions gateway-demo-ldap/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
25 changes: 9 additions & 16 deletions gateway-test-release-utils/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
19 changes: 12 additions & 7 deletions gateway-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,18 @@
<scope>test</scope>
</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>
Expand Down Expand Up @@ -295,18 +307,11 @@
<scope>test</scope>
</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>
Expand Down
63 changes: 54 additions & 9 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down

0 comments on commit 59954fb

Please sign in to comment.