Merge pull request #41 from andreoss/issue-40

For #40: Update parent
jcabi · Nov 13, 2020 · f370489 · f370489
2 parents 1f8f1ee + 26650ff
commit f370489
Show file tree

Hide file tree

Showing 21 changed files with 62 additions and 89 deletions.
diff --git a/pom.xml b/pom.xml
@@ -35,7 +35,7 @@
     <parent>
         <groupId>com.jcabi</groupId>
         <artifactId>jcabi</artifactId>
-        <version>1.23</version>
+        <version>1.25.2</version>
     </parent>
     <artifactId>jcabi-matchers</artifactId>
     <version>2.0-SNAPSHOT</version>
@@ -71,12 +71,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-library</artifactId>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -176,11 +171,8 @@
         <pluginManagement>
             <plugins>
                 <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
-                    <configuration>
-                        <source>1.7</source>
-                        <target>1.7</target>
-                    </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>

diff --git a/src/main/java/com/jcabi/matchers/AllOfThatPrintsOnlyWrongMatchers.java b/src/main/java/com/jcabi/matchers/AllOfThatPrintsOnlyWrongMatchers.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2011-2017, jcabi.com
  * All rights reserved.
  *
@@ -42,8 +42,6 @@
  *
  * Based in {@link AllOf}
  *
- * @author Jose V. Dal Pra Junior (jrdalpra@gmail.com)
- * @version $Id$
  * @param <T> Type of argument
  * @since 0.2.6
  */
@@ -58,12 +56,14 @@ final class AllOfThatPrintsOnlyWrongMatchers<T> extends DiagnosingMatcher<T> {
      * Matchers that does not matches.
      */
     private final transient List<Matcher<? super T>> wrong;
+
     /**
      * Construct that accept matchers to test.
      * @param iterable Matchers that will be tested.
      */
     AllOfThatPrintsOnlyWrongMatchers(
-        final Iterable<Matcher<? super T>> iterable) {
+        final Iterable<Matcher<? super T>> iterable
+    ) {
         super();
         this.matchers = iterable;
         this.wrong = new ArrayList<Matcher<? super T>>(Tv.THREE);

diff --git a/src/main/java/com/jcabi/matchers/JaxbConverter.java b/src/main/java/com/jcabi/matchers/JaxbConverter.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2011-2017, jcabi.com
  * All rights reserved.
  *
@@ -78,8 +78,6 @@
  *   }
  * }</pre>
  *
- * @author Yegor Bugayenko (yegor@tpc2.com)
- * @version $Id$
  * @since 0.1
  */
 @ToString

diff --git a/src/main/java/com/jcabi/matchers/NoBrokenLinks.java b/src/main/java/com/jcabi/matchers/NoBrokenLinks.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2011-2017, jcabi.com
  * All rights reserved.
  *
@@ -47,8 +47,6 @@
 /**
  * Finds broken links in HTML.
  *
- * @author Yegor Bugayenko (yegor@tpc2.com)
- * @version $Id$
  * @since 0.3.4
  */
 @ToString

diff --git a/src/main/java/com/jcabi/matchers/RegexContainingPatternMatcher.java b/src/main/java/com/jcabi/matchers/RegexContainingPatternMatcher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2011-2017, jcabi.com
  * All rights reserved.
  *
@@ -41,8 +41,6 @@
  *
  * <p>Objects of this class are immutable and thread-safe.
  *
- * @author Carlos Miranda (miranda.cma@gmail.com)
- * @version $Id$
  * @since 1.3
  */
 @ToString

diff --git a/src/main/java/com/jcabi/matchers/RegexMatchers.java b/src/main/java/com/jcabi/matchers/RegexMatchers.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2011-2017, jcabi.com
  * All rights reserved.
  *
@@ -39,8 +39,6 @@
 /**
  * Convenient matchers for checking Strings against regular expressions.
  *
- * @author Carlos Miranda (miranda.cma@gmail.com)
- * @version $Id$
  * @since 1.3
  */
 @ToString

diff --git a/src/main/java/com/jcabi/matchers/RegexMatchingPatternMatcher.java b/src/main/java/com/jcabi/matchers/RegexMatchingPatternMatcher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2011-2017, jcabi.com
  * All rights reserved.
  *
@@ -41,8 +41,6 @@
  *
  * <p>Objects of this class are immutable and thread-safe.
  *
- * @author Carlos Miranda (miranda.cma@gmail.com)
- * @version $Id$
  * @since 1.3
  */
 @Immutable

diff --git a/src/main/java/com/jcabi/matchers/StringSource.java b/src/main/java/com/jcabi/matchers/StringSource.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2011-2017, jcabi.com
  * All rights reserved.
  *
@@ -46,8 +46,6 @@
  *
  * <p>Objects of this class are immutable and thread-safe.
  *
- * @author Yegor Bugayenko (yegor@tpc2.com)
- * @version $Id$
  * @since 0.1
  */
 @EqualsAndHashCode(callSuper = false, of = "xml")

diff --git a/src/main/java/com/jcabi/matchers/W3CMatchers.java b/src/main/java/com/jcabi/matchers/W3CMatchers.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2011-2017, jcabi.com
  * All rights reserved.
  *
@@ -37,8 +37,6 @@
 /**
  * Matchers for validating HTML and CSS content.
  *
- * @author Carlos Miranda (miranda.cma@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 @ToString

diff --git a/src/main/java/com/jcabi/matchers/W3CValidatorMatcher.java b/src/main/java/com/jcabi/matchers/W3CValidatorMatcher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2011-2017, jcabi.com
  * All rights reserved.
  *
@@ -43,8 +43,6 @@
  *
  * <p>Objects of this class are immutable and thread-safe.
  *
- * @author Carlos Miranda (miranda.cma@gmail.com)
- * @version $Id$
  * @since 0.1
  */
 @Immutable

diff --git a/src/main/java/com/jcabi/matchers/XPathMatcher.java b/src/main/java/com/jcabi/matchers/XPathMatcher.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2011-2017, jcabi.com
  * All rights reserved.
  *
@@ -41,8 +41,6 @@
  *
  * <p>Objects of this class are immutable and thread-safe.
  *
- * @author Yegor Bugayenko (yegor@tpc2.com)
- * @version $Id$
  * @since 0.3.7
  * @param <T> Type of param
  */

diff --git a/src/main/java/com/jcabi/matchers/XhtmlMatchers.java b/src/main/java/com/jcabi/matchers/XhtmlMatchers.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2011-2017, jcabi.com
  * All rights reserved.
  *
@@ -54,8 +54,6 @@
  *   XhtmlMatchers.hasXPath("/root/a[.='hello']")
  * );</pre>
  *
- * @author Yegor Bugayenko (yegor@tpc2.com)
- * @version $Id$
  * @since 0.2.6
  */
 @ToString

diff --git a/src/main/java/com/jcabi/matchers/package-info.java b/src/main/java/com/jcabi/matchers/package-info.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2011-2017, jcabi.com
  * All rights reserved.
  *
@@ -39,8 +39,6 @@
  *   &lt;artifactId&gt;jcabi-matchers&lt;/artifactId&gt;
  * &lt;/dependency&gt;</pre>
  *
- * @author Yegor Bugayenko (yegor@tpc2.com)
- * @version $Id$
  * @since 1.0
  * @see <a href="http://matchers.jcabi.com/">project website</a>
  */

diff --git a/src/test/java/com/jcabi/matchers/JaxbConverterTest.java b/src/test/java/com/jcabi/matchers/JaxbConverterTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2011-2017, jcabi.com
  * All rights reserved.
  *
@@ -36,12 +36,10 @@
 import javax.xml.bind.annotation.XmlType;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case for {@link JaxbConverter}.
- * @author Yegor Bugayenko (yegor@tpc2.com)
- * @version $Id$
  * @since 0.1
  */
 public final class JaxbConverterTest {
@@ -121,6 +119,8 @@ public void convertsNonRootObjectWithNamespace() throws Exception {
 
     /**
      * Dummy test object.
+     *
+     * @since 0.1
      */
     @XmlRootElement(name = "employee")
     @XmlAccessorType(XmlAccessType.NONE)
@@ -129,13 +129,15 @@ private static final class Employee {
          * Injected object.
          */
         private transient Object injected = "some text";
+
         /**
          * Inject an object.
          * @param obj The object to inject
          */
         public void inject(final Object obj) {
             this.injected = obj;
         }
+
         /**
          * Injected object. This method is not used directly, but is used
          * during JAXB converting of this object into XML, at
@@ -146,6 +148,7 @@ public void inject(final Object obj) {
         public Object getInjected() {
             return this.injected;
         }
+
         /**
          * Returns a simple string. This method is not called directly, but
          * is used in {@code convertsJaxbObjectToXml()} for JAXB converting
@@ -160,6 +163,8 @@ public String getName() {
 
     /**
      * Dummy test object.
+     *
+     * @since 0.1
      */
     @XmlType(name = "foo", namespace = JaxbConverterTest.Foo.NAMESPACE)
     @XmlAccessorType(XmlAccessType.NONE)
@@ -168,6 +173,7 @@ public static final class Foo {
          * XML namespace.
          */
         public static final String NAMESPACE = "foo-namespace";
+
         /**
          * Simple name.
          * @return The name
@@ -180,6 +186,8 @@ public String getName() {
 
     /**
      * Dummy test object.
+     *
+     * @since 0.1
      */
     @XmlType(name = "bar")
     @XmlAccessorType(XmlAccessType.NONE)

diff --git a/src/test/java/com/jcabi/matchers/NoBrokenLinksITCase.java b/src/test/java/com/jcabi/matchers/NoBrokenLinksITCase.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2011-2017, jcabi.com
  * All rights reserved.
  *
@@ -34,12 +34,10 @@
 import org.apache.commons.lang3.StringUtils;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Integration case for {@link NoBrokenLinks}.
- * @author Yegor Bugayenko (yegor@tpc2.com)
- * @version $Id$
  * @since 0.1
  */
 public final class NoBrokenLinksITCase {

diff --git a/src/test/java/com/jcabi/matchers/NoBrokenLinksTest.java b/src/test/java/com/jcabi/matchers/NoBrokenLinksTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2011-2017, jcabi.com
  * All rights reserved.
  *
@@ -34,12 +34,11 @@
 import org.apache.commons.lang3.StringUtils;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case for {@link NoBrokenLinks}.
- * @author Yegor Bugayenko (yegor@tpc2.com)
- * @version $Id$
  * @since 0.1
  */
 public final class NoBrokenLinksTest {
@@ -106,11 +105,15 @@ public void passesWithoutBrokenLinks() throws Exception {
      * NoBrokenLinks can throw for a broken HTML.
      * @throws Exception If something goes wrong inside
      */
-    @Test(expected = IllegalArgumentException.class)
-    public void throwsWhenHtmlIsBroken() throws Exception {
-        MatcherAssert.assertThat(
-            new FakeRequest().withBody("not HTML at all").fetch(),
-            new NoBrokenLinks(new URI("#"))
+    @Test
+    public void throwsWhenHtmlIsBroken() {
+        Assertions.assertThrows(
+            IllegalArgumentException.class,
+            () ->
+                MatcherAssert.assertThat(
+                    new FakeRequest().withBody("not HTML at all").fetch(),
+                    new NoBrokenLinks(new URI("#"))
+                )
         );
     }
 

diff --git a/src/test/java/com/jcabi/matchers/RegexMatchersTest.java b/src/test/java/com/jcabi/matchers/RegexMatchersTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright (c) 2011-2017, jcabi.com
  * All rights reserved.
  *
@@ -31,12 +31,10 @@
 
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case for {@link RegexMatchers}.
- * @author Carlos Miranda (miranda.cma@gmail.com)
- * @version $Id$
  * @since 1.3
  */
 public final class RegexMatchersTest {