Simply declare the needed dependecies for the distribution, voodoo maven will pick the transitive ones - Still NOTICE and LICENCE to fix for jsieve 0.5 release.
git-svn-id: https://svn.apache.org/repos/asf/james/jsieve/trunk@1292222 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/all/pom.xml b/all/pom.xml
index 69c64b9..c667a5a 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -44,57 +44,33 @@
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-mailet</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-util</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet</artifactId>
+ <artifactId>apache-jsieve-manager-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mailet-base</artifactId>
+ <artifactId>apache-jsieve-manager-core</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j-core</artifactId>
+ <artifactId>apache-jsieve-manager-jsieve</artifactId>
</dependency>
-
<dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager-mailet</artifactId>
</dependency>
-
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager-mock</artifactId>
</dependency>
</dependencies>
diff --git a/all/src/assemble/bin.xml b/all/src/assemble/bin.xml
index 8c4f2a4..635b421 100644
--- a/all/src/assemble/bin.xml
+++ b/all/src/assemble/bin.xml
@@ -37,6 +37,13 @@
</includes>
</fileSet>
<fileSet>
+ <directory>${project.basedir}/../core/target</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>apache-jsieve*.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>${project.basedir}/../mailet/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
@@ -51,20 +58,6 @@
</includes>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../core/target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>apache-jsieve*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>${project.basedir}/../manager/target</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>apache-jsieve*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
<directory>${project.basedir}/../manager/api/target</directory>
<outputDirectory>/</outputDirectory>
<includes>
diff --git a/pom.xml b/pom.xml
index 3a9f352..a1787bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,6 +114,31 @@
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager-jsieve</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager-mailet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-jsieve-manager-mock</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>apache-mailet</artifactId>
<version>2.4</version>
</dependency>
