#1094 new parent

yegor256 · Nov 15, 2021 · ae3c15c · ae3c15c
1 parent 0ac6580
commit ae3c15c
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 25 deletions.
diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@ SOFTWARE.
   <parent>
     <groupId>com.jcabi</groupId>
     <artifactId>parent</artifactId>
-    <version>0.49.1</version>
+    <version>0.56.0</version>
   </parent>
   <groupId>org.takes</groupId>
   <artifactId>takes</artifactId>
@@ -221,11 +221,6 @@ SOFTWARE.
       <version>9.7.0-7</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-validator</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>javax.el</groupId>
       <artifactId>javax.el-api</artifactId>
@@ -311,7 +306,6 @@ SOFTWARE.
     <plugins>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.0.0-M5</version>
         <configuration>
           <!--
           @todo #1110:1h There are 18 tests that fail now, mostly due to versions
@@ -403,7 +397,6 @@ SOFTWARE.
           <plugin>
             <groupId>com.qulice</groupId>
             <artifactId>qulice-maven-plugin</artifactId>
-            <version>0.19.4</version>
             <configuration>
               <excludes combine.children="append">
                 <exclude>checkstyle:/src/site/resources/.*</exclude>

diff --git a/src/main/java/org/takes/rq/multipart/RqMtFake.java b/src/main/java/org/takes/rq/multipart/RqMtFake.java
@@ -65,7 +65,6 @@ public final class RqMtFake implements RqMultipart {
      * Fake ctor.
      * @param req Fake request header holder
      * @param dispositions Fake request body parts
-     * @throws IOException If fails
      */
     public RqMtFake(final Request req, final Request... dispositions) {
         this.fake = new Sticky<>(

diff --git a/src/site/site.xml b/src/site/site.xml
@@ -26,21 +26,21 @@ SOFTWARE.
   <skin>
     <groupId>com.jcabi</groupId>
     <artifactId>jcabi-maven-skin</artifactId>
-    <version>1.5.1</version>
+    <version>1.7.1</version>
   </skin>
   <bannerLeft>
     <name>takes.org</name>
     <src>logo.svg</src>
-    <href>http://www.takes.org/</href>
+    <href>https://www.takes.org/</href>
     <width>96</width>
     <height>96</height>
   </bannerLeft>
   <body>
     <head>
-      <link href="http://www.takes.org/logo.png" rel="shortcut icon"/>
+      &lt;link href="http://www.takes.org/logo.png" rel="shortcut icon"/&gt;
     </head>
     <breadcrumbs>
-      <item name="take.com" href="http://www.takes.org"/>
+      <item name="take.com" href="https://www.takes.org"/>
     </breadcrumbs>
     <menu name="Overview">
       <item name="Introduction" href="./index.html"/>

diff --git a/src/test/java/org/takes/http/BkBasicTest.java b/src/test/java/org/takes/http/BkBasicTest.java
@@ -40,7 +40,6 @@
 import org.cactoos.text.Joined;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Ignore;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;
@@ -255,7 +254,7 @@ public void run() {
      *
      * @throws Exception If some problem inside
      */
-    @Ignore
+    @Disabled
     @Test
     void returnsProperResponseCodeOnNoContentLength() throws Exception {
         final ByteArrayOutputStream output = new ByteArrayOutputStream();
@@ -314,7 +313,7 @@ public void run() {
      *
      * @throws Exception If some problem inside
      */
-    @Ignore
+    @Disabled
     @Test
     void acceptsNoContentLengthOnClosedConnection() throws Exception {
         final String text = "Close Test";

diff --git a/src/test/java/org/takes/http/FtBasicTest.java b/src/test/java/org/takes/http/FtBasicTest.java
@@ -37,7 +37,7 @@
 import org.cactoos.io.InputStreamOf;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.mockito.invocation.InvocationOnMock;
@@ -147,7 +147,7 @@ public void exec(final URI home) throws IOException {
      * @throws Exception If some problem inside
      */
     @Test
-    @Ignore
+    @Disabled
     void gracefullyHandlesStuckBack() throws Exception {
         final Take take = new Take() {
             @Override

diff --git a/src/test/java/org/takes/rq/multipart/RqMtFakeTest.java b/src/test/java/org/takes/rq/multipart/RqMtFakeTest.java
@@ -32,7 +32,6 @@
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.hamcrest.core.IsInstanceOf;
-import org.junit.Assert;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.takes.rq.RqFake;
@@ -232,7 +231,7 @@ void closesAllParts() throws Exception {
         );
         try {
             multi.part(name).iterator().next().body().read();
-            Assert.fail(exmessage);
+            Assertions.fail(exmessage);
         } catch (final IOException ex) {
             MatcherAssert.assertThat(
                 ex,
@@ -245,7 +244,7 @@ void closesAllParts() throws Exception {
         );
         try {
             multi.part(content).iterator().next().body().read();
-            Assert.fail(exmessage);
+            Assertions.fail(exmessage);
         } catch (final IOException ex) {
             MatcherAssert.assertThat(
                 ex,

diff --git a/src/test/java/org/takes/rs/RsXsltTest.java b/src/test/java/org/takes/rs/RsXsltTest.java
@@ -34,7 +34,7 @@
 import org.cactoos.text.Joined;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
-import org.junit.BeforeClass;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.EndsWith;
 import org.takes.misc.StateAwareInputStream;
@@ -49,7 +49,8 @@ final class RsXsltTest {
     /**
      * Validate encoding.
      */
-    @BeforeClass
+    @BeforeAll
+    @SuppressWarnings("PMD.ProhibitPublicStaticMethods")
     public static void before() {
         MatcherAssert.assertThat(
             "default charset during testing must be UTF-8",

diff --git a/src/test/java/org/takes/tk/TkSlf4jRemoteTest.java b/src/test/java/org/takes/tk/TkSlf4jRemoteTest.java
@@ -30,7 +30,7 @@
 import java.net.HttpURLConnection;
 import java.net.URI;
 import org.hamcrest.core.IsEqual;
-import org.junit.Ignore;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.takes.http.FtRemote;
 
@@ -45,7 +45,7 @@ final class TkSlf4jRemoteTest {
      * TkSlf4j can return an empty response body for {@link TkEmpty}.
      * @throws Exception if some I/O problem occurred.
      */
-    @Ignore
+    @Disabled
     @Test
     void returnsAnEmptyResponseBody() throws Exception {
         new FtRemote(