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/09/26 07:13:45 UTC
svn commit: r1762281 - in /webservices/axiom/branches/1.2.x: ./ pom.xml
testing/
testing/axiom-truth/src/main/java/org/apache/axiom/truth/AxiomTestVerb.java
Author: veithen
Date: Mon Sep 26 07:13:45 2016
New Revision: 1762281
URL: http://svn.apache.org/viewvc?rev=1762281&view=rev
Log:
Merge r1762241 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/axiom-truth/src/main/java/org/apache/axiom/truth/AxiomTestVerb.java
Propchange: webservices/axiom/branches/1.2.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 26 07:13:45 2016
@@ -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
+/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
Modified: webservices/axiom/branches/1.2.x/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/pom.xml?rev=1762281&r1=1762280&r2=1762281&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/pom.xml (original)
+++ webservices/axiom/branches/1.2.x/pom.xml Mon Sep 26 07:13:45 2016
@@ -367,7 +367,7 @@
<dependency>
<groupId>com.google.truth</groupId>
<artifactId>truth</artifactId>
- <version>0.27</version>
+ <version>0.30</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
Propchange: webservices/axiom/branches/1.2.x/testing/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 26 07:13:45 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,1727549,1727660,1727688,1728022,1728240,1728929,1731373,1731376,1731378,1731406,1731522,1731541,1732710,1733743,1739812,1741979,1758113
+/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
Modified: webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AxiomTestVerb.java
URL: http://svn.apache.org/viewvc/webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AxiomTestVerb.java?rev=1762281&r1=1762280&r2=1762281&view=diff
==============================================================================
--- webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AxiomTestVerb.java (original)
+++ webservices/axiom/branches/1.2.x/testing/axiom-truth/src/main/java/org/apache/axiom/truth/AxiomTestVerb.java Mon Sep 26 07:13:45 2016
@@ -36,7 +36,7 @@ public final class AxiomTestVerb extends
super(failureStrategy);
}
- public <T,C extends Iterable<T>> IterableSubject<? extends IterableSubject<?,T,C>,T,C> that(final Iterator<T> target) {
+ public <T,C extends Iterable<T>> IterableSubject that(final Iterator<T> target) {
return that(new Iterable<T>() {
@Override
public Iterator<T> iterator() {