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 <adup...@linagora.com> Authored: Fri Mar 11 14:59:19 2016 +0100 Committer: Matthieu Baechler <matthieu.baech...@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-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
