You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by ve...@apache.org on 2016/01/29 12:54:55 UTC
svn commit: r1727550 - in /webservices/axiom/branches/1.2.x: ./ testing/
testing/spring-ws-testsuite/pom.xml
Author: veithen
Date: Fri Jan 29 11:54:55 2016
New Revision: 1727550
URL: http://svn.apache.org/viewvc?rev=1727550&view=rev
Log:
Merge r1727549 to the 1.2 branch.
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/testing/ (props changed)
webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 11:54:55 2016
@@ -12,4 +12,4 @@
/webservices/axiom/branches/attrs-aspects:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541
+/webservices/axiom/trunk:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549
Propchange: webservices/axiom/branches/1.2.x/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jan 29 11:54:55 2016
@@ -12,4 +12,4 @@
/webservices/axiom/branches/attrs-aspects/testing:1685218-1686663
/webservices/axiom/branches/namespaceURIInterning/testing:1293148-1293587
/webservices/axiom/branches/osgi-redesign/testing:1180368-1180596
-/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529
+/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549
Modified: webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml?rev=1727550&r1=1727549&r2=1727550&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/testing/spring-ws-testsuite/pom.xml Fri Jan 29 11:54:55 2016
@@ -90,6 +90,16 @@
<groupId>org.codehaus.castor</groupId>
<artifactId>castor-xml</artifactId>
<version>1.3.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.stream</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.ws</groupId>