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 ad...@apache.org on 2017/12/22 08:45:26 UTC

[01/13] james-project git commit: JAMES-2264 Update plugins where applicable

Repository: james-project
Updated Branches:
  refs/heads/master a1340b7c0 -> e0ad36d00


JAMES-2264 Update plugins where applicable

This makes my build time while skipping test pass from 6 min 6 to 4 min 33


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e0ad36d0
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e0ad36d0
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e0ad36d0

Branch: refs/heads/master
Commit: e0ad36d00827a0a6200d4666caf1b95dc7da2531
Parents: 46b4959
Author: benwa <bt...@linagora.com>
Authored: Tue Nov 14 15:04:35 2017 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Dec 22 09:44:59 2017 +0100

----------------------------------------------------------------------
 pom.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/e0ad36d0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c273fa9..8956ad0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2314,7 +2314,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-antrun-plugin</artifactId>
-                    <version>1.2</version>
+                    <version>1.8</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -2340,7 +2340,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.6.2</version>
+                    <version>3.7.0</version>
                     <configuration>
                         <optimize>true</optimize>
                         <source>${target.jdk}</source>
@@ -2350,7 +2350,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
-                    <version>3.0.1</version>
+                    <version>3.0.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -2531,7 +2531,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.20</version>
+                    <version>2.20.1</version>
                     <configuration>
                         <argLine>-Xms512m -Xmx1024m</argLine>
                         <reuseForks>false</reuseForks>
@@ -2542,7 +2542,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>2.20</version>
+                    <version>2.20.1</version>
                     <configuration>
                         <aggregate>true</aggregate>
                     </configuration>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[04/13] james-project git commit: JAMES-2264 Tests should work on windows too

Posted by ad...@apache.org.
JAMES-2264 Tests should work on windows too


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4261d1ca
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4261d1ca
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4261d1ca

Branch: refs/heads/master
Commit: 4261d1ca60306195a039cf90afd243a3a6c84ade
Parents: a1340b7
Author: Matthieu Baechler <ma...@apache.org>
Authored: Mon Nov 13 22:21:51 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Dec 22 09:44:59 2017 +0100

----------------------------------------------------------------------
 mailbox/cassandra/pom.xml                       | 22 ------------------
 mailbox/hbase/pom.xml                           | 22 ------------------
 mailet/icalendar/pom.xml                        | 21 -----------------
 mpt/impl/smtp/cassandra/pom.xml                 | 19 ----------------
 mpt/impl/smtp/core/pom.xml                      | 22 ------------------
 server/data/data-cassandra/pom.xml              | 24 +-------------------
 server/data/data-hbase/pom.xml                  | 21 -----------------
 server/data/data-jmap-cassandra/pom.xml         | 21 -----------------
 server/data/data-jmap/pom.xml                   | 21 -----------------
 server/mailet/integration-testing/pom.xml       | 21 -----------------
 .../cassandra-jmap-integration-testing/pom.xml  | 24 +-------------------
 .../jmap-integration-testing-common/pom.xml     | 21 -----------------
 .../memory-jmap-integration-testing/pom.xml     | 21 -----------------
 server/protocols/jmap/pom.xml                   | 21 -----------------
 server/protocols/jwt/pom.xml                    | 21 -----------------
 .../protocols/webadmin-integration-test/pom.xml | 21 -----------------
 .../webadmin/webadmin-cassandra/pom.xml         | 22 ------------------
 server/protocols/webadmin/webadmin-core/pom.xml | 21 -----------------
 server/protocols/webadmin/webadmin-data/pom.xml | 19 ----------------
 .../protocols/webadmin/webadmin-mailbox/pom.xml | 19 ----------------
 .../protocols/webadmin/webadmin-swagger/pom.xml | 19 ----------------
 server/testing/pom.xml                          | 21 -----------------
 22 files changed, 2 insertions(+), 462 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/mailbox/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/cassandra/pom.xml b/mailbox/cassandra/pom.xml
index dbec700..73b5d45 100644
--- a/mailbox/cassandra/pom.xml
+++ b/mailbox/cassandra/pom.xml
@@ -153,26 +153,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/mailbox/hbase/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/hbase/pom.xml b/mailbox/hbase/pom.xml
index de494ed..81e5d6f 100644
--- a/mailbox/hbase/pom.xml
+++ b/mailbox/hbase/pom.xml
@@ -133,26 +133,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/mailet/icalendar/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/icalendar/pom.xml b/mailet/icalendar/pom.xml
index 7695135..edfdca2 100644
--- a/mailet/icalendar/pom.xml
+++ b/mailet/icalendar/pom.xml
@@ -110,25 +110,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/mpt/impl/smtp/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml
index f9ded92..d97ce49 100644
--- a/mpt/impl/smtp/cassandra/pom.xml
+++ b/mpt/impl/smtp/cassandra/pom.xml
@@ -124,25 +124,6 @@
 
     <profiles>
         <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
             <id>cassandra</id>
             <properties>
                 <cassandra.includes>**/*.java</cassandra.includes>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/mpt/impl/smtp/core/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/core/pom.xml b/mpt/impl/smtp/core/pom.xml
index 5c7e5db..d88ca7e 100644
--- a/mpt/impl/smtp/core/pom.xml
+++ b/mpt/impl/smtp/core/pom.xml
@@ -71,26 +71,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/server/data/data-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-cassandra/pom.xml b/server/data/data-cassandra/pom.xml
index 85ee4e4..fcf3065 100644
--- a/server/data/data-cassandra/pom.xml
+++ b/server/data/data-cassandra/pom.xml
@@ -130,27 +130,5 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
+    
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/server/data/data-hbase/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-hbase/pom.xml b/server/data/data-hbase/pom.xml
index 8b06286..b122ac7 100644
--- a/server/data/data-hbase/pom.xml
+++ b/server/data/data-hbase/pom.xml
@@ -191,25 +191,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/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 6aa4e01..399a8f0 100644
--- a/server/data/data-jmap-cassandra/pom.xml
+++ b/server/data/data-jmap-cassandra/pom.xml
@@ -102,25 +102,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/server/data/data-jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-jmap/pom.xml b/server/data/data-jmap/pom.xml
index 155fdd5..e25d81b 100644
--- a/server/data/data-jmap/pom.xml
+++ b/server/data/data-jmap/pom.xml
@@ -84,25 +84,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/server/mailet/integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml
index 12352da..30e083a 100644
--- a/server/mailet/integration-testing/pom.xml
+++ b/server/mailet/integration-testing/pom.xml
@@ -164,25 +164,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/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 745c0d1..630c496 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
@@ -155,27 +155,5 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
+    
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/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 349f151..632773a 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
@@ -136,25 +136,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/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 dd8daa7..d1dfc6d 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
@@ -130,25 +130,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/server/protocols/jmap/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/pom.xml b/server/protocols/jmap/pom.xml
index 5cebbd0..d51f2ba 100644
--- a/server/protocols/jmap/pom.xml
+++ b/server/protocols/jmap/pom.xml
@@ -292,25 +292,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/server/protocols/jwt/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jwt/pom.xml b/server/protocols/jwt/pom.xml
index 54e804c..0a669a2 100644
--- a/server/protocols/jwt/pom.xml
+++ b/server/protocols/jwt/pom.xml
@@ -67,25 +67,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/server/protocols/webadmin-integration-test/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin-integration-test/pom.xml b/server/protocols/webadmin-integration-test/pom.xml
index 6de1b54..9177cfa 100644
--- a/server/protocols/webadmin-integration-test/pom.xml
+++ b/server/protocols/webadmin-integration-test/pom.xml
@@ -117,25 +117,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/server/protocols/webadmin/webadmin-cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-cassandra/pom.xml b/server/protocols/webadmin/webadmin-cassandra/pom.xml
index b88f6d0..1dc6b7b 100644
--- a/server/protocols/webadmin/webadmin-cassandra/pom.xml
+++ b/server/protocols/webadmin/webadmin-cassandra/pom.xml
@@ -82,26 +82,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/server/protocols/webadmin/webadmin-core/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-core/pom.xml b/server/protocols/webadmin/webadmin-core/pom.xml
index d99b417..32f8b5f 100644
--- a/server/protocols/webadmin/webadmin-core/pom.xml
+++ b/server/protocols/webadmin/webadmin-core/pom.xml
@@ -124,25 +124,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/server/protocols/webadmin/webadmin-data/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml
index e40e6ae..b9a403a 100644
--- a/server/protocols/webadmin/webadmin-data/pom.xml
+++ b/server/protocols/webadmin/webadmin-data/pom.xml
@@ -118,25 +118,6 @@
 
     <profiles>
         <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
             <id>swagger-json</id>
             <build>
                 <plugins>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/server/protocols/webadmin/webadmin-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml
index fd9e501..a3e78c6 100644
--- a/server/protocols/webadmin/webadmin-mailbox/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml
@@ -138,25 +138,6 @@
 
     <profiles>
         <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
             <id>swagger-json</id>
             <build>
                 <plugins>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/server/protocols/webadmin/webadmin-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-swagger/pom.xml b/server/protocols/webadmin/webadmin-swagger/pom.xml
index 739289d..8ebdea9 100644
--- a/server/protocols/webadmin/webadmin-swagger/pom.xml
+++ b/server/protocols/webadmin/webadmin-swagger/pom.xml
@@ -41,25 +41,6 @@
 
     <profiles>
         <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
             <id>swagger-json</id>
             <build>
                 <plugins>

http://git-wip-us.apache.org/repos/asf/james-project/blob/4261d1ca/server/testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/testing/pom.xml b/server/testing/pom.xml
index b1899a3..705438a 100644
--- a/server/testing/pom.xml
+++ b/server/testing/pom.xml
@@ -60,25 +60,4 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>noTest</id>
-            <activation>
-                <os>
-                    <family>windows</family>
-                </os>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <skipTests>true</skipTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[05/13] james-project git commit: JAMES-2264 Spring app doesn't support cassandra nor elasticsearch, jetm is not used any longer and mpt is run as JUnit tests

Posted by ad...@apache.org.
JAMES-2264 Spring app doesn't support cassandra nor elasticsearch, jetm is not used any longer and mpt is run as JUnit tests


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/91848703
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/91848703
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/91848703

Branch: refs/heads/master
Commit: 91848703279fa96cd1ab0b202b63554655e02fe7
Parents: 4261d1c
Author: Matthieu Baechler <ma...@apache.org>
Authored: Mon Nov 13 22:33:57 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Dec 22 09:44:59 2017 +0100

----------------------------------------------------------------------
 server/app/pom.xml | 946 +++++++++++++++++++-----------------------------
 1 file changed, 371 insertions(+), 575 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/91848703/server/app/pom.xml
----------------------------------------------------------------------
diff --git a/server/app/pom.xml b/server/app/pom.xml
index b56c244..3c37885 100644
--- a/server/app/pom.xml
+++ b/server/app/pom.xml
@@ -32,7 +32,7 @@
     <packaging>bundle</packaging>
 
     <name>Apache James :: Server :: App</name>
-    <description>An advanced email server</description>
+    <description>An advanced email server / Spring version</description>
 
     <properties>
 
@@ -95,6 +95,17 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
+            <artifactId>apache-james-mailbox-lucene</artifactId>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.mail</groupId>
+                    <artifactId>mail</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
             <artifactId>apache-james-mailbox-memory</artifactId>
             <scope>runtime</scope>
             <exclusions>
@@ -548,589 +559,374 @@
                 <artifactId>maven-bundle-plugin</artifactId>
                 <extensions>true</extensions>
             </plugin>
-        </plugins>
-    </build>
-
-    <profiles>
-        <profile>
-            <id>build-for-jdk-8</id>
-            <activation>
-                <jdk>[1.8,)</jdk>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>apache-james-mailbox-elasticsearch</artifactId>
-                    <scope>runtime</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>javax.mail</groupId>
-                            <artifactId>mail</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>apache-james-mailbox-tika</artifactId>
-                    <scope>runtime</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>javax.mail</groupId>
-                            <artifactId>mail</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>cassandra</id>
-            <properties>
-                <james.system-property2>-Dspring.profiles.active=cassandra</james.system-property2>
-                <james.system-properties>${james.system-property1} ${james.system-property2}</james.system-properties>
-            </properties>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>apache-james-backends-cassandra</artifactId>
-                    <scope>runtime</scope>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>apache-james-mailbox-cassandra</artifactId>
-                    <scope>runtime</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>javax.mail</groupId>
-                            <artifactId>mail</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>james-server-data-cassandra</artifactId>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>kafka</id>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>apache-james-mailbox-kafka</artifactId>
-                    <scope>runtime</scope>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>lucene</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>apache-james-mailbox-lucene</artifactId>
-                    <scope>runtime</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>javax.mail</groupId>
-                            <artifactId>mail</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>exclude-lucene</id>
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>apache-james-mailbox-lucene</artifactId>
-                    <scope>runtime</scope>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>javax.mail</groupId>
-                            <artifactId>mail</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.apache.lucene</groupId>
-                            <artifactId>lucene-core</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.apache.lucene</groupId>
-                            <artifactId>lucene-analyzers</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.apache.lucene</groupId>
-                            <artifactId>lucene-smartcn</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-            </dependencies>
-        </profile>
-        <profile>
-            <id>with-assembly</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>appassembler-maven-plugin</artifactId>
-                        <version>2.0.0</version>
-                        <configuration>
-                            <!-- Include etc/ in the beginning of the classpath declaration in the bin scripts -->
-                            <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
-                            <configurationDirectory>conf</configurationDirectory>
-                            <target>${project.build.directory}/appassembler</target>
-                            <repositoryLayout>flat</repositoryLayout>
-                            <repositoryName>lib</repositoryName>
-                            <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
-                            <environmentSetupFileName>setenv</environmentSetupFileName>
-                            <!-- set some sane defaults for memory -->
-                            <extraJvmArguments>${jvm.system-property1} -Xms128m -Xmx512m ${jmx.system-properties}
-                                ${javamail.system-properties} ${james.system-properties}</extraJvmArguments>
-                            <!-- Generate bin scripts for windows and unix per default -->
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>appassembler-maven-plugin</artifactId>
+                <version>2.0.0</version>
+                <configuration>
+                    <!-- Include etc/ in the beginning of the classpath declaration in the bin scripts -->
+                    <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
+                    <configurationDirectory>conf</configurationDirectory>
+                    <target>${project.build.directory}/appassembler</target>
+                    <repositoryLayout>flat</repositoryLayout>
+                    <repositoryName>lib</repositoryName>
+                    <includeConfigurationDirectoryInClasspath>true</includeConfigurationDirectoryInClasspath>
+                    <environmentSetupFileName>setenv</environmentSetupFileName>
+                    <!-- set some sane defaults for memory -->
+                    <extraJvmArguments>${jvm.system-property1} -Xms128m -Xmx512m ${jmx.system-properties}
+                        ${javamail.system-properties} ${james.system-properties}</extraJvmArguments>
+                    <!-- Generate bin scripts for windows and unix per default -->
+                    <platforms>
+                        <platform>windows</platform>
+                        <platform>unix</platform>
+                    </platforms>
+                    <!-- use .sh on unix instead of .bin -->
+                    <binFileExtensions>
+                        <unix>.sh</unix>
+                    </binFileExtensions>
+                    <!-- use *.jar instead of every single jar file in classpath -->
+                    <useWildcardClassPath>true</useWildcardClassPath>
+                    <repositoryLayout>flat</repositoryLayout>
+                    <programs>
+                        <program>
+                            <mainClass>org.apache.james.app.spring.JamesAppSpringMain</mainClass>
+                            <!-- call it only "run" because appassemble will add the extension -->
+                            <name>run</name>
+                            <!-- Only generate windows bat script and unix sh for this application -->
                             <platforms>
                                 <platform>windows</platform>
                                 <platform>unix</platform>
                             </platforms>
-                            <!-- use .sh on unix instead of .bin -->
-                            <binFileExtensions>
-                                <unix>.sh</unix>
-                            </binFileExtensions>
-                            <!-- use *.jar instead of every single jar file in classpath -->
-                            <useWildcardClassPath>true</useWildcardClassPath>
-                            <repositoryLayout>flat</repositoryLayout>
-                            <programs>
-                                <program>
-                                    <mainClass>org.apache.james.app.spring.JamesAppSpringMain</mainClass>
-                                    <!-- call it only "run" because appassemble will add the extension -->
-                                    <name>run</name>
-                                    <!-- Only generate windows bat script and unix sh for this application -->
-                                    <platforms>
-                                        <platform>windows</platform>
-                                        <platform>unix</platform>
-                                    </platforms>
-                                </program>
-
-                                <!-- This create the scripts for the command line administration client. Maybe this should better be moved to the cli module, but I'm not sure yet -->
-                                <program>
-                                    <mainClass>org.apache.james.cli.ServerCmd</mainClass>
-                                    <!-- call it only "james-cli" because appassemble will add the extension -->
-                                    <name>james-cli</name>
-                                    <!-- Only generate windows bat script and unix sh for this application -->
-                                    <platforms>
-                                        <platform>windows</platform>
-                                        <platform>unix</platform>
-                                    </platforms>
-                                </program>
-                            </programs>
-                            <daemons>
-                                <daemon>
-                                    <id>james</id>
-                                    <mainClass>org.apache.james.app.spring.JamesAppSpringMain</mainClass>
-                                    <commandLineArguments>
-                                        <commandLineArgument>start</commandLineArgument>
-                                    </commandLineArguments>
-                                    <platforms>
-                                        <!--
-                                            =======================================================================
-
-                                            JSW relies on software licensed under the following "Tanuki Software License"
-
-                                            BEGIN Tanuki Software License =========================================
-                                            Copyright (c) 1999, 2006 Tanuki Software, Inc.
-
-                                            Permission is hereby granted, free of charge, to any person
-                                            obtaining a copy of the Java Service Wrapper and associated
-                                            documentation files (the "Software"), to deal in the Software
-                                            without restriction, including without limitation the rights
-                                            to use, copy, modify, merge, publish, distribute, sub-license,
-                                            and/or sell copies of the Software, and to permit persons to
-                                            whom the Software is furnished to do so, subject to the
-                                            following conditions:
-
-                                            The above copyright notice and this permission notice shall be
-                                            included in all copies or substantial portions of the Software.
-
-                                            THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-                                            EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-                                            OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-                                            NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-                                            HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-                                            WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-                                            FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-                                            OTHER DEALINGS IN THE SOFTWARE.
-
-
-                                            Portions of the Software have been derived from source code
-                                            developed by Silver Egg Technology under the following license:
-
-                                            BEGIN Silver Egg Techology License =================================
-
-                                            Copyright (c) 2001 Silver Egg Technology
-
-                                            Permission is hereby granted, free of charge, to any person
-                                            obtaining a copy of this software and associated documentation
-                                            files (the "Software"), to deal in the Software without
-                                            restriction, including without limitation the rights to use,
-                                            copy, modify, merge, publish, distribute, sub-license, and/or
-                                            sell copies of the Software, and to permit persons to whom the
-                                            Software is furnished to do so, subject to the following
-                                            conditions:
-
-                                            The above copyright notice and this permission notice shall be
-                                            included in all copies or substantial portions of the Software.
-
-                                            THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-                                            EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-                                            OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-                                            NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-                                            HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-                                            WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-                                            FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-                                            OTHER DEALINGS IN THE SOFTWARE.
-
-                                            END Silver Egg Techology License =====================================
-                                            END Tanuki Software License ============================================
-                                            ========================================================================
-                                        -->
-                                        <platform>jsw</platform>
-                                    </platforms>
-                                    <generatorConfigurations>
-                                        <generatorConfiguration>
-
-                                            <generator>jsw</generator>
-                                            <includes>
-                                                <include>linux-x86-32</include>
-                                                <include>linux-x86-64</include>
-                                                <include>linux-ppc-64</include>
-                                                <include>macosx-x86-universal-32</include>
-                                                <include>macosx-ppc-32</include>
-                                                <include>solaris-sparc-32</include>
-                                                <include>solaris-sparc-64</include>
-                                                <include>solaris-x86-32</include>
-                                                <include>windows-x86-32</include>
-                                                <include>windows-x86-64</include>
-                                            </includes>
-
-                                            <configuration>
-                                                <!-- add to to the classpath in this order: config files, james jars, user jars.-->
-                                                <property>
-                                                    <name>configuration.directory.in.classpath.first</name>
-                                                    <value>../conf</value>
-                                                </property>
-                                                <property>
-                                                    <name>configuration.directory.in.classpath.last</name>
-                                                    <value>../conf/lib/*</value>
-                                                </property>
-                                                <property>
-                                                    <name>set.default.REPO_DIR</name>
-                                                    <value>../lib</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.working.dir</name>
-                                                    <value>.</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.logfile</name>
-                                                    <value>../log/wrapper.log</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.library.path</name>
-                                                    <value>../lib</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.initmemory</name>
-                                                    <value>128</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.maxmemory</name>
-                                                    <value>512</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.additional.1</name>
-                                                    <value>${jvm.system-property1}</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.additional.2</name>
-                                                    <value>${jmx.system-property1}</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.additional.3</name>
-                                                    <value>${jmx.system-property2}</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.additional.4</name>
-                                                    <value>${javamail.system-property1}</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.additional.5</name>
-                                                    <value>${javamail.system-property2}</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.additional.6</name>
-                                                    <value>${javamail.system-property3}</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.additional.7</name>
-                                                    <value>${javamail.system-property4}</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.additional.8</name>
-                                                    <value>${javamail.system-property5}</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.additional.9</name>
-                                                    <value>${javamail.system-property6}</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.additional.10</name>
-                                                    <value>${javamail.system-property7}</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.additional.11</name>
-                                                    <value>${javamail.system-property8}</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.additional.12</name>
-                                                    <value>${javamail.system-property9}</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.additional.13</name>
-                                                    <value>${javamail.system-property10}</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.additional.14</name>
-                                                    <value>${james.system-property1}</value>
-                                                </property>
-                                                <property>
-                                                    <name>wrapper.java.additional.15</name>
-                                                    <value>${james.system-property2}</value>
-                                                </property>
-                                            </configuration>
-                                        </generatorConfiguration>
-                                    </generatorConfigurations>
-
-                                </daemon>
-                            </daemons>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>make-appassemble</id>
-                                <goals>
-                                    <goal>assemble</goal>
-                                    <goal>generate-daemons</goal>
-                                </goals>
-                                <phase>package</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-antrun-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <goals>
-                                    <goal>run</goal>
-                                </goals>
-                                <phase>package</phase>
-                                <configuration>
-
-                                    <tasks>
-                                        <!-- this is only needed because windows freak out on long cmd lines, so we strip of the absolute path
-                                            from the lib dir to make windows happy again
-                                        -->
-                                        <replace file="${project.build.directory}/appassembler/bin/run.bat" token="%BASEDIR%\lib" value="..\lib" />
-                                        <replace file="${project.build.directory}/appassembler/bin/run.sh" token="setenv" value="setenv.sh" />
-
-                                        <!-- this is needed because appassembler is not really smart on some settings -->
-                                        <replace file="${project.build.directory}/appassembler/jsw/james/conf/wrapper.conf" token="lib/wrapper.jar" value="%REPO_DIR%/wrapper.jar" />
-                                        <replace file="${project.build.directory}/appassembler/jsw/james/bin/james" token="logs" value="var" />
-
-                                        <!-- copy the linux wrapper-linux-x86-32 to wrapper, so use it as default if no matching wrapper was found -->
-                                        <copy file="${project.build.directory}/appassembler/jsw/james/bin/wrapper-linux-x86-32" tofile="${project.build.directory}/appassembler/jsw/james/bin/wrapper" />
-                                        <!-- this is only needed because windows freak out on long cmd lines, so we strip of the absolute path
-                                            from the lib dir to make windows happy again
-                                        -->
-                                        <replace file="${project.build.directory}/appassembler/bin/james-cli.bat" token="%BASEDIR%\lib" value="..\lib" />
-                                        <replace file="${project.build.directory}/appassembler/bin/james-cli.sh" token="setenv" value="setenv.sh" />
-                                    </tasks>
-
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <configuration>
-                            <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>make-assembly</id>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-				<phase>package</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <!--
-                    The signing process excludes the artifact created by this plugin.
-                    The cause seems likely to be project type pom (not war).
-                    If this is the case then releasing the war would require
-                    reorganisation.
-                    -->
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-war-plugin</artifactId>
-                        <configuration>
-                            <webResources>
-                                <resource>
-                                    <directory>src/main/resources</directory>
-                                    <!-- override the destination directory for this resource -->
-                                    <targetPath>WEB-INF/conf/</targetPath>
-                                    <excludes>
-                                        <exclude>log4j.properties</exclude>
-                                        <exclude>**/lib/**</exclude>
-                                    </excludes>
-                                </resource>
-                                <resource>
-                                    <directory>src/main/resources</directory>
-                                    <!-- override the destination directory for this resource -->
-                                    <targetPath>WEB-INF/classes/</targetPath>
-                                    <includes>
-                                        <include>log4j.properties</include>
-                                    </includes>
-                                </resource>
-                                <resource>
-                                    <directory>src/main/config/war</directory>
-                                    <!-- override the destination directory for this resource -->
-                                    <targetPath>WEB-INF/conf/</targetPath>
+                        </program>
+
+                        <!-- This create the scripts for the command line administration client. Maybe this should better be moved to the cli module, but I'm not sure yet -->
+                        <program>
+                            <mainClass>org.apache.james.cli.ServerCmd</mainClass>
+                            <!-- call it only "james-cli" because appassemble will add the extension -->
+                            <name>james-cli</name>
+                            <!-- Only generate windows bat script and unix sh for this application -->
+                            <platforms>
+                                <platform>windows</platform>
+                                <platform>unix</platform>
+                            </platforms>
+                        </program>
+                    </programs>
+                    <daemons>
+                        <daemon>
+                            <id>james</id>
+                            <mainClass>org.apache.james.app.spring.JamesAppSpringMain</mainClass>
+                            <commandLineArguments>
+                                <commandLineArgument>start</commandLineArgument>
+                            </commandLineArguments>
+                            <platforms>
+                                <!--
+                                    =======================================================================
+
+                                    JSW relies on software licensed under the following "Tanuki Software License"
+
+                                    BEGIN Tanuki Software License =========================================
+                                    Copyright (c) 1999, 2006 Tanuki Software, Inc.
+
+                                    Permission is hereby granted, free of charge, to any person
+                                    obtaining a copy of the Java Service Wrapper and associated
+                                    documentation files (the "Software"), to deal in the Software
+                                    without restriction, including without limitation the rights
+                                    to use, copy, modify, merge, publish, distribute, sub-license,
+                                    and/or sell copies of the Software, and to permit persons to
+                                    whom the Software is furnished to do so, subject to the
+                                    following conditions:
+
+                                    The above copyright notice and this permission notice shall be
+                                    included in all copies or substantial portions of the Software.
+
+                                    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+                                    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+                                    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+                                    NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+                                    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+                                    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+                                    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+                                    OTHER DEALINGS IN THE SOFTWARE.
+
+
+                                    Portions of the Software have been derived from source code
+                                    developed by Silver Egg Technology under the following license:
+
+                                    BEGIN Silver Egg Techology License =================================
+
+                                    Copyright (c) 2001 Silver Egg Technology
+
+                                    Permission is hereby granted, free of charge, to any person
+                                    obtaining a copy of this software and associated documentation
+                                    files (the "Software"), to deal in the Software without
+                                    restriction, including without limitation the rights to use,
+                                    copy, modify, merge, publish, distribute, sub-license, and/or
+                                    sell copies of the Software, and to permit persons to whom the
+                                    Software is furnished to do so, subject to the following
+                                    conditions:
+
+                                    The above copyright notice and this permission notice shall be
+                                    included in all copies or substantial portions of the Software.
+
+                                    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+                                    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+                                    OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+                                    NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+                                    HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+                                    WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+                                    FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+                                    OTHER DEALINGS IN THE SOFTWARE.
+
+                                    END Silver Egg Techology License =====================================
+                                    END Tanuki Software License ============================================
+                                    ========================================================================
+                                -->
+                                <platform>jsw</platform>
+                            </platforms>
+                            <generatorConfigurations>
+                                <generatorConfiguration>
 
-                                </resource>
-                                <resource>
-                                    <directory>src/main/licensing/war</directory>
-                                    <targetPath>META-INF</targetPath>
-                                    <excludes>
-                                        <exclude>licensing.xml</exclude>
-                                    </excludes>
-                                </resource>
-                                <resource>
-                                    <directory>../container/spring/src/main/resources/META-INF</directory>
-                                    <targetPath>WEB-INF/conf/META-INF</targetPath>
-                                    <includes>
-                                        <include>**/*.xml</include>
-                                    </includes>
-                                </resource>
-                                <resource>
-                                    <directory>.</directory>
-                                    <targetPath>META-INF</targetPath>
+                                    <generator>jsw</generator>
                                     <includes>
-                                        <include>README*</include>
+                                        <include>linux-x86-32</include>
+                                        <include>linux-x86-64</include>
+                                        <include>linux-ppc-64</include>
+                                        <include>macosx-x86-universal-32</include>
+                                        <include>macosx-ppc-32</include>
+                                        <include>solaris-sparc-32</include>
+                                        <include>solaris-sparc-64</include>
+                                        <include>solaris-x86-32</include>
+                                        <include>windows-x86-32</include>
+                                        <include>windows-x86-64</include>
                                     </includes>
-                                </resource>
-                            </webResources>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <id>make-war</id>
-                                <goals>
-                                    <goal>war</goal>
-                                </goals>
-                                <phase>package</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
 
-        <profile>
-            <id>with-mpt</id>
-            <build>
-                <plugins>
-                    <!-- be sure to start up james before run it -->
-                    <plugin>
-                        <groupId>${project.groupId}</groupId>
-                        <artifactId>maven-mpt-plugin</artifactId>
-                        <version>0.2-SNAPSHOT</version>
+                                    <configuration>
+                                        <!-- add to to the classpath in this order: config files, james jars, user jars.-->
+                                        <property>
+                                            <name>configuration.directory.in.classpath.first</name>
+                                            <value>../conf</value>
+                                        </property>
+                                        <property>
+                                            <name>configuration.directory.in.classpath.last</name>
+                                            <value>../conf/lib/*</value>
+                                        </property>
+                                        <property>
+                                            <name>set.default.REPO_DIR</name>
+                                            <value>../lib</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.working.dir</name>
+                                            <value>.</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.logfile</name>
+                                            <value>../log/wrapper.log</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.library.path</name>
+                                            <value>../lib</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.initmemory</name>
+                                            <value>128</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.maxmemory</name>
+                                            <value>512</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.additional.1</name>
+                                            <value>${jvm.system-property1}</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.additional.2</name>
+                                            <value>${jmx.system-property1}</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.additional.3</name>
+                                            <value>${jmx.system-property2}</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.additional.4</name>
+                                            <value>${javamail.system-property1}</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.additional.5</name>
+                                            <value>${javamail.system-property2}</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.additional.6</name>
+                                            <value>${javamail.system-property3}</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.additional.7</name>
+                                            <value>${javamail.system-property4}</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.additional.8</name>
+                                            <value>${javamail.system-property5}</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.additional.9</name>
+                                            <value>${javamail.system-property6}</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.additional.10</name>
+                                            <value>${javamail.system-property7}</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.additional.11</name>
+                                            <value>${javamail.system-property8}</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.additional.12</name>
+                                            <value>${javamail.system-property9}</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.additional.13</name>
+                                            <value>${javamail.system-property10}</value>
+                                        </property>
+                                        <property>
+                                            <name>wrapper.java.additional.14</name>
+                                            <value>${james.system-property1}</value>
+                                        </property>
+                                    </configuration>
+                                </generatorConfiguration>
+                            </generatorConfigurations>
+
+                        </daemon>
+                    </daemons>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-appassemble</id>
+                        <goals>
+                            <goal>assemble</goal>
+                            <goal>generate-daemons</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <phase>package</phase>
                         <configuration>
-                            <mailProtocolTests>
-                                <mailProtocolTest>
-                                    <host>127.0.0.1</host>
-                                    <port>110</port>
-                                    <scriptFile>src/mpt/pop3.mpt</scriptFile>
-                                    <addUsers>
-                                        <addUser>
-                                            <host>127.0.0.1</host>
-                                            <port>4555</port>
-                                            <scriptFile>src/mpt/adduser.mpt</scriptFile>
-                                            <user>root</user>
-                                            <passwd>root</passwd>
-                                        </addUser>
-                                    </addUsers>
-                                </mailProtocolTest>
-                                <mailProtocolTest>
-                                    <host>127.0.0.1</host>
-                                    <port>143</port>
-                                    <scriptFile>src/mpt/imap.mpt</scriptFile>
-                                    <addUsers>
-                                        <addUser>
-                                            <host>127.0.0.1</host>
-                                            <port>4555</port>
-                                            <scriptFile>src/mpt/adduser.mpt</scriptFile>
-                                            <user>root</user>
-                                            <passwd>root</passwd>
-                                        </addUser>
-                                    </addUsers>
-                                </mailProtocolTest>
-                                <mailProtocolTest>
-                                    <host>127.0.0.1</host>
-                                    <port>25</port>
-                                    <scriptFile>src/mpt/smtp.mpt</scriptFile>
-                                    <addUsers>
-                                        <addUser>
-                                            <host>127.0.0.1</host>
-                                            <port>4555</port>
-                                            <scriptFile>src/mpt/adduser.mpt</scriptFile>
-                                            <user>root</user>
-                                            <passwd>root</passwd>
-                                        </addUser>
-                                    </addUsers>
-                                </mailProtocolTest>
-                            </mailProtocolTests>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
 
-        <profile>
-            <id>with-jetm</id>
-            <activation>
-                <!-- remember to comment out the jetm-monitoring import line from spring-server.xml if you de-activate this
-                -->
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencies>
-                <dependency>
-                    <groupId>fm.void.jetm</groupId>
-                    <artifactId>jetm</artifactId>
-                    <version>1.2.3</version>
-                </dependency>
-                <dependency>
-                    <groupId>fm.void.jetm</groupId>
-                    <artifactId>jetm-optional</artifactId>
-                    <version>1.2.3</version>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
+                            <tasks>
+                                <!-- this is only needed because windows freak out on long cmd lines, so we strip of the absolute path
+                                    from the lib dir to make windows happy again
+                                -->
+                                <replace file="${project.build.directory}/appassembler/bin/run.bat" token="%BASEDIR%\lib" value="..\lib" />
+                                <replace file="${project.build.directory}/appassembler/bin/run.sh" token="setenv" value="setenv.sh" />
+
+                                <!-- this is needed because appassembler is not really smart on some settings -->
+                                <replace file="${project.build.directory}/appassembler/jsw/james/conf/wrapper.conf" token="lib/wrapper.jar" value="%REPO_DIR%/wrapper.jar" />
+                                <replace file="${project.build.directory}/appassembler/jsw/james/bin/james" token="logs" value="var" />
+
+                                <!-- copy the linux wrapper-linux-x86-32 to wrapper, so use it as default if no matching wrapper was found -->
+                                <copy file="${project.build.directory}/appassembler/jsw/james/bin/wrapper-linux-x86-32" tofile="${project.build.directory}/appassembler/jsw/james/bin/wrapper" />
+                                <!-- this is only needed because windows freak out on long cmd lines, so we strip of the absolute path
+                                    from the lib dir to make windows happy again
+                                -->
+                                <replace file="${project.build.directory}/appassembler/bin/james-cli.bat" token="%BASEDIR%\lib" value="..\lib" />
+                                <replace file="${project.build.directory}/appassembler/bin/james-cli.sh" token="setenv" value="setenv.sh" />
+                            </tasks>
 
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <configuration>
+                    <descriptorSourceDirectory>src/assemble/</descriptorSourceDirectory>
+                    <tarLongFileMode>gnu</tarLongFileMode>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-assembly</id>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <!--
+            The signing process excludes the artifact created by this plugin.
+            The cause seems likely to be project type pom (not war).
+            If this is the case then releasing the war would require
+            reorganisation.
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-war-plugin</artifactId>
+                <configuration>
+                    <webResources>
+                        <resource>
+                            <directory>src/main/resources</directory>
+                            <!-- override the destination directory for this resource -->
+                            <targetPath>WEB-INF/conf/</targetPath>
+                            <excludes>
+                                <exclude>log4j.properties</exclude>
+                                <exclude>**/lib/**</exclude>
+                            </excludes>
+                        </resource>
+                        <resource>
+                            <directory>src/main/resources</directory>
+                            <!-- override the destination directory for this resource -->
+                            <targetPath>WEB-INF/classes/</targetPath>
+                            <includes>
+                                <include>log4j.properties</include>
+                            </includes>
+                        </resource>
+                        <resource>
+                            <directory>src/main/config/war</directory>
+                            <!-- override the destination directory for this resource -->
+                            <targetPath>WEB-INF/conf/</targetPath>
+
+                        </resource>
+                        <resource>
+                            <directory>src/main/licensing/war</directory>
+                            <targetPath>META-INF</targetPath>
+                            <excludes>
+                                <exclude>licensing.xml</exclude>
+                            </excludes>
+                        </resource>
+                        <resource>
+                            <directory>../container/spring/src/main/resources/META-INF</directory>
+                            <targetPath>WEB-INF/conf/META-INF</targetPath>
+                            <includes>
+                                <include>**/*.xml</include>
+                            </includes>
+                        </resource>
+                        <resource>
+                            <directory>.</directory>
+                            <targetPath>META-INF</targetPath>
+                            <includes>
+                                <include>README*</include>
+                            </includes>
+                        </resource>
+                    </webResources>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>make-war</id>
+                        <goals>
+                            <goal>war</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+    
 </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[06/13] james-project git commit: JAMES-2264 cassandra should not be disabled any longer

Posted by ad...@apache.org.
JAMES-2264 cassandra should not be disabled any longer


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/60517e1f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/60517e1f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/60517e1f

Branch: refs/heads/master
Commit: 60517e1f3402ae3d5a6b81a5423ba55c7c424654
Parents: 9184870
Author: Matthieu Baechler <ma...@apache.org>
Authored: Mon Nov 13 22:35:53 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Dec 22 09:44:59 2017 +0100

----------------------------------------------------------------------
 server/app/pom.xml                                  | 2 +-
 server/container/guice/cassandra-guice/pom.xml      | 8 --------
 server/container/guice/cassandra-ldap-guice/pom.xml | 8 --------
 3 files changed, 1 insertion(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/60517e1f/server/app/pom.xml
----------------------------------------------------------------------
diff --git a/server/app/pom.xml b/server/app/pom.xml
index 3c37885..3b91ff5 100644
--- a/server/app/pom.xml
+++ b/server/app/pom.xml
@@ -928,5 +928,5 @@
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/60517e1f/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 598a0c4..aba7dd0 100644
--- a/server/container/guice/cassandra-guice/pom.xml
+++ b/server/container/guice/cassandra-guice/pom.xml
@@ -299,12 +299,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>cassandra</id>
-            <properties>
-                <cassandra.includes>**/*.java</cassandra.includes>
-            </properties>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/60517e1f/server/container/guice/cassandra-ldap-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/cassandra-ldap-guice/pom.xml b/server/container/guice/cassandra-ldap-guice/pom.xml
index 1c1d96d..afa2b4a 100644
--- a/server/container/guice/cassandra-ldap-guice/pom.xml
+++ b/server/container/guice/cassandra-ldap-guice/pom.xml
@@ -192,12 +192,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>cassandra</id>
-            <properties>
-                <cassandra.includes>**/*.java</cassandra.includes>
-            </properties>
-        </profile>
-    </profiles>
 </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[07/13] james-project git commit: JAMES-2264 jpa should not be disabled any longer

Posted by ad...@apache.org.
JAMES-2264 jpa should not be disabled any longer


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/a26b60a2
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/a26b60a2
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/a26b60a2

Branch: refs/heads/master
Commit: a26b60a2a356b5127ccfbb4d70a428c45bd9be46
Parents: 60517e1
Author: Matthieu Baechler <ma...@apache.org>
Authored: Mon Nov 13 22:38:10 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Dec 22 09:44:59 2017 +0100

----------------------------------------------------------------------
 server/container/guice/jpa-common-guice/pom.xml | 8 --------
 server/container/guice/jpa-guice/pom.xml        | 8 --------
 server/container/guice/jpa-smtp/pom.xml         | 8 --------
 3 files changed, 24 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/a26b60a2/server/container/guice/jpa-common-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-common-guice/pom.xml b/server/container/guice/jpa-common-guice/pom.xml
index 3aa275f..393ee33 100644
--- a/server/container/guice/jpa-common-guice/pom.xml
+++ b/server/container/guice/jpa-common-guice/pom.xml
@@ -71,12 +71,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>jpa</id>
-            <properties>
-                <jpa.includes>**/*.java</jpa.includes>
-            </properties>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/a26b60a2/server/container/guice/jpa-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-guice/pom.xml b/server/container/guice/jpa-guice/pom.xml
index 7104f98..d61ec25 100644
--- a/server/container/guice/jpa-guice/pom.xml
+++ b/server/container/guice/jpa-guice/pom.xml
@@ -225,12 +225,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>jpa</id>
-            <properties>
-                <jpa.includes>**/*.java</jpa.includes>
-            </properties>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/a26b60a2/server/container/guice/jpa-smtp/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/jpa-smtp/pom.xml b/server/container/guice/jpa-smtp/pom.xml
index f180685..b69c6a8 100644
--- a/server/container/guice/jpa-smtp/pom.xml
+++ b/server/container/guice/jpa-smtp/pom.xml
@@ -197,12 +197,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>jpa</id>
-            <properties>
-                <jpa.includes>**/*.java</jpa.includes>
-            </properties>
-        </profile>
-    </profiles>
 </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[12/13] james-project git commit: JAMES-2264 Activate all MPT tests but Hbase.

Posted by ad...@apache.org.
JAMES-2264 Activate all MPT tests but Hbase.

These tests do not pass.


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/46b49591
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/46b49591
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/46b49591

Branch: refs/heads/master
Commit: 46b49591a9cf8fd75783d4773bb67be404d922cf
Parents: 29b1a6c
Author: benwa <bt...@linagora.com>
Authored: Tue Nov 14 14:40:07 2017 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Dec 22 09:44:59 2017 +0100

----------------------------------------------------------------------
 .../imapmailbox/hbase/HBaseAuthenticatePlain.java   |  2 ++
 .../imapmailbox/hbase/HBaseAuthenticatedState.java  |  2 ++
 .../imapmailbox/hbase/HBaseConcurrentSessions.java  |  2 ++
 .../james/mpt/imapmailbox/hbase/HBaseCondstore.java |  2 ++
 .../james/mpt/imapmailbox/hbase/HBaseCopy.java      |  2 ++
 .../james/mpt/imapmailbox/hbase/HBaseEvents.java    |  2 ++
 .../james/mpt/imapmailbox/hbase/HBaseExpunge.java   |  2 ++
 .../james/mpt/imapmailbox/hbase/HBaseFetch.java     |  2 ++
 .../imapmailbox/hbase/HBaseFetchBodySection.java    |  2 ++
 .../imapmailbox/hbase/HBaseFetchBodyStructure.java  |  2 ++
 .../mpt/imapmailbox/hbase/HBaseFetchHeaders.java    |  2 ++
 .../james/mpt/imapmailbox/hbase/HBaseListing.java   |  2 ++
 .../imapmailbox/hbase/HBaseMailboxAnnotation.java   |  2 ++
 .../hbase/HBaseMailboxWithLongNameError.java        |  2 ++
 .../james/mpt/imapmailbox/hbase/HBaseMove.java      |  2 ++
 .../hbase/HBaseNonAuthenticatedState.java           |  2 ++
 .../mpt/imapmailbox/hbase/HBasePartialFetch.java    |  2 ++
 .../james/mpt/imapmailbox/hbase/HBaseQuotaTest.java |  2 ++
 .../james/mpt/imapmailbox/hbase/HBaseRename.java    |  2 ++
 .../james/mpt/imapmailbox/hbase/HBaseSearch.java    |  2 ++
 .../james/mpt/imapmailbox/hbase/HBaseSecurity.java  |  2 ++
 .../james/mpt/imapmailbox/hbase/HBaseSelect.java    |  2 ++
 .../mpt/imapmailbox/hbase/HBaseSelectedInbox.java   |  2 ++
 .../mpt/imapmailbox/hbase/HBaseSelectedState.java   |  2 ++
 .../james/mpt/imapmailbox/hbase/HBaseUidSearch.java |  2 ++
 .../imapmailbox/hbase/HBaseUidSearchOnIndex.java    |  2 ++
 .../imapmailbox/hbase/HBaseUserFlagsSupport.java    |  2 ++
 mpt/impl/imap-mailbox/pom.xml                       | 16 ----------------
 28 files changed, 54 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java
index 06e3114..0882dc5 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatePlain.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.AuthenticatePlain;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseAuthenticatePlain extends AuthenticatePlain {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java
index 7bbc41a..f8e63fa 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseAuthenticatedState.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.AuthenticatedState;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseAuthenticatedState extends AuthenticatedState {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java
index 4d36596..206ff86 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseConcurrentSessions.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.ConcurrentSessions;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseConcurrentSessions extends ConcurrentSessions {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java
index afeb3cc..2d9e2e7 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCondstore.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.Condstore;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseCondstore extends Condstore {
 
     private JamesImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java
index 4040237..f19afc4 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseCopy.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.Copy;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseCopy extends Copy {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java
index dadcd90..7e3d113 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseEvents.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.Events;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseEvents extends Events {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java
index c8389e5..46769ca 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseExpunge.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.Expunge;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseExpunge extends Expunge {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java
index d4a7734..02b6b11 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetch.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.Fetch;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseFetch extends Fetch {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java
index 2ff9068..da4b486 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodySection.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.FetchBodySection;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseFetchBodySection extends FetchBodySection {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java
index f900066..8385a06 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchBodyStructure.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.FetchBodyStructure;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseFetchBodyStructure extends FetchBodyStructure {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java
index edcb47b..ba852ff 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseFetchHeaders.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.FetchHeaders;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseFetchHeaders extends FetchHeaders {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java
index 9b0b9fb..13318d8 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseListing.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.Listing;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseListing extends Listing {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java
index cd97f66..f6f28e2 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxAnnotation.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.MailboxAnnotation;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseMailboxAnnotation extends MailboxAnnotation {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java
index 18d28e1..ddc806e 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxWithLongNameError.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.MailboxWithLongNameError;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseMailboxWithLongNameError extends MailboxWithLongNameError {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMove.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMove.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMove.java
index 54fabed..eee86dc 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMove.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMove.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.Move;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseMove extends Move {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java
index b9f5275..ca9e768 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseNonAuthenticatedState.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.NonAuthenticatedState;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseNonAuthenticatedState extends NonAuthenticatedState {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java
index d417e74..a58a88b 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBasePartialFetch.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.PartialFetch;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBasePartialFetch extends PartialFetch {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java
index 709e0d2..ae1b1e7 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseQuotaTest.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.QuotaTest;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseQuotaTest extends QuotaTest {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java
index 75b309d..9b58f5a 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseRename.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.Rename;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseRename extends Rename {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java
index db894ca..fdec8ca 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSearch.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.Search;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseSearch extends Search {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java
index e5cdf32..d4b3165 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSecurity.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.Security;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseSecurity extends Security {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java
index 7de5ae5..d747cdc 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelect.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.Select;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseSelect extends Select {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java
index 00e08ee..0ccfff9 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedInbox.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.SelectedInbox;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseSelectedInbox extends SelectedInbox {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedState.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedState.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedState.java
index da758db..43fc412 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedState.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseSelectedState.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.SelectedState;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseSelectedState extends SelectedState {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearch.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearch.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearch.java
index 1081dfe..b3e7df7 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearch.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearch.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.UidSearch;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseUidSearch extends UidSearch {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearchOnIndex.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearchOnIndex.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearchOnIndex.java
index 98451c0..5316d7c 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearchOnIndex.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUidSearchOnIndex.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.UidSearchOnIndex;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseUidSearchOnIndex extends UidSearchOnIndex {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUserFlagsSupport.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUserFlagsSupport.java b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUserFlagsSupport.java
index 349094e..6dde034 100644
--- a/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUserFlagsSupport.java
+++ b/mpt/impl/imap-mailbox/hbase/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseUserFlagsSupport.java
@@ -24,7 +24,9 @@ import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
 import org.apache.james.mpt.imapmailbox.suite.UserFlagsSupport;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 
+@Ignore
 public class HBaseUserFlagsSupport extends UserFlagsSupport {
 
     private ImapHostSystem system;

http://git-wip-us.apache.org/repos/asf/james-project/blob/46b49591/mpt/impl/imap-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/pom.xml b/mpt/impl/imap-mailbox/pom.xml
index aeadb51..c2f9119 100644
--- a/mpt/impl/imap-mailbox/pom.xml
+++ b/mpt/impl/imap-mailbox/pom.xml
@@ -46,18 +46,6 @@
         <module>maildir</module>
     </modules>
 
-    <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>
-        <jpa-lucene.includes>empty</jpa-lucene.includes>
-    </properties>
-
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -134,10 +122,6 @@
                             <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}, ${jpa-lucene.includes}</include>
-                        </includes>
                     </configuration>
                 </plugin>
             </plugins>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[11/13] james-project git commit: JAMES-2264 lucene should not be disabled any longer

Posted by ad...@apache.org.
JAMES-2264 lucene should not be disabled any longer


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/f6f70b21
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/f6f70b21
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/f6f70b21

Branch: refs/heads/master
Commit: f6f70b21773edd1c155253cf2afd2eba8060f2df
Parents: 538af50
Author: Matthieu Baechler <ma...@apache.org>
Authored: Mon Nov 13 22:50:56 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Dec 22 09:44:59 2017 +0100

----------------------------------------------------------------------
 mailbox/lucene/pom.xml | 8 --------
 1 file changed, 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/f6f70b21/mailbox/lucene/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/lucene/pom.xml b/mailbox/lucene/pom.xml
index 947d584..bb7d27d 100644
--- a/mailbox/lucene/pom.xml
+++ b/mailbox/lucene/pom.xml
@@ -105,12 +105,4 @@
             <artifactId>slf4j-api</artifactId>
         </dependency>
     </dependencies>
-    <profiles>
-        <profile>
-            <id>lucene</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-        </profile>
-    </profiles>
 </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[02/13] james-project git commit: JAMES-2264 Remove profiles from compilation docker

Posted by ad...@apache.org.
JAMES-2264 Remove profiles from compilation docker


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/29b1a6c9
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/29b1a6c9
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/29b1a6c9

Branch: refs/heads/master
Commit: 29b1a6c98973a67fd6307cd3ae0cf6e69af4d9d8
Parents: 6fc0c7b
Author: benwa <bt...@linagora.com>
Authored: Tue Nov 14 14:29:51 2017 +0700
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Dec 22 09:44:59 2017 +0100

----------------------------------------------------------------------
 dockerfiles/compilation/java-8/compile.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/29b1a6c9/dockerfiles/compilation/java-8/compile.sh
----------------------------------------------------------------------
diff --git a/dockerfiles/compilation/java-8/compile.sh b/dockerfiles/compilation/java-8/compile.sh
index 9b4d298..3300aad 100755
--- a/dockerfiles/compilation/java-8/compile.sh
+++ b/dockerfiles/compilation/java-8/compile.sh
@@ -47,9 +47,9 @@ git checkout $SHA1
 # Compilation
 
 if [ "$SKIPTESTS" = "skipTests" ]; then
-   mvn package -DskipTests -Pcassandra,inmemory,jpa,elasticsearch,lucene,with-assembly,with-jetm,swagger-json
+   mvn package -DskipTests
 else
-   mvn package -Pcassandra,inmemory,jpa,elasticsearch,lucene,with-assembly,with-jetm,swagger-json
+   mvn package
 fi
 
 # Retrieve result


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[10/13] james-project git commit: JAMES-2264 tests should all be executed by default

Posted by ad...@apache.org.
JAMES-2264 tests should all be executed by default


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/0f44851f
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/0f44851f
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/0f44851f

Branch: refs/heads/master
Commit: 0f44851f5edcd8a0795bbd1d96f63c45f4fa4be8
Parents: c402ecf
Author: Matthieu Baechler <ma...@apache.org>
Authored: Mon Nov 13 22:45:51 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Dec 22 09:44:59 2017 +0100

----------------------------------------------------------------------
 server/protocols/jmap-integration-testing/pom.xml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/0f44851f/server/protocols/jmap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/pom.xml b/server/protocols/jmap-integration-testing/pom.xml
index c684796..ed38f3f 100644
--- a/server/protocols/jmap-integration-testing/pom.xml
+++ b/server/protocols/jmap-integration-testing/pom.xml
@@ -33,21 +33,9 @@
     <name>Apache James :: Server :: JMAP :: Integration testing</name>
 
     <modules>
+        <module>cassandra-jmap-integration-testing</module>
         <module>jmap-integration-testing-common</module>
+        <module>memory-jmap-integration-testing</module>
     </modules>
 
-    <profiles>
-        <profile>
-            <id>cassandra</id>
-            <modules>
-                <module>cassandra-jmap-integration-testing</module>
-            </modules>
-        </profile>
-        <profile>
-            <id>inmemory</id>
-            <modules>
-                <module>memory-jmap-integration-testing</module>
-            </modules>
-        </profile>
-    </profiles>
 </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[08/13] james-project git commit: JAMES-2264 swagger can be generated with every build

Posted by ad...@apache.org.
JAMES-2264 swagger can be generated with every build


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/c402ecf3
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/c402ecf3
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/c402ecf3

Branch: refs/heads/master
Commit: c402ecf33165deb37d291db8ab6b44ad0d030fa4
Parents: a26b60a
Author: Matthieu Baechler <ma...@apache.org>
Authored: Mon Nov 13 22:43:55 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Dec 22 09:44:59 2017 +0100

----------------------------------------------------------------------
 server/protocols/webadmin/webadmin-data/pom.xml | 66 +++++++++-----------
 .../protocols/webadmin/webadmin-mailbox/pom.xml | 66 +++++++++-----------
 .../protocols/webadmin/webadmin-swagger/pom.xml | 66 +++++++++-----------
 3 files changed, 93 insertions(+), 105 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/c402ecf3/server/protocols/webadmin/webadmin-data/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-data/pom.xml b/server/protocols/webadmin/webadmin-data/pom.xml
index b9a403a..5fbad1a 100644
--- a/server/protocols/webadmin/webadmin-data/pom.xml
+++ b/server/protocols/webadmin/webadmin-data/pom.xml
@@ -116,39 +116,35 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>swagger-json</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.github.kongchen</groupId>
-                        <artifactId>swagger-maven-plugin</artifactId>
-                        <configuration>
-                            <apiSources>
-                                <apiSource>
-                                    <springmvc>false</springmvc>
-                                    <locations>org.apache.james.webadmin</locations>
-                                    <info>
-                                        <title>Swagger Maven Plugin</title>
-                                        <version>v1</version>
-                                    </info>
-                                    <swaggerDirectory>${project.build.directory}</swaggerDirectory>
-                                    <swaggerFileName>webadmin-data</swaggerFileName>
-                                </apiSource>
-                            </apiSources>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.github.kongchen</groupId>
+                <artifactId>swagger-maven-plugin</artifactId>
+                <configuration>
+                    <apiSources>
+                        <apiSource>
+                            <springmvc>false</springmvc>
+                            <locations>org.apache.james.webadmin</locations>
+                            <info>
+                                <title>Swagger Maven Plugin</title>
+                                <version>v1</version>
+                            </info>
+                            <swaggerDirectory>${project.build.directory}</swaggerDirectory>
+                            <swaggerFileName>webadmin-data</swaggerFileName>
+                        </apiSource>
+                    </apiSources>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/c402ecf3/server/protocols/webadmin/webadmin-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-mailbox/pom.xml b/server/protocols/webadmin/webadmin-mailbox/pom.xml
index a3e78c6..dfe3820 100644
--- a/server/protocols/webadmin/webadmin-mailbox/pom.xml
+++ b/server/protocols/webadmin/webadmin-mailbox/pom.xml
@@ -136,39 +136,35 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>swagger-json</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.github.kongchen</groupId>
-                        <artifactId>swagger-maven-plugin</artifactId>
-                        <configuration>
-                            <apiSources>
-                                <apiSource>
-                                    <springmvc>false</springmvc>
-                                    <locations>org.apache.james.webadmin</locations>
-                                    <info>
-                                        <title>Swagger Maven Plugin</title>
-                                        <version>v1</version>
-                                    </info>
-                                    <swaggerDirectory>${project.build.directory}</swaggerDirectory>
-                                    <swaggerFileName>webadmin-mailbox</swaggerFileName>
-                                </apiSource>
-                            </apiSources>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.github.kongchen</groupId>
+                <artifactId>swagger-maven-plugin</artifactId>
+                <configuration>
+                    <apiSources>
+                        <apiSource>
+                            <springmvc>false</springmvc>
+                            <locations>org.apache.james.webadmin</locations>
+                            <info>
+                                <title>Swagger Maven Plugin</title>
+                                <version>v1</version>
+                            </info>
+                            <swaggerDirectory>${project.build.directory}</swaggerDirectory>
+                            <swaggerFileName>webadmin-mailbox</swaggerFileName>
+                        </apiSource>
+                    </apiSources>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/c402ecf3/server/protocols/webadmin/webadmin-swagger/pom.xml
----------------------------------------------------------------------
diff --git a/server/protocols/webadmin/webadmin-swagger/pom.xml b/server/protocols/webadmin/webadmin-swagger/pom.xml
index 8ebdea9..cc8fa4f 100644
--- a/server/protocols/webadmin/webadmin-swagger/pom.xml
+++ b/server/protocols/webadmin/webadmin-swagger/pom.xml
@@ -39,39 +39,35 @@
         </dependency>
     </dependencies>
 
-    <profiles>
-        <profile>
-            <id>swagger-json</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>com.github.kongchen</groupId>
-                        <artifactId>swagger-maven-plugin</artifactId>
-                        <configuration>
-                            <apiSources>
-                                <apiSource>
-                                    <springmvc>false</springmvc>
-                                    <locations>org.apache.james.webadmin</locations>
-                                    <info>
-                                        <title>Swagger Maven Plugin</title>
-                                        <version>v1</version>
-                                    </info>
-                                    <swaggerDirectory>${project.build.directory}</swaggerDirectory>
-                                    <swaggerFileName>webadmin-swagger</swaggerFileName>
-                                </apiSource>
-                            </apiSources>
-                        </configuration>
-                        <executions>
-                            <execution>
-                                <phase>compile</phase>
-                                <goals>
-                                    <goal>generate</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.github.kongchen</groupId>
+                <artifactId>swagger-maven-plugin</artifactId>
+                <configuration>
+                    <apiSources>
+                        <apiSource>
+                            <springmvc>false</springmvc>
+                            <locations>org.apache.james.webadmin</locations>
+                            <info>
+                                <title>Swagger Maven Plugin</title>
+                                <version>v1</version>
+                            </info>
+                            <swaggerDirectory>${project.build.directory}</swaggerDirectory>
+                            <swaggerFileName>webadmin-swagger</swaggerFileName>
+                        </apiSource>
+                    </apiSources>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[13/13] james-project git commit: JAMES-2264 all mpt tests should be played

Posted by ad...@apache.org.
JAMES-2264 all mpt tests should be played


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6fc0c7b8
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6fc0c7b8
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6fc0c7b8

Branch: refs/heads/master
Commit: 6fc0c7b81abd26055ed1cd9075265e4a5d8c2a4b
Parents: f6f70b2
Author: Matthieu Baechler <ma...@apache.org>
Authored: Mon Nov 13 22:53:08 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Dec 22 09:44:59 2017 +0100

----------------------------------------------------------------------
 mpt/impl/imap-mailbox/pom.xml   | 56 ------------------------------------
 mpt/impl/managesieve/pom.xml    | 43 ---------------------------
 mpt/impl/smtp/cassandra/pom.xml | 11 +------
 mpt/impl/smtp/pom.xml           | 23 ---------------
 4 files changed, 1 insertion(+), 132 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/6fc0c7b8/mpt/impl/imap-mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/pom.xml b/mpt/impl/imap-mailbox/pom.xml
index 4ba5585..aeadb51 100644
--- a/mpt/impl/imap-mailbox/pom.xml
+++ b/mpt/impl/imap-mailbox/pom.xml
@@ -144,60 +144,4 @@ ${elasticsearch.includes}, ${jpa-lucene.includes}</include>
         </pluginManagement>
     </build>
 
-    <profiles>
-        <profile>
-            <id>cassandra</id>
-            <properties>
-                <cassandra.includes>**/cassandra/**/*.java</cassandra.includes>
-            </properties>
-        </profile>
-        <profile>
-            <id>hbase</id>
-            <properties>
-                <hbase.includes>**/hbase/**/*.java</hbase.includes>
-            </properties>
-        </profile>
-        <profile>
-            <id>inmemory</id>
-            <properties>
-                <inmemory.includes>**/inmemory/**/*.java</inmemory.includes>
-            </properties>
-        </profile>
-        <profile>
-            <id>jcr</id>
-            <properties>
-                <jcr.includes>**/jcr/**/*.java</jcr.includes>
-            </properties>
-        </profile>
-        <profile>
-            <id>jpa</id>
-            <properties>
-                <jpa.includes>**/jpa/**/*.java</jpa.includes>
-            </properties>
-        </profile>
-        <profile>
-            <id>jpa-lucene</id>
-            <properties>
-                <jpa-lucene.includes>**/lucenesearch/**/*.java</jpa-lucene.includes>
-            </properties>
-        </profile>
-        <profile>
-            <id>maildir</id>
-            <properties>
-                <maildir.includes>**/maildir/**/*.java</maildir.includes>
-            </properties>
-        </profile>
-        <profile>
-            <id>cyrus</id>
-            <properties>
-                <cyrus.includes>**/cyrus/**/*.java</cyrus.includes>
-            </properties>
-        </profile>
-        <profile>
-            <id>elasticsearch</id>
-            <properties>
-                <elasticsearch.includes>**/elasticsearch/**/*.java</elasticsearch.includes>
-            </properties>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/6fc0c7b8/mpt/impl/managesieve/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/managesieve/pom.xml b/mpt/impl/managesieve/pom.xml
index 70a071d..ef90d9e 100644
--- a/mpt/impl/managesieve/pom.xml
+++ b/mpt/impl/managesieve/pom.xml
@@ -59,47 +59,4 @@
         </dependencies>
     </dependencyManagement>
 
-    <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>
-        </profile>
-        <profile>
-            <id>file</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <includes>
-                                <include>**/file/**/*.java</include>
-                            </includes>
-                            <excludes>
-                                <exclude>**/suite/*.java</exclude>
-                                <exclude>**/suite/**/*.java</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/6fc0c7b8/mpt/impl/smtp/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/cassandra/pom.xml b/mpt/impl/smtp/cassandra/pom.xml
index d97ce49..b2c534c 100644
--- a/mpt/impl/smtp/cassandra/pom.xml
+++ b/mpt/impl/smtp/cassandra/pom.xml
@@ -121,14 +121,5 @@
             </plugin>
         </plugins>
     </build>
-
-    <profiles>
-        <profile>
-            <id>cassandra</id>
-            <properties>
-                <cassandra.includes>**/*.java</cassandra.includes>
-            </properties>
-        </profile>
-    </profiles>
-
+    
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/6fc0c7b8/mpt/impl/smtp/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/smtp/pom.xml b/mpt/impl/smtp/pom.xml
index 01e8270..68ecb1b 100644
--- a/mpt/impl/smtp/pom.xml
+++ b/mpt/impl/smtp/pom.xml
@@ -52,27 +52,4 @@
         </dependencies>
     </dependencyManagement>
 
-    <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>
-        </profile>
-    </profiles>
-
 </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[09/13] james-project git commit: JAMES-2264 tika should not be disabled any longer

Posted by ad...@apache.org.
JAMES-2264 tika should not be disabled any longer


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/538af50b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/538af50b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/538af50b

Branch: refs/heads/master
Commit: 538af50bf749c513ff904b799734ee6f145435c6
Parents: 7ed9776
Author: Matthieu Baechler <ma...@apache.org>
Authored: Mon Nov 13 22:49:09 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Dec 22 09:44:59 2017 +0100

----------------------------------------------------------------------
 mailbox/pom.xml      | 26 --------------------------
 mailbox/tika/pom.xml | 27 +--------------------------
 2 files changed, 1 insertion(+), 52 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/538af50b/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index 773fef9..942081b 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -95,30 +95,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <id>exclude-tika</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-
-            <dependencies>
-                <dependency>
-                    <groupId>${project.groupId}</groupId>
-                    <artifactId>apache-james-mailbox-elasticsearch</artifactId>
-                    <type>pom</type>
-                    <exclusions>
-                        <exclusion>
-                            <groupId>org.apache.tika</groupId>
-                            <artifactId>tika-core</artifactId>
-                        </exclusion>
-                        <exclusion>
-                            <groupId>org.apache.tika</groupId>
-                            <artifactId>tika-parsers</artifactId>
-                        </exclusion>
-                    </exclusions>
-                </dependency>
-            </dependencies>
-        </profile>
-    </profiles>
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/538af50b/mailbox/tika/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/tika/pom.xml b/mailbox/tika/pom.xml
index d5775fc..de3c71c 100644
--- a/mailbox/tika/pom.xml
+++ b/mailbox/tika/pom.xml
@@ -97,30 +97,5 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <profiles>
-        <profile>
-            <id>remove-tika</id>
-            <activation>
-                <activeByDefault>false</activeByDefault>
-            </activation>
-        </profile>
-        <profile>
-            <id>exclude-tika</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-jar-plugin</artifactId>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/**</exclude>
-                            </excludes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-
+    
 </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[03/13] james-project git commit: JAMES-2264 move livetests profile to karaf project

Posted by ad...@apache.org.
JAMES-2264 move livetests profile to karaf project


Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7ed97761
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7ed97761
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7ed97761

Branch: refs/heads/master
Commit: 7ed977617f416d8bf46f5d75d3ab9bd10a468ff1
Parents: 0f44851
Author: Matthieu Baechler <ma...@apache.org>
Authored: Mon Nov 13 22:47:05 2017 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Fri Dec 22 09:44:59 2017 +0100

----------------------------------------------------------------------
 server/karaf/integration/pom.xml | 21 +++++++++++++++++++++
 server/pom.xml                   | 20 --------------------
 2 files changed, 21 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/james-project/blob/7ed97761/server/karaf/integration/pom.xml
----------------------------------------------------------------------
diff --git a/server/karaf/integration/pom.xml b/server/karaf/integration/pom.xml
index a11994c..7b388cf 100644
--- a/server/karaf/integration/pom.xml
+++ b/server/karaf/integration/pom.xml
@@ -128,4 +128,25 @@
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <!-- run live tests, ie. ones that do not run stably enough in
+            a CI environment (for example, karaf integration tests accessing external network
+            resources) -->
+            <id>livetests</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <includes>
+                                <include>**/*TestLive.java</include>
+                            </includes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>

http://git-wip-us.apache.org/repos/asf/james-project/blob/7ed97761/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index 65d4e80..cff65bb 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -166,24 +166,4 @@
         </plugins>
     </build>
 
-    <profiles>
-        <profile>
-            <!-- run live tests, ie. ones that do not run stably enough in
-            a CI environment (for example, karaf integration tests accessing external network
-            resources) -->
-            <id>livetests</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <includes>
-                                <include>**/*TestLive.java</include>
-                            </includes>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
 </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org