JAMES-2615 Update dependency for merged data-ldap module
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/077f51cf Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/077f51cf Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/077f51cf Branch: refs/heads/master Commit: 077f51cf39044ffebe35eab58304bc1184333c3a Parents: 00ace5d Author: datph <[email protected]> Authored: Fri Nov 30 10:19:19 2018 +0700 Committer: Benoit Tellier <[email protected]> Committed: Mon Dec 3 08:55:53 2018 +0700 ---------------------------------------------------------------------- pom.xml | 5 -- .../guice/cassandra-ldap-guice/pom.xml | 7 +- .../guice/cassandra-rabbitmq-ldap-guice/pom.xml | 2 +- .../data/data-ldap-integration-testing/pom.xml | 86 -------------------- 4 files changed, 2 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/077f51cf/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d755d6a..300a18b 100644 --- a/pom.xml +++ b/pom.xml @@ -1241,11 +1241,6 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-data-ldap-integration-testing</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> <artifactId>james-server-data-library</artifactId> <version>${project.version}</version> </dependency> http://git-wip-us.apache.org/repos/asf/james-project/blob/077f51cf/server/container/guice/cassandra-ldap-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-ldap-guice/pom.xml b/server/container/guice/cassandra-ldap-guice/pom.xml index edeffb9..cea373c 100644 --- a/server/container/guice/cassandra-ldap-guice/pom.xml +++ b/server/container/guice/cassandra-ldap-guice/pom.xml @@ -71,12 +71,7 @@ </dependency> <dependency> <groupId>${james.groupId}</groupId> - <artifactId>james-server-data-ldap-integration-testing</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-data-ldap-integration-testing</artifactId> + <artifactId>james-server-data-ldap</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/077f51cf/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml index d2b5672..b6c68d9 100644 --- a/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml +++ b/server/container/guice/cassandra-rabbitmq-ldap-guice/pom.xml @@ -91,7 +91,7 @@ </dependency> <dependency> <groupId>org.apache.james</groupId> - <artifactId>james-server-data-ldap-integration-testing</artifactId> + <artifactId>james-server-data-ldap</artifactId> <type>test-jar</type> <version>${project.version}</version> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/james-project/blob/077f51cf/server/data/data-ldap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-ldap-integration-testing/pom.xml b/server/data/data-ldap-integration-testing/pom.xml deleted file mode 100644 index 4006dbe..0000000 --- a/server/data/data-ldap-integration-testing/pom.xml +++ /dev/null @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you under the Apache License, Version 2.0 (the - "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, - software distributed under the License is distributed on an - "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - KIND, either express or implied. See the License for the - specific language governing permissions and limitations - under the License. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.apache.james</groupId> - <artifactId>james-server</artifactId> - <version>3.3.0-SNAPSHOT</version> - <relativePath>../../pom.xml</relativePath> - </parent> - - <artifactId>james-server-data-ldap-integration-testing</artifactId> - <packaging>bundle</packaging> - - <name>Apache James :: Server :: Data :: LDAP Implementation :: Integration testing</name> - - <dependencies> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-data-ldap</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-util</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>james-server-testing</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.mockito</groupId> - <artifactId>mockito-core</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - </dependency> - <dependency> - <groupId>org.testcontainers</groupId> - <artifactId>testcontainers</artifactId> - <scope>test</scope> - </dependency> - </dependencies> -</project> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
