You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2016/03/21 16:07:21 UTC
[1/5] james-project git commit: JAMES-1707 Don't override surefire
configuration in each profiles
Repository: james-project
Updated Branches:
refs/heads/master 990a3bf96 -> 872d85b57
JAMES-1707 Don't override surefire configuration in each profiles
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/872d85b5
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/872d85b5
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/872d85b5
Branch: refs/heads/master
Commit: 872d85b5736707f13165ec584942fcac80e3e21e
Parents: 5e6828e
Author: Antoine Duprat <ad...@linagora.com>
Authored: Fri Mar 11 14:59:19 2016 +0100
Committer: Matthieu Baechler <ma...@linagora.com>
Committed: Mon Mar 21 15:55:48 2016 +0100
----------------------------------------------------------------------
mpt/impl/imap-mailbox/core/pom.xml | 17 ---
mpt/impl/imap-mailbox/hbase/pom.xml | 17 ---
mpt/impl/imap-mailbox/inmemory/pom.xml | 15 ---
mpt/impl/imap-mailbox/jcr/pom.xml | 15 ---
mpt/impl/imap-mailbox/jpa/pom.xml | 15 ---
mpt/impl/imap-mailbox/maildir/pom.xml | 15 ---
mpt/impl/imap-mailbox/pom.xml | 190 ++++++++--------------------
7 files changed, 54 insertions(+), 230 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/872d85b5/mpt/impl/imap-mailbox/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/core/pom.xml b/mpt/impl/imap-mailbox/core/pom.xml
index 34d679e..3d4c58a 100644
--- a/mpt/impl/imap-mailbox/core/pom.xml
+++ b/mpt/impl/imap-mailbox/core/pom.xml
@@ -103,22 +103,5 @@
<artifactId>slf4j-simple</artifactId>
</dependency>
</dependencies>
-
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/872d85b5/mpt/impl/imap-mailbox/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/pom.xml b/mpt/impl/imap-mailbox/hbase/pom.xml
index ef49fbf..cdbbae0 100644
--- a/mpt/impl/imap-mailbox/hbase/pom.xml
+++ b/mpt/impl/imap-mailbox/hbase/pom.xml
@@ -69,22 +69,5 @@
<scope>test</scope>
</dependency>
</dependencies>
-
-
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/872d85b5/mpt/impl/imap-mailbox/inmemory/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/inmemory/pom.xml b/mpt/impl/imap-mailbox/inmemory/pom.xml
index 8741e1e..5b66916 100644
--- a/mpt/impl/imap-mailbox/inmemory/pom.xml
+++ b/mpt/impl/imap-mailbox/inmemory/pom.xml
@@ -44,20 +44,5 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/872d85b5/mpt/impl/imap-mailbox/jcr/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jcr/pom.xml b/mpt/impl/imap-mailbox/jcr/pom.xml
index ad84b2d..9100b33 100644
--- a/mpt/impl/imap-mailbox/jcr/pom.xml
+++ b/mpt/impl/imap-mailbox/jcr/pom.xml
@@ -56,20 +56,5 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/872d85b5/mpt/impl/imap-mailbox/jpa/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/jpa/pom.xml b/mpt/impl/imap-mailbox/jpa/pom.xml
index dce875b..859a2b5 100644
--- a/mpt/impl/imap-mailbox/jpa/pom.xml
+++ b/mpt/impl/imap-mailbox/jpa/pom.xml
@@ -49,20 +49,5 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/872d85b5/mpt/impl/imap-mailbox/maildir/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/maildir/pom.xml b/mpt/impl/imap-mailbox/maildir/pom.xml
index f1c33b9..e9e58ae 100644
--- a/mpt/impl/imap-mailbox/maildir/pom.xml
+++ b/mpt/impl/imap-mailbox/maildir/pom.xml
@@ -44,20 +44,5 @@
<scope>test</scope>
</dependency>
</dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/872d85b5/mpt/impl/imap-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/pom.xml b/mpt/impl/imap-mailbox/pom.xml
index 8f7bb2c..d326e69 100644
--- a/mpt/impl/imap-mailbox/pom.xml
+++ b/mpt/impl/imap-mailbox/pom.xml
@@ -107,168 +107,86 @@
</dependencies>
</dependencyManagement>
+ <properties>
+ <cassandra.includes>empty</cassandra.includes>
+ <hbase.includes>empty</hbase.includes>
+ <inmemory.includes>empty</inmemory.includes>
+ <jcr.includes>empty</jcr.includes>
+ <jpa.includes>empty</jpa.includes>
+ <maildir.includes>empty</maildir.includes>
+ <cyrus.includes>empty</cyrus.includes>
+ <elasticsearch.includes>empty</elasticsearch.includes>
+ </properties>
<profiles>
<profile>
<id>cassandra</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/cassandra/**/*.java</include>
- </includes>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <cassandra.includes>**/cassandra/**/*.java</cassandra.includes>
+ </properties>
</profile>
<profile>
<id>hbase</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/hbase/**/*.java</include>
- </includes>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <hbase.includes>**/hbase/**/*.java</hbase.includes>
+ </properties>
</profile>
<profile>
<id>inmemory</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/inmemory/**/*.java</include>
- </includes>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <inmemory.includes>**/inmemory/**/*.java</inmemory.includes>
+ </properties>
</profile>
<profile>
<id>jcr</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/jcr/**/*.java</include>
- </includes>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <jcr.includes>**/jcr/**/*.java</jcr.includes>
+ </properties>
</profile>
<profile>
<id>jpa</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/jpa/**/*.java</include>
- </includes>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <jpa.includes>**/jpa/**/*.java</jpa.includes>
+ </properties>
</profile>
<profile>
<id>maildir</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/maildir/**/*.java</include>
- </includes>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <maildir.includes>**/maildir/**/*.java</maildir.includes>
+ </properties>
</profile>
<profile>
<id>cyrus</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/cyrus/**/*.java</include>
- </includes>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <cyrus.includes>**/cyrus/**/*.java</cyrus.includes>
+ </properties>
</profile>
<profile>
<id>elasticsearch</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <includes>
- <include>**/elasticsearch/**/*.java</include>
- </includes>
- <excludes>
- <exclude>**/suite/*.java</exclude>
- <exclude>**/suite/**/*.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <properties>
+ <elasticsearch.includes>**/elasticsearch/**/*.java</elasticsearch.includes>
+ </properties>
</profile>
</profiles>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/suite/*.java</exclude>
+ <exclude>**/suite/**/*.java</exclude>
+ </excludes>
+ <includes>
+ <include>${cassandra.includes}, ${hbase.includes}, ${inmemory.includes}, ${jcr.includes}, ${jpa.includes}, ${maildir.includes}, ${cyrus.includes}, ${elasticsearch.includes}</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/5] james-project git commit: JAMES-1707 Upgrade surefire version
Posted by ma...@apache.org.
JAMES-1707 Upgrade surefire version
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/3c56b61d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/3c56b61d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/3c56b61d
Branch: refs/heads/master
Commit: 3c56b61dc659be7c5d55418220bea38e2a902b65
Parents: 990a3bf
Author: Antoine Duprat <ad...@linagora.com>
Authored: Fri Mar 11 14:56:04 2016 +0100
Committer: Matthieu Baechler <ma...@linagora.com>
Committed: Mon Mar 21 15:55:48 2016 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/3c56b61d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ed65783..7a8e06b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -793,7 +793,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
+ <version>2.19</version>
<configuration>
<argLine>-Xms256m -Xmx512m</argLine>
<forkMode>always</forkMode>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[4/5] james-project git commit: JAMES-1707 Add missing mailet
configuration
Posted by ma...@apache.org.
JAMES-1707 Add missing mailet configuration
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/5e6828ea
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/5e6828ea
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/5e6828ea
Branch: refs/heads/master
Commit: 5e6828ea15efa3105df39af262ddc013a3162cda
Parents: cfa7e14
Author: Antoine Duprat <ad...@linagora.com>
Authored: Fri Mar 11 14:57:58 2016 +0100
Committer: Matthieu Baechler <ma...@linagora.com>
Committed: Mon Mar 21 15:55:48 2016 +0100
----------------------------------------------------------------------
mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/5e6828ea/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml b/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
index c9d84eb..12770b4 100644
--- a/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
+++ b/mpt/impl/smtp/cassandra/src/test/resources/mailetcontainer.xml
@@ -61,6 +61,9 @@
<name>X-WasSigned</name>
<value>true</value>
</mailet>
+ <mailet match="All" class="RemoveMimeHeader">
+ <name>bcc</name>
+ </mailet>
<mailet match="All" class="RecipientRewriteTable" />
<!-- <mailet match="HostIsLocal" class="ToProcessor">
<processor>local-address-error</processor>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/5] james-project git commit: JAMES-1707 Give a better name to
child projects
Posted by ma...@apache.org.
JAMES-1707 Give a better name to child projects
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/cfa7e144
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/cfa7e144
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/cfa7e144
Branch: refs/heads/master
Commit: cfa7e144215c6d002a114b155a0d294e743f2ac0
Parents: af61e02
Author: Antoine Duprat <ad...@linagora.com>
Authored: Fri Mar 11 14:57:30 2016 +0100
Committer: Matthieu Baechler <ma...@linagora.com>
Committed: Mon Mar 21 15:55:48 2016 +0100
----------------------------------------------------------------------
mpt/impl/smtp/cassandra/pom.xml | 2 +-
mpt/impl/smtp/core/pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/cfa7e144/mpt/impl/smtp/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml
index 3c4d5c1..e553987 100644
--- a/mpt/impl/smtp/cassandra/pom.xml
+++ b/mpt/impl/smtp/cassandra/pom.xml
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <name>Apache James MPT SMTP</name>
+ <name>Apache James MPT SMTP Cassandra</name>
<artifactId>apache-james-mpt-smtp-cassandra</artifactId>
<packaging>jar</packaging>
http://git-wip-us.apache.org/repos/asf/james-project/blob/cfa7e144/mpt/impl/smtp/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/pom.xml b/mpt/impl/smtp/core/pom.xml
index b3609f1..a61d24e 100644
--- a/mpt/impl/smtp/core/pom.xml
+++ b/mpt/impl/smtp/core/pom.xml
@@ -8,7 +8,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
- <name>Apache James MPT SMTP</name>
+ <name>Apache James MPT SMTP Core</name>
<artifactId>apache-james-mpt-smtp-core</artifactId>
<packaging>jar</packaging>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[5/5] james-project git commit: JAMES-1707 Upgrade testcontainers
version
Posted by ma...@apache.org.
JAMES-1707 Upgrade testcontainers version
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/af61e02d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/af61e02d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/af61e02d
Branch: refs/heads/master
Commit: af61e02dffe19ff72ca520adca58ed163dfa4cb1
Parents: 3c56b61
Author: Antoine Duprat <ad...@linagora.com>
Authored: Fri Mar 11 14:56:27 2016 +0100
Committer: Matthieu Baechler <ma...@linagora.com>
Committed: Mon Mar 21 15:55:48 2016 +0100
----------------------------------------------------------------------
mpt/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/af61e02d/mpt/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/pom.xml b/mpt/pom.xml
index a4e72f3..7b63477 100644
--- a/mpt/pom.xml
+++ b/mpt/pom.xml
@@ -431,7 +431,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2</version>
</dependency>
</dependencies>
</dependencyManagement>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org