(jcabi#40) Upgrade parent & fix compilation

andreoss · Jun 28, 2020 · 998b292 · 998b292
1 parent 21ba4f9
commit 998b292
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 19 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.1</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>
@@ -196,6 +191,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>8</source>
+                    <target>8</target>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/src/test/java/com/jcabi/matchers/JaxbConverterTest.java b/src/test/java/com/jcabi/matchers/JaxbConverterTest.java
@@ -36,7 +36,7 @@
 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}.

diff --git a/src/test/java/com/jcabi/matchers/NoBrokenLinksITCase.java b/src/test/java/com/jcabi/matchers/NoBrokenLinksITCase.java
@@ -34,7 +34,7 @@
 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}.

diff --git a/src/test/java/com/jcabi/matchers/NoBrokenLinksTest.java b/src/test/java/com/jcabi/matchers/NoBrokenLinksTest.java
@@ -34,7 +34,8 @@
 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}.
@@ -106,11 +107,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
@@ -31,7 +31,7 @@
 
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case for {@link RegexMatchers}.

diff --git a/src/test/java/com/jcabi/matchers/StringSourceTest.java b/src/test/java/com/jcabi/matchers/StringSourceTest.java
@@ -35,7 +35,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Node;
 
 /**

diff --git a/src/test/java/com/jcabi/matchers/W3CMatchersTest.java b/src/test/java/com/jcabi/matchers/W3CMatchersTest.java
@@ -33,7 +33,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 /**
  * Test case for {@link W3CMatchers}.

diff --git a/src/test/java/com/jcabi/matchers/XhtmlMatchersTest.java b/src/test/java/com/jcabi/matchers/XhtmlMatchersTest.java
@@ -39,7 +39,7 @@
 import org.apache.commons.lang3.StringUtils;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;