Fix compilation error when no maven profile given
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/efed669b Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/efed669b Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/efed669b Branch: refs/heads/master Commit: efed669b3d02a75e1993fb52549909e13e8e8db2 Parents: 233a71d Author: Antoine Duprat <[email protected]> Authored: Thu Mar 24 15:07:28 2016 +0100 Committer: Antoine Duprat <[email protected]> Committed: Tue Mar 29 10:25:03 2016 +0200 ---------------------------------------------------------------------- mpt/impl/smtp/cassandra/pom.xml | 32 +++++++++++++++- server/container/guice/cassandra-guice/pom.xml | 41 ++++++++++++++++----- server/container/guice/pom.xml | 17 +-------- 3 files changed, 65 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/efed669b/mpt/impl/smtp/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml index ab2e539..cc46cd1 100644 --- a/mpt/impl/smtp/cassandra/pom.xml +++ b/mpt/impl/smtp/cassandra/pom.xml @@ -13,6 +13,10 @@ <artifactId>apache-james-mpt-smtp-cassandra</artifactId> <packaging>jar</packaging> + <properties> + <cassandra.includes>empty</cassandra.includes> + </properties> + <profiles> <profile> <id>noTest</id> @@ -210,6 +214,12 @@ </build> </profile> <profile> + <id>cassandra</id> + <properties> + <cassandra.includes>**/*.java</cassandra.includes> + </properties> + </profile> + <profile> <id>disable-animal-sniffer</id> <activation> <jdk>[1.6,)</jdk> @@ -230,8 +240,28 @@ </build> </profile> </profiles> - <build> + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <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}</include> + </includes> + </configuration> + </plugin> + </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/james-project/blob/efed669b/server/container/guice/cassandra-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/cassandra-guice/pom.xml b/server/container/guice/cassandra-guice/pom.xml index 31d62da..b66fa2e 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/container/guice/cassandra-guice/pom.xml @@ -35,15 +35,9 @@ <name>Apache James :: Server :: Cassandra - guice injection</name> <description>An advanced email server - Cassandra backend with guice injection</description> - <build> - <plugins> - <plugin> - <groupId>org.apache.felix</groupId> - <artifactId>maven-bundle-plugin</artifactId> - <extensions>true</extensions> - </plugin> - </plugins> - </build> + <properties> + <cassandra.includes>empty</cassandra.includes> + </properties> <profiles> <profile> @@ -268,6 +262,12 @@ </dependencies> </profile> <profile> + <id>cassandra</id> + <properties> + <cassandra.includes>**/*.java</cassandra.includes> + </properties> + </profile> + <profile> <id>disable-animal-sniffer</id> <activation> <jdk>[1.6,)</jdk> @@ -288,4 +288,27 @@ </build> </profile> </profiles> + + <build> + <plugins> + <plugin> + <groupId>org.apache.felix</groupId> + <artifactId>maven-bundle-plugin</artifactId> + <extensions>true</extensions> + </plugin> + <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}</include> + </includes> + </configuration> + </plugin> + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/james-project/blob/efed669b/server/container/guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/pom.xml b/server/container/guice/pom.xml index 8c695e8..14f774a 100644 --- a/server/container/guice/pom.xml +++ b/server/container/guice/pom.xml @@ -37,21 +37,8 @@ <modules> <module>guice-common</module> + <module>cassandra-guice</module> + <module>memory-guice</module> </modules> - - <profiles> - <profile> - <id>cassandra</id> - <modules> - <module>cassandra-guice</module> - </modules> - </profile> - <profile> - <id>inmemory</id> - <modules> - <module>memory-guice</module> - </modules> - </profile> - </profiles> </project> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
