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 bt...@apache.org on 2018/12/11 01:49:05 UTC
[1/3] james-project git commit: JAMES-2620 Tests classes should have
a name ending by Test
Repository: james-project
Updated Branches:
refs/heads/master 1555f517e -> d700a9718
JAMES-2620 Tests classes should have a name ending by Test
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7b97862c
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7b97862c
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7b97862c
Branch: refs/heads/master
Commit: 7b97862c908238b0a082604f76d3c48b44d2805e
Parents: 1555f51
Author: Antoine Duprat <ad...@linagora.com>
Authored: Mon Dec 10 11:37:30 2018 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Mon Dec 10 11:38:45 2018 +0100
----------------------------------------------------------------------
.../compilation/java-8/integration_tests.sh | 2 +-
.../james/JamesDeploymentValidation.java | 53 --------------------
.../james/JamesDeploymentValidationTest.java | 53 ++++++++++++++++++++
3 files changed, 54 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/7b97862c/dockerfiles/compilation/java-8/integration_tests.sh
----------------------------------------------------------------------
diff --git a/dockerfiles/compilation/java-8/integration_tests.sh b/dockerfiles/compilation/java-8/integration_tests.sh
index 0fab296..8570bb7 100755
--- a/dockerfiles/compilation/java-8/integration_tests.sh
+++ b/dockerfiles/compilation/java-8/integration_tests.sh
@@ -54,4 +54,4 @@ git checkout $SHA1
mvn -DskipTests -pl org.apache.james:apache-james-mpt-external-james -am package
-mvn -Dtest=JamesDeploymentValidation -pl org.apache.james:apache-james-mpt-external-james test
+mvn -Dtest=JamesDeploymentValidationTest -pl org.apache.james:apache-james-mpt-external-james test
http://git-wip-us.apache.org/repos/asf/james-project/blob/7b97862c/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidation.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidation.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidation.java
deleted file mode 100644
index a4e5ba6..0000000
--- a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidation.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/****************************************************************
- * Licensed to the Apache Software Foundation (ASF) under one *
- * or more contributor license agreements. See the NOTICE file *
- * distributed with this work for additional information *
- * regarding copyright ownership. The ASF licenses this file *
- * to you under the Apache License, Version 2.0 (the *
- * "License"); you may not use this file except in compliance *
- * with the License. You may obtain a copy of the License at *
- * *
- * http://www.apache.org/licenses/LICENSE-2.0 *
- * *
- * Unless required by applicable law or agreed to in writing, *
- * software distributed under the License is distributed on an *
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
- * KIND, either express or implied. See the License for the *
- * specific language governing permissions and limitations *
- * under the License. *
- ****************************************************************/
-
-package org.apache.james.mpt.imapmailbox.external.james;
-
-import org.apache.james.mpt.api.ImapHostSystem;
-import org.junit.After;
-import org.junit.Before;
-
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-
-public class JamesDeploymentValidation extends DeploymentValidation {
-
- private ImapHostSystem system;
-
- @Override
- @Before
- public void setUp() throws Exception {
- Injector injector = Guice.createInjector(new ExternalJamesModule());
- system = injector.getInstance(ImapHostSystem.class);
- system.beforeTest();
- super.setUp();
- }
-
- @Override
- protected ImapHostSystem createImapHostSystem() {
- return system;
- }
-
- @After
- public void tearDown() throws Exception {
- system.afterTest();
- }
-
-
-}
http://git-wip-us.apache.org/repos/asf/james-project/blob/7b97862c/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidationTest.java
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidationTest.java b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidationTest.java
new file mode 100644
index 0000000..81394f6
--- /dev/null
+++ b/mpt/impl/imap-mailbox/external-james/src/test/java/org/apache/james/mpt/imapmailbox/external/james/JamesDeploymentValidationTest.java
@@ -0,0 +1,53 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.mpt.imapmailbox.external.james;
+
+import org.apache.james.mpt.api.ImapHostSystem;
+import org.junit.After;
+import org.junit.Before;
+
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+
+public class JamesDeploymentValidationTest extends DeploymentValidation {
+
+ private ImapHostSystem system;
+
+ @Override
+ @Before
+ public void setUp() throws Exception {
+ Injector injector = Guice.createInjector(new ExternalJamesModule());
+ system = injector.getInstance(ImapHostSystem.class);
+ system.beforeTest();
+ super.setUp();
+ }
+
+ @Override
+ protected ImapHostSystem createImapHostSystem() {
+ return system;
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ system.afterTest();
+ }
+
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[3/3] james-project git commit: JAMES-2620 Integration tests should
be activated by a maven profile
Posted by bt...@apache.org.
JAMES-2620 Integration tests should be activated by a maven profile
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/d700a971
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/d700a971
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/d700a971
Branch: refs/heads/master
Commit: d700a97186ab86618924a29c60e8560a863b7028
Parents: 7291f49
Author: Antoine Duprat <ad...@linagora.com>
Authored: Mon Dec 10 12:59:45 2018 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Mon Dec 10 12:59:45 2018 +0100
----------------------------------------------------------------------
.../compilation/java-8/integration_tests.sh | 2 +-
mpt/impl/imap-mailbox/external-james/pom.xml | 31 ++++++++++++++++++++
2 files changed, 32 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/d700a971/dockerfiles/compilation/java-8/integration_tests.sh
----------------------------------------------------------------------
diff --git a/dockerfiles/compilation/java-8/integration_tests.sh b/dockerfiles/compilation/java-8/integration_tests.sh
index 8570bb7..4047d8c 100755
--- a/dockerfiles/compilation/java-8/integration_tests.sh
+++ b/dockerfiles/compilation/java-8/integration_tests.sh
@@ -54,4 +54,4 @@ git checkout $SHA1
mvn -DskipTests -pl org.apache.james:apache-james-mpt-external-james -am package
-mvn -Dtest=JamesDeploymentValidationTest -pl org.apache.james:apache-james-mpt-external-james test
+mvn -pl org.apache.james:apache-james-mpt-external-james test -Pintegration-tests
http://git-wip-us.apache.org/repos/asf/james-project/blob/d700a971/mpt/impl/imap-mailbox/external-james/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/impl/imap-mailbox/external-james/pom.xml b/mpt/impl/imap-mailbox/external-james/pom.xml
index 595d9ee..74bf4a6 100644
--- a/mpt/impl/imap-mailbox/external-james/pom.xml
+++ b/mpt/impl/imap-mailbox/external-james/pom.xml
@@ -68,4 +68,35 @@
<artifactId>commons-lang3</artifactId>
</dependency>
</dependencies>
+
+ <profiles>
+ <profile>
+ <id>dev</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </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>integration-tests</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </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
[2/3] james-project git commit: JAMES-2620 Remove duplicate in maven
dependencies
Posted by bt...@apache.org.
JAMES-2620 Remove duplicate in maven dependencies
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/7291f498
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/7291f498
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/7291f498
Branch: refs/heads/master
Commit: 7291f4981c241e1c614f1edf639457a68212f702
Parents: 7b97862
Author: Antoine Duprat <ad...@linagora.com>
Authored: Mon Dec 10 11:39:12 2018 +0100
Committer: Antoine Duprat <ad...@linagora.com>
Committed: Mon Dec 10 11:39:12 2018 +0100
----------------------------------------------------------------------
mailbox/plugin/spamassassin/pom.xml | 6 ------
1 file changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/7291f498/mailbox/plugin/spamassassin/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/plugin/spamassassin/pom.xml b/mailbox/plugin/spamassassin/pom.xml
index 6ea92f4..50fd396 100644
--- a/mailbox/plugin/spamassassin/pom.xml
+++ b/mailbox/plugin/spamassassin/pom.xml
@@ -44,12 +44,6 @@
</dependency>
<dependency>
<groupId>${james.groupId}</groupId>
- <artifactId>apache-james-mailbox-api</artifactId>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>${james.groupId}</groupId>
<artifactId>apache-james-mailbox-store</artifactId>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org