james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From btell...@apache.org
Subject [james-project] 01/06: JAMES-2708 Moving rest client fegin dependencies to the root pom
Date Thu, 11 Apr 2019 10:15:40 GMT
This is an automated email from the ASF dual-hosted git repository.

btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit d94a866d02070ad6fcc3a0db45854a0a21cd9605
Author: Tran Tien Duc <dtran@linagora.com>
AuthorDate: Thu Apr 4 11:21:05 2019 +0700

    JAMES-2708 Moving rest client fegin dependencies to the root pom
    
    To be used in Linshare
---
 backends-common/rabbitmq/pom.xml                   |  7 -------
 .../backend/rabbitmq/RabbitMQManagementAPI.java    |  2 +-
 pom.xml                                            | 22 ++++++++++++++++++++++
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/backends-common/rabbitmq/pom.xml b/backends-common/rabbitmq/pom.xml
index 175e9a9..6e1760e 100644
--- a/backends-common/rabbitmq/pom.xml
+++ b/backends-common/rabbitmq/pom.xml
@@ -30,10 +30,6 @@
     <artifactId>apache-james-backends-rabbitmq</artifactId>
     <name>Apache James RabbitMQ backend</name>
 
-    <properties>
-        <feign.version>10.0.1</feign.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>${james.groupId}</groupId>
@@ -68,17 +64,14 @@
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-core</artifactId>
-            <version>${feign.version}</version>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-jackson</artifactId>
-            <version>${feign.version}</version>
         </dependency>
         <dependency>
             <groupId>io.github.openfeign</groupId>
             <artifactId>feign-slf4j</artifactId>
-            <version>${feign.version}</version>
         </dependency>
         <dependency>
             <groupId>io.projectreactor.rabbitmq</groupId>
diff --git a/backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/RabbitMQManagementAPI.java
b/backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/RabbitMQManagementAPI.java
index d8ad7bb..15be247 100644
--- a/backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/RabbitMQManagementAPI.java
+++ b/backends-common/rabbitmq/src/main/java/org/apache/james/backend/rabbitmq/RabbitMQManagementAPI.java
@@ -156,7 +156,7 @@ public interface RabbitMQManagementAPI {
 
     ErrorDecoder RETRY_500 = (methodKey, response) -> {
         if (response.status() == 500) {
-            throw new RetryableException("Error encountered, scheduling retry", response.request().httpMethod(),
new Date());
+            throw new RetryableException(response.status(), "Error encountered, scheduling
retry", response.request().httpMethod(), new Date());
         }
         throw new RuntimeException("Non recoverable exception status: " + response.status());
     };
diff --git a/pom.xml b/pom.xml
index 9f04c6d..3110ef9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -629,6 +629,8 @@
         <karaf.tooling.exam.container.version>2.3.0</karaf.tooling.exam.container.version>
         <pax-logging-api.version>1.6.4</pax-logging-api.version>
         <jackson.version>2.9.6</jackson.version>
+        <feign.version>10.2.0</feign.version>
+        <feign-form.version>3.8.0</feign-form.version>
         <jetty.version>9.4.7.v20170914</jetty.version>
         <metrics.version>3.2.6</metrics.version>
         <testcontainers.version>1.11.1</testcontainers.version>
@@ -2094,6 +2096,26 @@
                 <version>0.9.1</version>
             </dependency>
             <dependency>
+                <groupId>io.github.openfeign</groupId>
+                <artifactId>feign-core</artifactId>
+                <version>${feign.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.github.openfeign</groupId>
+                <artifactId>feign-jackson</artifactId>
+                <version>${feign.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.github.openfeign</groupId>
+                <artifactId>feign-slf4j</artifactId>
+                <version>${feign.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>io.github.openfeign.form</groupId>
+                <artifactId>feign-form</artifactId>
+                <version>${feign-form.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty</artifactId>
                 <version>${netty.version}</version>


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


Mime
View raw message