This is an automated email from the ASF dual-hosted git repository. btellier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit fce129b996c56af70f834f3a20586f980f4a3159 Author: Benoit Tellier <[email protected]> AuthorDate: Wed Sep 18 11:06:38 2019 +0700 JAMES-2886 Relocate custom-mailets into a guice/testing pom --- server/container/guice/pom.xml | 2 +- .../guice/{ => testing}/custom-mailets/README.md | 0 .../guice/{ => testing}/custom-mailets/pom.xml | 0 .../java/com/custom/mailets/AnotherMailet.java | 0 .../java/com/custom/matchers/AnotherMatcher.java | 0 .../james/transport/mailets/CustomMailet.java | 0 .../james/transport/matchers/CustomMatcher.java | 0 .../guice/{custom-mailets => testing}/pom.xml | 33 ++++++++-------------- 8 files changed, 12 insertions(+), 23 deletions(-) diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index 943426b..8d5b40b 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -42,7 +42,6 @@ <module>cassandra-rabbitmq-guice</module> <module>cassandra-rabbitmq-ldap-guice</module> <module>configuration</module> - <module>custom-mailets</module> <module>es-metric-reporter</module> <module>guice-common</module> <module>guice-utils</module> @@ -75,6 +74,7 @@ <module>protocols/webadmin-swagger</module> <module>activemq</module> <module>rabbitmq</module> + <module>testing</module> </modules> <dependencyManagement> diff --git a/server/container/guice/custom-mailets/README.md b/server/container/guice/testing/custom-mailets/README.md similarity index 100% rename from server/container/guice/custom-mailets/README.md rename to server/container/guice/testing/custom-mailets/README.md diff --git a/server/container/guice/custom-mailets/pom.xml b/server/container/guice/testing/custom-mailets/pom.xml similarity index 100% copy from server/container/guice/custom-mailets/pom.xml copy to server/container/guice/testing/custom-mailets/pom.xml diff --git a/server/container/guice/custom-mailets/src/main/java/com/custom/mailets/AnotherMailet.java b/server/container/guice/testing/custom-mailets/src/main/java/com/custom/mailets/AnotherMailet.java similarity index 100% rename from server/container/guice/custom-mailets/src/main/java/com/custom/mailets/AnotherMailet.java rename to server/container/guice/testing/custom-mailets/src/main/java/com/custom/mailets/AnotherMailet.java diff --git a/server/container/guice/custom-mailets/src/main/java/com/custom/matchers/AnotherMatcher.java b/server/container/guice/testing/custom-mailets/src/main/java/com/custom/matchers/AnotherMatcher.java similarity index 100% rename from server/container/guice/custom-mailets/src/main/java/com/custom/matchers/AnotherMatcher.java rename to server/container/guice/testing/custom-mailets/src/main/java/com/custom/matchers/AnotherMatcher.java diff --git a/server/container/guice/custom-mailets/src/main/java/org/apache/james/transport/mailets/CustomMailet.java b/server/container/guice/testing/custom-mailets/src/main/java/org/apache/james/transport/mailets/CustomMailet.java similarity index 100% rename from server/container/guice/custom-mailets/src/main/java/org/apache/james/transport/mailets/CustomMailet.java rename to server/container/guice/testing/custom-mailets/src/main/java/org/apache/james/transport/mailets/CustomMailet.java diff --git a/server/container/guice/custom-mailets/src/main/java/org/apache/james/transport/matchers/CustomMatcher.java b/server/container/guice/testing/custom-mailets/src/main/java/org/apache/james/transport/matchers/CustomMatcher.java similarity index 100% rename from server/container/guice/custom-mailets/src/main/java/org/apache/james/transport/matchers/CustomMatcher.java rename to server/container/guice/testing/custom-mailets/src/main/java/org/apache/james/transport/matchers/CustomMatcher.java diff --git a/server/container/guice/custom-mailets/pom.xml b/server/container/guice/testing/pom.xml similarity index 58% rename from server/container/guice/custom-mailets/pom.xml rename to server/container/guice/testing/pom.xml index ff7c8d8..06f8524 100644 --- a/server/container/guice/custom-mailets/pom.xml +++ b/server/container/guice/testing/pom.xml @@ -17,33 +17,22 @@ 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/xsd/maven-4.0.0.xsd";> +<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-guice</artifactId> + <artifactId>james-server</artifactId> <version>3.5.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> - <artifactId>james-server-guice-custom-mailets</artifactId> - - <name>Apache James :: Server :: Guice :: Mailet :: Custom testing mailets</name> - <description>Custom testing mailets</description> + <artifactId>james-server-guice-testing</artifactId> + <packaging>pom</packaging> + <name>Apache James :: Server :: Guice :: testing</name> - <dependencies> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-api</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>apache-mailet-base</artifactId> - </dependency> - <dependency> - <groupId>${james.groupId}</groupId> - <artifactId>testing-base</artifactId> - <scope>test</scope> - </dependency> - </dependencies> -</project> + <modules> + <module>custom-mailets</module> + </modules> +</project> \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
