Author: ravi
Date: Wed Dec 28 08:35:14 2016
New Revision: 1776241
URL: http://svn.apache.org/viewvc?rev=1776241&view=rev
Log:
Fix for SYNAPSE-1077
Modified:
synapse/trunk/java/modules/distribution/pom.xml
synapse/trunk/java/pom.xml
Modified: synapse/trunk/java/modules/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/modules/distribution/pom.xml?rev=1776241&r1=1776240&r2=1776241&view=diff
==============================================================================
--- synapse/trunk/java/modules/distribution/pom.xml (original)
+++ synapse/trunk/java/modules/distribution/pom.xml Wed Dec 28 08:35:14 2016
@@ -110,11 +110,22 @@
<artifactId>axis2-codegen</artifactId>
</dependency>
- <!-- JSON Support -->
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-json</artifactId>
- </dependency>
+ <!-- JSON Support -->
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-json</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jettison</groupId>
+ <artifactId>jettison</artifactId>
+ <version>${jettison.version}</version>
+ </dependency>
<!-- Additional transports -->
<dependency>
Modified: synapse/trunk/java/pom.xml
URL:
http://svn.apache.org/viewvc/synapse/trunk/java/pom.xml?rev=1776241&r1=1776240&r2=1776241&view=diff
==============================================================================
--- synapse/trunk/java/pom.xml (original)
+++ synapse/trunk/java/pom.xml Wed Dec 28 08:35:14 2016
@@ -1042,6 +1042,7 @@
<axis2.version>1.7.3</axis2.version>
<axiom.version>1.2.19</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>
