Skip to content
Permalink
Browse files
Integrate managesieve in the current jSieve modules (JSIEVE-83) + Par…
…ent jSieve should be apache-sieve and not sieve-project (JSIEVE-84)

git-svn-id: https://svn.apache.org/repos/asf/james/jsieve/trunk@1291240 13f79535-47bb-0310-9956-ffa450edef68
  • Loading branch information
Eric Charles committed Feb 20, 2012
1 parent 9228f20 commit 4835c94ff6a292a142464bab96477914352ac985
Show file tree
Hide file tree
Showing 17 changed files with 63 additions and 47 deletions.
@@ -24,10 +24,10 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>jsieve-project</artifactId>
<artifactId>apache-jsieve</artifactId>
<groupId>org.apache.james</groupId>
<version>0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<relativePath>..</relativePath>
</parent>

<artifactId>apache-jsieve-mailet</artifactId>
@@ -51,7 +51,7 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve</artifactId>
<artifactId>apache-jsieve-core</artifactId>
</dependency>

<dependency>
@@ -24,13 +24,13 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>jsieve-project</artifactId>
<artifactId>apache-jsieve</artifactId>
<groupId>org.apache.james</groupId>
<version>0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<relativePath>..</relativePath>
</parent>

<artifactId>apache-jsieve</artifactId>
<artifactId>apache-jsieve-core</artifactId>
<packaging>jar</packaging>

<name>Apache JAMES jSieve</name>
@@ -19,13 +19,15 @@
<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">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.james</groupId>
<artifactId>managesieve</artifactId>
<version>0.0.1-SNAPSHOT</version>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-manager</artifactId>
<relativePath>..</relativePath>
<version>0.5-SNAPSHOT</version>
</parent>

<artifactId>managesieve-api</artifactId>
<artifactId>apache-jsieve-manager-api</artifactId>
<packaging>jar</packaging>

</project>
Empty file.
@@ -20,25 +20,26 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>managesieve</artifactId>
<version>0.0.1-SNAPSHOT</version>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-manager</artifactId>
<version>0.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>managesieve-core</artifactId>
<artifactId>apache-jsieve-manager-core</artifactId>
<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managesieve-api</artifactId>
<artifactId>apache-jsieve-manager-api</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managesieve-mock</artifactId>
<artifactId>apache-jsieve-manager-mock</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>test</scope>
Empty file.
@@ -19,27 +19,28 @@
<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">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.apache.james</groupId>
<artifactId>managesieve</artifactId>
<version>0.0.1-SNAPSHOT</version>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-manager</artifactId>
<version>0.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>managesieve-jsieve</artifactId>
<artifactId>apache-jsieve-manager-jsieve</artifactId>
<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managesieve-core</artifactId>
<artifactId>apache-jsieve-manager-core</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve</artifactId>
<version>${jsieve.version}</version>
<artifactId>apache-jsieve-core</artifactId>
<type>jar</type>
<scope>compile</scope>
</dependency>
Empty file.
@@ -20,18 +20,18 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>managesieve</artifactId>
<version>0.0.1-SNAPSHOT</version>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-manager</artifactId>
<version>0.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<groupId>org.apache.james</groupId>
<artifactId>managesieve-mailet</artifactId>
<artifactId>apache-jsieve-manager-mailet</artifactId>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managesieve-core</artifactId>
<artifactId>apache-jsieve-manager-core</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
@@ -50,7 +50,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managesieve-mock</artifactId>
<artifactId>apache-jsieve-manager-mock</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>test</scope>
Empty file.
@@ -21,17 +21,18 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>managesieve</artifactId>
<version>0.0.1-SNAPSHOT</version>
<artifactId>apache-jsieve-manager</artifactId>
<version>0.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>managesieve-mock</artifactId>
<artifactId>apache-jsieve-manager-mock</artifactId>
<packaging>jar</packaging>

<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managesieve-api</artifactId>
<artifactId>apache-jsieve-manager-api</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
Empty file.
@@ -19,11 +19,16 @@
<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">
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.james</groupId>
<artifactId>managesieve</artifactId>
<version>0.0.1-SNAPSHOT</version>
<artifactId>apache-jsieve-manager</artifactId>
<packaging>pom</packaging>

<parent>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve</artifactId>
<version>0.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<modules>
<module>api</module>
<module>core</module>
@@ -62,7 +67,6 @@
<properties>
<target.jdk>1.6</target.jdk>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jsieve.version>0.5-SNAPSHOT</jsieve.version>
<commons-io.version>2.1</commons-io.version>
<james-server.version>3.0-beta4-SNAPSHOT</james-server.version>
<mailet.version>2.4</mailet.version>
@@ -20,12 +20,13 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.james</groupId>
<artifactId>managesieve</artifactId>
<version>0.0.1-SNAPSHOT</version>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-manager</artifactId>
<version>0.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

<artifactId>managesieve-server</artifactId>
<artifactId>apache-jsieve-manager-server</artifactId>
<packaging>jar</packaging>

<dependencies>
@@ -43,7 +44,7 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>managesieve-core</artifactId>
<artifactId>apache-jsieve-manager-core</artifactId>
<version>${project.version}</version>
<type>jar</type>
<scope>compile</scope>
Empty file.
@@ -30,7 +30,7 @@
<relativePath></relativePath>
</parent>

<artifactId>jsieve-project</artifactId>
<artifactId>apache-jsieve</artifactId>
<version>0.5-SNAPSHOT</version>
<packaging>pom</packaging>

@@ -43,6 +43,7 @@
<module>main</module>
<module>mailet</module>
<module>util</module>
<module>manager</module>
<module>assemble</module>
</modules>

@@ -100,6 +101,11 @@
<artifactId>apache-jsieve</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve-mailet</artifactId>
@@ -24,10 +24,10 @@
<modelVersion>4.0.0</modelVersion>

<parent>
<artifactId>jsieve-project</artifactId>
<artifactId>apache-jsieve</artifactId>
<groupId>org.apache.james</groupId>
<version>0.5-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
<relativePath>..</relativePath>
</parent>

<artifactId>apache-jsieve-util</artifactId>
@@ -51,7 +51,7 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-jsieve</artifactId>
<artifactId>apache-jsieve-core</artifactId>
</dependency>

<dependency>

0 comments on commit 4835c94

Please sign in to comment.