JAMES-1757 Activate animal-sniffer everywhere Because of bogs, animal sniffer is not activated on :
- server spring - data-jpa - queue-file Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e7afc88d Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e7afc88d Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e7afc88d Branch: refs/heads/master Commit: e7afc88d00325002cb76cf94072440dcafe11b3f Parents: 2c860c6 Author: Benoit Tellier <[email protected]> Authored: Mon Jun 13 17:30:28 2016 +0700 Committer: Benoit Tellier <[email protected]> Committed: Tue Jun 14 15:45:02 2016 +0700 ---------------------------------------------------------------------- backends-common/cassandra/pom.xml | 18 +++++++++++--- mailbox/cassandra/pom.xml | 18 +++++++++++--- mailbox/elasticsearch/pom.xml | 18 +++++++++++--- mailbox/kafka/pom.xml | 18 +++++++++++--- mailbox/pom.xml | 21 ---------------- mailbox/tika/pom.xml | 18 +++++++++++--- mpt/impl/imap-mailbox/cassandra/pom.xml | 18 +++++++++++--- mpt/impl/imap-mailbox/cyrus/pom.xml | 18 +++++++++++--- mpt/impl/imap-mailbox/elasticsearch/pom.xml | 18 +++++++++++--- mpt/impl/imap-mailbox/external-james/pom.xml | 18 +++++++++++--- mpt/impl/managesieve/cassandra/pom.xml | 18 +++++++++++--- mpt/impl/smtp/cassandra/pom.xml | 18 +++++++++++--- mpt/impl/smtp/core/pom.xml | 18 +++++++++++--- pom.xml | 26 ++++++++++++++++++++ server/container/guice/cassandra-guice/pom.xml | 18 +++++++++++--- server/container/guice/guice-common/pom.xml | 18 +++++++++++--- server/container/guice/memory-guice/pom.xml | 18 +++++++++++--- server/container/jetty/pom.xml | 19 +++++++++++--- server/container/spring/pom.xml | 10 ++++++++ server/container/util-java8/pom.xml | 18 +++++++++++--- server/data/data-cassandra/pom.xml | 18 +++++++++++--- server/data/data-jmap-cassandra/pom.xml | 18 +++++++++++--- server/data/data-jmap/pom.xml | 18 +++++++++++--- server/data/data-jpa/pom.xml | 10 ++++++++ .../cassandra-jmap-integration-testing/pom.xml | 18 +++++++++++--- .../jmap-integration-testing-common/pom.xml | 18 +++++++++++--- .../memory-jmap-integration-testing/pom.xml | 18 +++++++++++--- server/protocols/jmap/pom.xml | 18 +++++++++++--- server/queue/queue-file/pom.xml | 10 ++++++++ 29 files changed, 393 insertions(+), 117 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/backends-common/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/backends-common/cassandra/pom.xml b/backends-common/cassandra/pom.xml index d8d158a..af87114 100644 --- a/backends-common/cassandra/pom.xml +++ b/backends-common/cassandra/pom.xml @@ -193,19 +193,29 @@ </build> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/mailbox/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml index a05adca..2712b76 100644 --- a/mailbox/cassandra/pom.xml +++ b/mailbox/cassandra/pom.xml @@ -283,19 +283,29 @@ </build> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/mailbox/elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/elasticsearch/pom.xml b/mailbox/elasticsearch/pom.xml index 39a6c28..793a05d 100644 --- a/mailbox/elasticsearch/pom.xml +++ b/mailbox/elasticsearch/pom.xml @@ -264,19 +264,29 @@ </dependencies> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/mailbox/kafka/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/kafka/pom.xml b/mailbox/kafka/pom.xml index 6b0bf02..66177e9 100644 --- a/mailbox/kafka/pom.xml +++ b/mailbox/kafka/pom.xml @@ -208,19 +208,29 @@ </build> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/mailbox/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/pom.xml b/mailbox/pom.xml index 3dbefd9..a5e5d64 100644 --- a/mailbox/pom.xml +++ b/mailbox/pom.xml @@ -612,27 +612,6 @@ <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>animal-sniffer-maven-plugin</artifactId> - <version>1.14</version> - <configuration> - <signature> - <groupId>org.codehaus.mojo.signature</groupId> - <artifactId>java16</artifactId> - <version>1.0</version> - </signature> - </configuration> - <executions> - <execution> - <id>check_java_6</id> - <phase>test</phase> - <goals> - <goal>check</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/mailbox/tika/pom.xml ---------------------------------------------------------------------- diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml index 2c8bf26..419479c 100644 --- a/mailbox/tika/pom.xml +++ b/mailbox/tika/pom.xml @@ -206,19 +206,29 @@ </build> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/mpt/impl/imap-mailbox/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cassandra/pom.xml b/mpt/impl/imap-mailbox/cassandra/pom.xml index d160324..07759f7 100644 --- a/mpt/impl/imap-mailbox/cassandra/pom.xml +++ b/mpt/impl/imap-mailbox/cassandra/pom.xml @@ -199,19 +199,29 @@ </build> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/mpt/impl/imap-mailbox/cyrus/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/cyrus/pom.xml b/mpt/impl/imap-mailbox/cyrus/pom.xml index a1ec235..843c07e 100644 --- a/mpt/impl/imap-mailbox/cyrus/pom.xml +++ b/mpt/impl/imap-mailbox/cyrus/pom.xml @@ -170,19 +170,29 @@ </build> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/mpt/impl/imap-mailbox/elasticsearch/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/elasticsearch/pom.xml b/mpt/impl/imap-mailbox/elasticsearch/pom.xml index 1100e49..d5a3a3f 100644 --- a/mpt/impl/imap-mailbox/elasticsearch/pom.xml +++ b/mpt/impl/imap-mailbox/elasticsearch/pom.xml @@ -183,19 +183,29 @@ </build> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/mpt/impl/imap-mailbox/external-james/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/imap-mailbox/external-james/pom.xml b/mpt/impl/imap-mailbox/external-james/pom.xml index c7293f9..b971d54 100644 --- a/mpt/impl/imap-mailbox/external-james/pom.xml +++ b/mpt/impl/imap-mailbox/external-james/pom.xml @@ -169,19 +169,29 @@ </properties> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/mpt/impl/managesieve/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/managesieve/cassandra/pom.xml b/mpt/impl/managesieve/cassandra/pom.xml index c823357..b51dbd2 100644 --- a/mpt/impl/managesieve/cassandra/pom.xml +++ b/mpt/impl/managesieve/cassandra/pom.xml @@ -178,19 +178,29 @@ </build> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/mpt/impl/smtp/cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml index 4818bc9..1d75a8f 100644 --- a/mpt/impl/smtp/cassandra/pom.xml +++ b/mpt/impl/smtp/cassandra/pom.xml @@ -238,19 +238,29 @@ </properties> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/mpt/impl/smtp/core/pom.xml ---------------------------------------------------------------------- diff --git a/mpt/impl/smtp/core/pom.xml b/mpt/impl/smtp/core/pom.xml index 4a50f23..4d49091 100644 --- a/mpt/impl/smtp/core/pom.xml +++ b/mpt/impl/smtp/core/pom.xml @@ -202,19 +202,29 @@ </build> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7a8e06b..e90f8b1 100644 --- a/pom.xml +++ b/pom.xml @@ -982,6 +982,11 @@ </lifecycleMappingMetadata> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <version>1.15</version> + </plugin> </plugins> </pluginManagement> <plugins> @@ -1078,6 +1083,27 @@ </reportPlugins> </configuration> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <version>1.15</version> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java16</artifactId> + <version>1.1</version> + </signature> + </configuration> + <executions> + <execution> + <id>check_java_6</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/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 6db5da5..60a580d 100644 --- a/server/container/guice/cassandra-guice/pom.xml +++ b/server/container/guice/cassandra-guice/pom.xml @@ -282,19 +282,29 @@ </properties> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/server/container/guice/guice-common/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/guice-common/pom.xml b/server/container/guice/guice-common/pom.xml index 97d9b6c..b3109c9 100644 --- a/server/container/guice/guice-common/pom.xml +++ b/server/container/guice/guice-common/pom.xml @@ -273,19 +273,29 @@ </dependencies> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/server/container/guice/memory-guice/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml index 393d866..53124a1 100644 --- a/server/container/guice/memory-guice/pom.xml +++ b/server/container/guice/memory-guice/pom.xml @@ -238,19 +238,29 @@ </dependencies> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/server/container/jetty/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/jetty/pom.xml b/server/container/jetty/pom.xml index 422a3bf..7323264 100644 --- a/server/container/jetty/pom.xml +++ b/server/container/jetty/pom.xml @@ -183,19 +183,30 @@ </build> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <version>1.15</version> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/server/container/spring/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/spring/pom.xml b/server/container/spring/pom.xml index 9bb6f27..dd21122 100644 --- a/server/container/spring/pom.xml +++ b/server/container/spring/pom.xml @@ -160,6 +160,16 @@ <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <executions> + <execution> + <id>check_java_6</id> + <phase>none</phase> + </execution> + </executions> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/server/container/util-java8/pom.xml ---------------------------------------------------------------------- diff --git a/server/container/util-java8/pom.xml b/server/container/util-java8/pom.xml index fc851f4..3daa21f 100644 --- a/server/container/util-java8/pom.xml +++ b/server/container/util-java8/pom.xml @@ -163,19 +163,29 @@ </build> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/server/data/data-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml index f37e520..5b3ac0a 100644 --- a/server/data/data-cassandra/pom.xml +++ b/server/data/data-cassandra/pom.xml @@ -279,19 +279,29 @@ </build> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/server/data/data-jmap-cassandra/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jmap-cassandra/pom.xml b/server/data/data-jmap-cassandra/pom.xml index 8550bb1..8f2e1b4 100644 --- a/server/data/data-jmap-cassandra/pom.xml +++ b/server/data/data-jmap-cassandra/pom.xml @@ -242,19 +242,29 @@ </dependencies> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/server/data/data-jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jmap/pom.xml b/server/data/data-jmap/pom.xml index a13efc9..3890299 100644 --- a/server/data/data-jmap/pom.xml +++ b/server/data/data-jmap/pom.xml @@ -231,19 +231,29 @@ </dependencies> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/server/data/data-jpa/pom.xml ---------------------------------------------------------------------- diff --git a/server/data/data-jpa/pom.xml b/server/data/data-jpa/pom.xml index f95cddc..8d1cb81 100644 --- a/server/data/data-jpa/pom.xml +++ b/server/data/data-jpa/pom.xml @@ -186,6 +186,16 @@ <artifactId>maven-bundle-plugin</artifactId> <extensions>true</extensions> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <executions> + <execution> + <id>check_java_6</id> + <phase>none</phase> + </execution> + </executions> + </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml index e832966..5198df1 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/pom.xml @@ -247,19 +247,29 @@ </build> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml index 408e7a2..ec2ec51 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/pom.xml @@ -233,19 +233,29 @@ </build> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml index 5a078e4..1c9fc87 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/pom.xml @@ -234,19 +234,29 @@ </build> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/server/protocols/jmap/pom.xml ---------------------------------------------------------------------- diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml index 2d0557a..39a0e85 100644 --- a/server/protocols/jmap/pom.xml +++ b/server/protocols/jmap/pom.xml @@ -385,19 +385,29 @@ </build> </profile> <profile> - <id>disable-animal-sniffer</id> + <id>animal-sniffer-java-8</id> <activation> - <jdk>[1.6,)</jdk> + <jdk>[1.8,)</jdk> </activation> <build> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>animal-sniffer-maven-plugin</artifactId> + <configuration> + <signature> + <groupId>org.codehaus.mojo.signature</groupId> + <artifactId>java18</artifactId> + <version>1.0</version> + </signature> + </configuration> <executions> <execution> - <id>check_java_6</id> - <phase>none</phase> + <id>check_java_8</id> + <phase>test</phase> + <goals> + <goal>check</goal> + </goals> </execution> </executions> </plugin> http://git-wip-us.apache.org/repos/asf/james-project/blob/e7afc88d/server/queue/queue-file/pom.xml ---------------------------------------------------------------------- diff --git a/server/queue/queue-file/pom.xml b/server/queue/queue-file/pom.xml index a77e99b..a8fd6b5 100644 --- a/server/queue/queue-file/pom.xml +++ b/server/queue/queue-file/pom.xml @@ -74,6 +74,16 @@ <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>animal-sniffer-maven-plugin</artifactId> + <executions> + <execution> + <id>check_java_6</id> + <phase>none</phase> + </execution> + </executions> + </plugin> </plugins> </build> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
