From 1aa1c1935c1996e7ffcbd851ced3065bfc6abb18 Mon Sep 17 00:00:00 2001 From: Yegor Bugayenko Date: Mon, 7 Aug 2023 19:05:20 +0300 Subject: [PATCH] #71 aspects up to 0.25.1 --- .rultor.yml | 2 +- pom.xml | 2 +- .../jcabi/matchers/AllOfThatPrintsOnlyWrongMatchers.java | 6 +++--- src/main/java/com/jcabi/matchers/JaxbConverter.java | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.rultor.yml b/.rultor.yml index 0de8d7a..85b1dd8 100644 --- a/.rultor.yml +++ b/.rultor.yml @@ -1,5 +1,5 @@ docker: - image: yegor256/rultor-image:1.13.0 + image: yegor256/rultor-image:1.21.0 assets: settings.xml: yegor256/home#assets/jcabi/settings.xml secring.gpg: yegor256/home#assets/secring.gpg diff --git a/pom.xml b/pom.xml index 3639729..e14f10a 100644 --- a/pom.xml +++ b/pom.xml @@ -80,7 +80,7 @@ OF THE POSSIBILITY OF SUCH DAMAGE. com.jcabi jcabi-aspects - 0.24.1 + 0.25.1 com.jcabi diff --git a/src/main/java/com/jcabi/matchers/AllOfThatPrintsOnlyWrongMatchers.java b/src/main/java/com/jcabi/matchers/AllOfThatPrintsOnlyWrongMatchers.java index f414279..d67abec 100644 --- a/src/main/java/com/jcabi/matchers/AllOfThatPrintsOnlyWrongMatchers.java +++ b/src/main/java/com/jcabi/matchers/AllOfThatPrintsOnlyWrongMatchers.java @@ -29,18 +29,18 @@ */ package com.jcabi.matchers; -import com.jcabi.aspects.Tv; import java.util.ArrayList; import java.util.List; import org.hamcrest.Description; import org.hamcrest.DiagnosingMatcher; import org.hamcrest.Matcher; +import org.hamcrest.core.AllOf; /** * Matcher that test if all matchers matches, but print info about only that * ones who failed. * - * Based in {@link AllOf} + * Based in {@link AllOf}. * * @param Type of argument * @since 0.2.6 @@ -66,7 +66,7 @@ final class AllOfThatPrintsOnlyWrongMatchers extends DiagnosingMatcher { ) { super(); this.matchers = iterable; - this.wrong = new ArrayList>(Tv.THREE); + this.wrong = new ArrayList<>(3); } @Override diff --git a/src/main/java/com/jcabi/matchers/JaxbConverter.java b/src/main/java/com/jcabi/matchers/JaxbConverter.java index 72f36a8..94140ef 100644 --- a/src/main/java/com/jcabi/matchers/JaxbConverter.java +++ b/src/main/java/com/jcabi/matchers/JaxbConverter.java @@ -35,6 +35,7 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.JAXBIntrospector; import javax.xml.bind.Marshaller; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import javax.xml.namespace.QName; import javax.xml.transform.Source;