You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2017/01/12 23:31:38 UTC
svn commit: r1778485 - in /synapse/trunk/java: modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/AMQPTransportSender.java pom.xml

Author: veithen
Date: Thu Jan 12 23:31:37 2017
New Revision: 1778485

URL: http://svn.apache.org/viewvc?rev=1778485&view=rev
Log:
Switch some dependencies to snapshot versions so that we can detect regressions in these dependencies early.

Modified:
    synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/AMQPTransportSender.java
    synapse/trunk/java/pom.xml

Modified: synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/AMQPTransportSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/AMQPTransportSender.java?rev=1778485&r1=1778484&r2=1778485&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/AMQPTransportSender.java (original)
+++ synapse/trunk/java/modules/transports/optional/amqp/src/main/java/org/apache/synapse/transport/amqp/AMQPTransportSender.java Thu Jan 12 23:31:37 2017
@@ -27,7 +27,6 @@ import org.apache.axis2.engine.AxisEngin
 import org.apache.axis2.transport.OutTransportInfo;
 import org.apache.axis2.transport.base.AbstractTransportSender;
 import org.apache.axis2.util.MessageContextBuilder;
-import org.apache.http.protocol.HTTP;
 import org.apache.synapse.transport.amqp.connectionfactory.AMQPTransportConnectionFactoryManager;
 import org.apache.synapse.transport.amqp.pollingtask.AMQPSimpleConsumerTask;
 import org.apache.synapse.transport.amqp.sendertask.AMQPSender;
@@ -291,7 +290,7 @@ public class AMQPTransportSender extends
             }
             responseMsgCtx.setProperty(
                     Constants.Configuration.CHARACTER_SET_ENCODING,
-                    contentType.indexOf(HTTP.CHARSET_PARAM) > 0
+                    contentType.indexOf("; charset=") > 0
                             ? charSetEnc : MessageContext.DEFAULT_CHAR_SET_ENCODING);
             responseMsgCtx.setProperty(
                     MessageContext.TRANSPORT_HEADERS, message.getHeaders());

Modified: synapse/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=1778485&r1=1778484&r2=1778485&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Thu Jan 12 23:31:37 2017
@@ -1064,14 +1064,14 @@
         <commons.codec.version>1.6</commons.codec.version>
 
         <!-- Axis2 and its dependencies -->
-        <axis2.version>1.7.3</axis2.version>
-        <axiom.version>1.2.19</axiom.version>
+        <axis2.version>1.7.5-SNAPSHOT</axis2.version>
+        <axiom.version>1.2.21-SNAPSHOT</axiom.version>
         <wsdl4j.version>1.6.2</wsdl4j.version>
         <jettison.version>1.3.8</jettison.version>
 
         <!-- addressing, rampart, neethi -->
         <addressing.version>${axis2.version}</addressing.version>
-        <rampart.version>1.7.0</rampart.version>
+        <rampart.version>1.7.1-SNAPSHOT</rampart.version>
         <neethi.version>3.0.3</neethi.version>
         <jruby.version>1.3.0</jruby.version>
         <bcprov.jdk15.version>140</bcprov.jdk15.version>