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 ma...@apache.org on 2017/08/21 13:20:35 UTC
[1/2] james-project git commit: JAMES-2120 upgrade testcontainers
Repository: james-project
Updated Branches:
refs/heads/master 49973add0 -> 87523ac81
JAMES-2120 upgrade testcontainers
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4285657a
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4285657a
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4285657a
Branch: refs/heads/master
Commit: 4285657a70068ed2ba989ff7c48812b07fa26536
Parents: 8d31fc5
Author: Matthieu Baechler <ma...@apache.org>
Authored: Wed Aug 16 11:05:41 2017 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Mon Aug 21 10:36:52 2017 +0200
----------------------------------------------------------------------
backends-common/elasticsearch/pom.xml | 5 ++---
backends-common/pom.xml | 6 ++++++
mailbox/pom.xml | 2 +-
mpt/pom.xml | 2 +-
server/pom.xml | 3 +--
.../memory-jmap-integration-testing/pom.xml | 5 -----
6 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/4285657a/backends-common/elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/elasticsearch/pom.xml b/backends-common/elasticsearch/pom.xml
index 1c005b1..4853e76 100644
--- a/backends-common/elasticsearch/pom.xml
+++ b/backends-common/elasticsearch/pom.xml
@@ -26,7 +26,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>apache-james-backends-es</artifactId>
-
+
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
@@ -82,8 +82,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <version>1.3.1</version>
<scope>test</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
http://git-wip-us.apache.org/repos/asf/james-project/blob/4285657a/backends-common/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/pom.xml b/backends-common/pom.xml
index 101aac0..35a3285 100644
--- a/backends-common/pom.xml
+++ b/backends-common/pom.xml
@@ -87,6 +87,12 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>testcontainers</artifactId>
+ <version>1.4.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/james-project/blob/4285657a/mailbox/pom.xml
----------------------------------------------------------------------
diff --git a/mailbox/pom.xml b/mailbox/pom.xml
index 3a5e5cd..3513260 100644
--- a/mailbox/pom.xml
+++ b/mailbox/pom.xml
@@ -639,7 +639,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <version>1.3.1</version>
+ <version>1.4.2</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/james-project/blob/4285657a/mpt/pom.xml
----------------------------------------------------------------------
diff --git a/mpt/pom.xml b/mpt/pom.xml
index d17ff93..14d17f7 100644
--- a/mpt/pom.xml
+++ b/mpt/pom.xml
@@ -486,7 +486,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <version>1.3.1</version>
+ <version>1.4.2</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/james-project/blob/4285657a/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index c0285a4..03c6dad 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -183,7 +183,6 @@
<jetty.version>9.4.4.v20170414</jetty.version>
<cassandra-unit.version>2.1.9.2</cassandra-unit.version>
<assertj-guava.version>3.1.0</assertj-guava.version>
- <testcontainers-version>1.3.1</testcontainers-version>
<guavate.version>1.0.0</guavate.version>
<metrics.version>3.2.1</metrics.version>
<joda.version>2.9.4</joda.version>
@@ -1682,7 +1681,7 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>testcontainers</artifactId>
- <version>${testcontainers-version}</version>
+ <version>1.4.2</version>
</dependency>
</dependencies>
</dependencyManagement>
http://git-wip-us.apache.org/repos/asf/james-project/blob/4285657a/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 3a020b2..c9e475d 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
@@ -119,11 +119,6 @@
<artifactId>java-hamcrest</artifactId>
</dependency>
<dependency>
- <groupId>org.testcontainers</groupId>
- <artifactId>testcontainers</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/2] james-project git commit: Merge branch 'JAMES-2120'
Posted by ma...@apache.org.
Merge branch 'JAMES-2120'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/87523ac8
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/87523ac8
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/87523ac8
Branch: refs/heads/master
Commit: 87523ac8177a5363e244b49a637848c7f5133664
Parents: 49973ad 4285657
Author: Matthieu Baechler <ma...@apache.org>
Authored: Mon Aug 21 15:19:56 2017 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Mon Aug 21 15:19:56 2017 +0200
----------------------------------------------------------------------
backends-common/elasticsearch/pom.xml | 5 ++---
backends-common/pom.xml | 6 ++++++
mailbox/pom.xml | 2 +-
mpt/pom.xml | 2 +-
server/pom.xml | 3 +--
.../memory-jmap-integration-testing/pom.xml | 5 -----
6 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org