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 2017/08/18 11:40:23 UTC
[1/2] james-project git commit: JAMES-2117 don't leak cluster on
failure
Repository: james-project
Updated Branches:
refs/heads/master 88f43f1b9 -> 8d31fc5a2
JAMES-2117 don't leak cluster on failure
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/8d31fc5a
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/8d31fc5a
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/8d31fc5a
Branch: refs/heads/master
Commit: 8d31fc5a2207f454e92e22ab42bd1b400309fad7
Parents: b0df884
Author: Matthieu Baechler <ma...@apache.org>
Authored: Wed Aug 16 10:06:49 2017 +0200
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Fri Aug 18 08:49:03 2017 +0200
----------------------------------------------------------------------
backends-common/cassandra/pom.xml | 5 ++++-
.../james/backends/cassandra/init/ClusterBuilder.java | 13 ++++++++-----
backends-common/pom.xml | 5 +++++
3 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/8d31fc5a/backends-common/cassandra/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/pom.xml b/backends-common/cassandra/pom.xml
index 4051f75..c27326c 100644
--- a/backends-common/cassandra/pom.xml
+++ b/backends-common/cassandra/pom.xml
@@ -30,10 +30,13 @@
<artifactId>apache-james-backends-cassandra</artifactId>
<name>Apache James Cassandra backend</name>
-
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-lifecycle-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-util-java8</artifactId>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/8d31fc5a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterBuilder.java
----------------------------------------------------------------------
diff --git a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterBuilder.java b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterBuilder.java
index 18e8749..0e23f7a 100644
--- a/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterBuilder.java
+++ b/backends-common/cassandra/src/main/java/org/apache/james/backends/cassandra/init/ClusterBuilder.java
@@ -175,11 +175,14 @@ public class ClusterBuilder {
poolingOptions.ifPresent(clusterBuilder::withPoolingOptions);
Cluster cluster = clusterBuilder.build();
-
- queryLogger.map(queryLoggerConfiguration ->
- cluster.register(queryLoggerConfiguration.getQueryLogger()));
-
- return cluster;
+ try {
+ queryLogger.map(queryLoggerConfiguration ->
+ cluster.register(queryLoggerConfiguration.getQueryLogger()));
+ return cluster;
+ } catch (Exception e) {
+ cluster.close();
+ throw e;
+ }
}
private Optional<Integer> getRefreshSchemaIntervalMillis() {
http://git-wip-us.apache.org/repos/asf/james-project/blob/8d31fc5a/backends-common/pom.xml
----------------------------------------------------------------------
diff --git a/backends-common/pom.xml b/backends-common/pom.xml
index 40f093d..101aac0 100644
--- a/backends-common/pom.xml
+++ b/backends-common/pom.xml
@@ -48,6 +48,11 @@
<dependencies>
<dependency>
<groupId>org.apache.james</groupId>
+ <artifactId>james-server-lifecycle-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
<artifactId>james-server-util-java8</artifactId>
<version>3.1.0-SNAPSHOT</version>
</dependency>
---------------------------------------------------------------------
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: JAMES-2117 factorize logback version
Posted by bt...@apache.org.
JAMES-2117 factorize logback version
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/b0df8844
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/b0df8844
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/b0df8844
Branch: refs/heads/master
Commit: b0df88445eebf3b3526952256a34923cc97c1e63
Parents: 88f43f1
Author: Matthieu Baechler <ma...@apache.org>
Authored: Thu Jul 6 15:49:28 2017 -0400
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Fri Aug 18 08:49:03 2017 +0200
----------------------------------------------------------------------
server/container/guice/cassandra-guice/pom.xml | 1 -
server/container/guice/jpa-guice/pom.xml | 1 -
server/container/guice/jpa-smtp/pom.xml | 1 -
server/container/guice/memory-guice/pom.xml | 1 -
server/data/data-ldap-integration-testing/pom.xml | 1 -
server/mailet/integration-testing/pom.xml | 1 -
server/mailet/mailets/pom.xml | 1 -
server/pom.xml | 5 +++++
.../memory-jmap-integration-testing/pom.xml | 1 -
9 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/b0df8844/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 98fafe7..88289f7 100644
--- a/server/container/guice/cassandra-guice/pom.xml
+++ b/server/container/guice/cassandra-guice/pom.xml
@@ -183,7 +183,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.7</version>
</dependency>
<dependency>
<groupId>com.internetitem</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/b0df8844/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 aae3543..e4ca4bb 100644
--- a/server/container/guice/jpa-guice/pom.xml
+++ b/server/container/guice/jpa-guice/pom.xml
@@ -119,7 +119,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.7</version>
</dependency>
<dependency>
<groupId>com.jayway.awaitility</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/b0df8844/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 20b386a..d203b1d 100644
--- a/server/container/guice/jpa-smtp/pom.xml
+++ b/server/container/guice/jpa-smtp/pom.xml
@@ -88,7 +88,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.7</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
http://git-wip-us.apache.org/repos/asf/james-project/blob/b0df8844/server/container/guice/memory-guice/pom.xml
----------------------------------------------------------------------
diff --git a/server/container/guice/memory-guice/pom.xml b/server/container/guice/memory-guice/pom.xml
index 4fa056b..94610bb 100644
--- a/server/container/guice/memory-guice/pom.xml
+++ b/server/container/guice/memory-guice/pom.xml
@@ -173,7 +173,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.7</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/b0df8844/server/data/data-ldap-integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/data/data-ldap-integration-testing/pom.xml b/server/data/data-ldap-integration-testing/pom.xml
index 7a8003b..8ac3f52 100644
--- a/server/data/data-ldap-integration-testing/pom.xml
+++ b/server/data/data-ldap-integration-testing/pom.xml
@@ -52,7 +52,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.7</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/b0df8844/server/mailet/integration-testing/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/integration-testing/pom.xml b/server/mailet/integration-testing/pom.xml
index ff2620b..f7611d8 100644
--- a/server/mailet/integration-testing/pom.xml
+++ b/server/mailet/integration-testing/pom.xml
@@ -91,7 +91,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.6</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/b0df8844/server/mailet/mailets/pom.xml
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/pom.xml b/server/mailet/mailets/pom.xml
index 10040b3..2497aab 100644
--- a/server/mailet/mailets/pom.xml
+++ b/server/mailet/mailets/pom.xml
@@ -158,7 +158,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.6</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/james-project/blob/b0df8844/server/pom.xml
----------------------------------------------------------------------
diff --git a/server/pom.xml b/server/pom.xml
index f4d8df4..c0285a4 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -997,6 +997,11 @@
<version>${apache-mime4j.version}</version>
</dependency>
<dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.1.7</version>
+ </dependency>
+ <dependency>
<groupId>com.sun.mail</groupId>
<artifactId>javax.mail</artifactId>
<version>1.5.4</version>
http://git-wip-us.apache.org/repos/asf/james-project/blob/b0df8844/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 e76d1d8..3a020b2 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
@@ -126,7 +126,6 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
- <version>1.1.6</version>
<scope>test</scope>
</dependency>
</dependencies>
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org