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 2018/11/12 00:36:31 UTC
svn commit: r1846369 - in /webservices/axiom/branches/1.2.x: ./ pom.xml
testing/ testing/dom-testsuite/pom.xml
Author: veithen
Date: Mon Nov 12 00:36:31 2018
New Revision: 1846369
URL: http://svn.apache.org/viewvc?rev=1846369&view=rev
Log:
Merge r1798352 to the 1.2 branch.
Modified:
webservices/axiom/branches/1.2.x/ (props changed)
webservices/axiom/branches/1.2.x/pom.xml
webservices/axiom/branches/1.2.x/testing/ (props changed)
webservices/axiom/branches/1.2.x/testing/dom-testsuite/pom.xml
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 12 00:36:31 2018
@@ -14,4 +14,4 @@
/webservices/axiom/branches/maven-site-plugin-3.5:1731125-1732708
/webservices/axiom/branches/namespaceURIInterning:1293148-1293587
/webservices/axiom/branches/osgi-redesign:1180368-1180596
-/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1791831,1795059,1795067,1795081,1796558,1806321,1815009,1817725,1817727,1817735,1826041,1843069,1843517,1845037,1845623
+/webservices/axiom/trunk:1726096,1726101,1726419,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727541,1727549,1727640,1727660,1727688,1727743,1727755,1727758,1727761,1728022,1728240,1728929,1730261,1730278,1731157,1731314-1731315,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1740914,1741786,1741791,1741979,1758113,1762239,1762241,1762243,1777898,1781319,1781488,1787644,1791831,1795059,1795067,1795081,1796558,1798352,1806321,1815009,1817725,1817727,1817735,1826041,1843069,1843517,1845037,1845623
Modified: webservices/axiom/branches/1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/pom.xml?rev=1846369&r1=1846368&r2=1846369&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/pom.xml Mon Nov 12 00:36:31 2018
@@ -261,8 +261,8 @@
<shade.plugin.version>2.3</shade.plugin.version>
<enforcer.plugin.version>1.4.1</enforcer.plugin.version>
<jacoco.version>0.7.5.201505241946</jacoco.version>
- <spring.version>4.2.1.RELEASE</spring.version>
- <springws.version>2.2.4.RELEASE</springws.version>
+ <spring.version>4.3.9.RELEASE</spring.version>
+ <springws.version>2.4.0.RELEASE</springws.version>
<exam.version>4.7.0</exam.version>
<skipDeploy>false</skipDeploy>
@@ -546,6 +546,11 @@
<artifactId>slf4j-jdk14</artifactId>
<version>1.5.11</version>
</dependency>
+ <dependency>
+ <groupId>org.ow2.asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>5.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Propchange: webservices/axiom/branches/1.2.x/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov 12 00:36:31 2018
@@ -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,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979,1758113,1762241,1762243,1795067,1817725,1817727,1817735
+/webservices/axiom/trunk/testing:1726096,1726101,1726474-1726475,1726489,1727220,1727422,1727435,1727496,1727513,1727529,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979,1758113,1762241,1762243,1795067,1798352,1817725,1817727,1817735
Modified: webservices/axiom/branches/1.2.x/testing/dom-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/dom-testsuite/pom.xml?rev=1846369&r1=1846368&r2=1846369&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/dom-testsuite/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/testing/dom-testsuite/pom.xml Mon Nov 12 00:36:31 2018
@@ -65,7 +65,6 @@
<dependency>
<groupId>org.ow2.asm</groupId>
<artifactId>asm</artifactId>
- <version>5.0.3</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>