diff --git a/pom.xml b/pom.xml index 7c80263ce..11bcfd9e5 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,7 @@ 1.0.1 jcabi-github - 0.7.1 + 0.7.2 jar jcabi-github Object Oriented Github API @@ -73,6 +73,11 @@ com.jcabi jcabi-xml + + com.jcabi + jcabi-http + 1.0 + com.jcabi.incubator xembly @@ -114,7 +119,8 @@ com.rexsl rexsl-test - 0.11 + 0.12 + test javax.json @@ -210,4 +216,26 @@ - \ No newline at end of file + + + qulice + + + + com.ning.maven.plugins + maven-duplicate-finder-plugin + + + + com.sun.xml.bind + jaxb-core + 2.2.8-b01 + + + + + + + + + diff --git a/src/main/java/com/jcabi/github/Github.java b/src/main/java/com/jcabi/github/Github.java index 7c3c02bcf..cdbde8daa 100644 --- a/src/main/java/com/jcabi/github/Github.java +++ b/src/main/java/com/jcabi/github/Github.java @@ -30,7 +30,7 @@ package com.jcabi.github; import com.jcabi.aspects.Immutable; -import com.rexsl.test.Request; +import com.jcabi.http.Request; import java.io.IOException; import java.text.DateFormat; import java.text.ParseException; @@ -52,7 +52,7 @@ * Issue issue = issues.post("issue title", "issue body"); * *

It is strongly recommended to use - * {@link com.rexsl.test.wire.RetryWire} to avoid + * {@link com.jcabi.http.wire.RetryWire} to avoid * accidental I/O exceptions: * *

 Github github = new RtGithub(
diff --git a/src/main/java/com/jcabi/github/RtComment.java b/src/main/java/com/jcabi/github/RtComment.java
index 4fc208d1e..5345bd29c 100644
--- a/src/main/java/com/jcabi/github/RtComment.java
+++ b/src/main/java/com/jcabi/github/RtComment.java
@@ -31,8 +31,8 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import javax.json.JsonObject;
diff --git a/src/main/java/com/jcabi/github/RtComments.java b/src/main/java/com/jcabi/github/RtComments.java
index 7b026e3bb..46666f4e3 100644
--- a/src/main/java/com/jcabi/github/RtComments.java
+++ b/src/main/java/com/jcabi/github/RtComments.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import javax.json.Json;
diff --git a/src/main/java/com/jcabi/github/RtCommit.java b/src/main/java/com/jcabi/github/RtCommit.java
index 7eed92a83..3d9388c26 100644
--- a/src/main/java/com/jcabi/github/RtCommit.java
+++ b/src/main/java/com/jcabi/github/RtCommit.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/jcabi/github/RtEvent.java b/src/main/java/com/jcabi/github/RtEvent.java
index 8ad3442bd..3c15c97db 100644
--- a/src/main/java/com/jcabi/github/RtEvent.java
+++ b/src/main/java/com/jcabi/github/RtEvent.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/jcabi/github/RtGist.java b/src/main/java/com/jcabi/github/RtGist.java
index 04b86f5e4..56fc54157 100644
--- a/src/main/java/com/jcabi/github/RtGist.java
+++ b/src/main/java/com/jcabi/github/RtGist.java
@@ -31,10 +31,10 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.Response;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.Response;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URI;
diff --git a/src/main/java/com/jcabi/github/RtGists.java b/src/main/java/com/jcabi/github/RtGists.java
index ebad64f5e..71000f28d 100644
--- a/src/main/java/com/jcabi/github/RtGists.java
+++ b/src/main/java/com/jcabi/github/RtGists.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import javax.json.Json;
diff --git a/src/main/java/com/jcabi/github/RtGithub.java b/src/main/java/com/jcabi/github/RtGithub.java
index 92c394181..5653c37de 100644
--- a/src/main/java/com/jcabi/github/RtGithub.java
+++ b/src/main/java/com/jcabi/github/RtGithub.java
@@ -31,10 +31,10 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
+import com.jcabi.http.Request;
+import com.jcabi.http.request.ApacheRequest;
+import com.jcabi.http.response.JsonResponse;
 import com.jcabi.manifests.Manifests;
-import com.rexsl.test.Request;
-import com.rexsl.test.request.ApacheRequest;
-import com.rexsl.test.response.JsonResponse;
 import java.io.IOException;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;
@@ -54,7 +54,7 @@
  * Issue issue = issues.post("issue title", "issue body");
* *

It is strongly recommended to use - * {@link com.rexsl.test.wire.RetryWire} to avoid + * {@link com.jcabi.http.wire.RetryWire} to avoid * accidental I/O exceptions: * *

 Github github = new RtGithub(
diff --git a/src/main/java/com/jcabi/github/RtIssue.java b/src/main/java/com/jcabi/github/RtIssue.java
index c44e17967..76bb095db 100644
--- a/src/main/java/com/jcabi/github/RtIssue.java
+++ b/src/main/java/com/jcabi/github/RtIssue.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/com/jcabi/github/RtIssueLabels.java b/src/main/java/com/jcabi/github/RtIssueLabels.java
index cefbbcb06..e3c7ce9b1 100644
--- a/src/main/java/com/jcabi/github/RtIssueLabels.java
+++ b/src/main/java/com/jcabi/github/RtIssueLabels.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import javax.json.Json;
diff --git a/src/main/java/com/jcabi/github/RtIssues.java b/src/main/java/com/jcabi/github/RtIssues.java
index 2258d228d..000ba9836 100644
--- a/src/main/java/com/jcabi/github/RtIssues.java
+++ b/src/main/java/com/jcabi/github/RtIssues.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.util.Map;
diff --git a/src/main/java/com/jcabi/github/RtJson.java b/src/main/java/com/jcabi/github/RtJson.java
index c90b5b7ff..9a514daac 100644
--- a/src/main/java/com/jcabi/github/RtJson.java
+++ b/src/main/java/com/jcabi/github/RtJson.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.net.HttpURLConnection;
diff --git a/src/main/java/com/jcabi/github/RtLabel.java b/src/main/java/com/jcabi/github/RtLabel.java
index e791f8336..410a0d6a4 100644
--- a/src/main/java/com/jcabi/github/RtLabel.java
+++ b/src/main/java/com/jcabi/github/RtLabel.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/com/jcabi/github/RtLabels.java b/src/main/java/com/jcabi/github/RtLabels.java
index 597b0e027..452ea846d 100644
--- a/src/main/java/com/jcabi/github/RtLabels.java
+++ b/src/main/java/com/jcabi/github/RtLabels.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import javax.json.Json;
diff --git a/src/main/java/com/jcabi/github/RtLimit.java b/src/main/java/com/jcabi/github/RtLimit.java
index d8d088bf4..301935d7a 100644
--- a/src/main/java/com/jcabi/github/RtLimit.java
+++ b/src/main/java/com/jcabi/github/RtLimit.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/jcabi/github/RtLimits.java b/src/main/java/com/jcabi/github/RtLimits.java
index 9f1403b8b..9ba31dfa6 100644
--- a/src/main/java/com/jcabi/github/RtLimits.java
+++ b/src/main/java/com/jcabi/github/RtLimits.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import lombok.EqualsAndHashCode;
 
 /**
diff --git a/src/main/java/com/jcabi/github/RtMarkdown.java b/src/main/java/com/jcabi/github/RtMarkdown.java
index 4e0359ea1..accf5f9f4 100644
--- a/src/main/java/com/jcabi/github/RtMarkdown.java
+++ b/src/main/java/com/jcabi/github/RtMarkdown.java
@@ -31,8 +31,8 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.io.StringWriter;
 import java.net.HttpURLConnection;
diff --git a/src/main/java/com/jcabi/github/RtMilestone.java b/src/main/java/com/jcabi/github/RtMilestone.java
index c49294b75..7e833e78c 100644
--- a/src/main/java/com/jcabi/github/RtMilestone.java
+++ b/src/main/java/com/jcabi/github/RtMilestone.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/com/jcabi/github/RtMilestones.java b/src/main/java/com/jcabi/github/RtMilestones.java
index e617fcff4..c3223f24a 100644
--- a/src/main/java/com/jcabi/github/RtMilestones.java
+++ b/src/main/java/com/jcabi/github/RtMilestones.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.util.Map;
diff --git a/src/main/java/com/jcabi/github/RtPagination.java b/src/main/java/com/jcabi/github/RtPagination.java
index 897d28759..acf50187d 100644
--- a/src/main/java/com/jcabi/github/RtPagination.java
+++ b/src/main/java/com/jcabi/github/RtPagination.java
@@ -30,10 +30,10 @@
 package com.jcabi.github;
 
 import com.jcabi.aspects.Immutable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
-import com.rexsl.test.response.WebLinkingResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
+import com.jcabi.http.response.WebLinkingResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.util.Iterator;
diff --git a/src/main/java/com/jcabi/github/RtPull.java b/src/main/java/com/jcabi/github/RtPull.java
index 54197c045..d9d1856fd 100644
--- a/src/main/java/com/jcabi/github/RtPull.java
+++ b/src/main/java/com/jcabi/github/RtPull.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import javax.json.Json;
diff --git a/src/main/java/com/jcabi/github/RtPulls.java b/src/main/java/com/jcabi/github/RtPulls.java
index 6cf80a791..6faf8e1b4 100644
--- a/src/main/java/com/jcabi/github/RtPulls.java
+++ b/src/main/java/com/jcabi/github/RtPulls.java
@@ -31,9 +31,9 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
-import com.rexsl.test.response.JsonResponse;
-import com.rexsl.test.response.RestResponse;
+import com.jcabi.http.Request;
+import com.jcabi.http.response.JsonResponse;
+import com.jcabi.http.response.RestResponse;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import javax.json.Json;
diff --git a/src/main/java/com/jcabi/github/RtRepo.java b/src/main/java/com/jcabi/github/RtRepo.java
index b1853c191..018830d0a 100644
--- a/src/main/java/com/jcabi/github/RtRepo.java
+++ b/src/main/java/com/jcabi/github/RtRepo.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/com/jcabi/github/RtRepos.java b/src/main/java/com/jcabi/github/RtRepos.java
index 0ad4b0409..31024d781 100644
--- a/src/main/java/com/jcabi/github/RtRepos.java
+++ b/src/main/java/com/jcabi/github/RtRepos.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/com/jcabi/github/RtUser.java b/src/main/java/com/jcabi/github/RtUser.java
index 7e0b26f4f..51b0d8cff 100644
--- a/src/main/java/com/jcabi/github/RtUser.java
+++ b/src/main/java/com/jcabi/github/RtUser.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import java.io.IOException;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;
diff --git a/src/main/java/com/jcabi/github/RtUsers.java b/src/main/java/com/jcabi/github/RtUsers.java
index b0828ef0a..c836473d0 100644
--- a/src/main/java/com/jcabi/github/RtUsers.java
+++ b/src/main/java/com/jcabi/github/RtUsers.java
@@ -31,7 +31,7 @@
 
 import com.jcabi.aspects.Immutable;
 import com.jcabi.aspects.Loggable;
-import com.rexsl.test.Request;
+import com.jcabi.http.Request;
 import javax.json.JsonObject;
 import javax.validation.constraints.NotNull;
 import lombok.EqualsAndHashCode;
diff --git a/src/main/java/com/jcabi/github/mock/MkGithub.java b/src/main/java/com/jcabi/github/mock/MkGithub.java
index 7bd2a9f90..002f0fdeb 100644
--- a/src/main/java/com/jcabi/github/mock/MkGithub.java
+++ b/src/main/java/com/jcabi/github/mock/MkGithub.java
@@ -37,8 +37,8 @@
 import com.jcabi.github.Markdown;
 import com.jcabi.github.Repos;
 import com.jcabi.github.Users;
-import com.rexsl.test.Request;
-import com.rexsl.test.request.FakeRequest;
+import com.jcabi.http.Request;
+import com.jcabi.http.request.FakeRequest;
 import java.io.IOException;
 import java.net.HttpURLConnection;
 import javax.json.Json;
diff --git a/src/test/java/com/jcabi/github/BulkTest.java b/src/test/java/com/jcabi/github/BulkTest.java
index e8983ba0d..a818fc3d0 100644
--- a/src/test/java/com/jcabi/github/BulkTest.java
+++ b/src/test/java/com/jcabi/github/BulkTest.java
@@ -29,8 +29,8 @@
  */
 package com.jcabi.github;
 
-import com.rexsl.test.Request;
-import com.rexsl.test.request.FakeRequest;
+import com.jcabi.http.Request;
+import com.jcabi.http.request.FakeRequest;
 import javax.json.JsonObject;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
diff --git a/src/test/java/com/jcabi/github/RtCommentTest.java b/src/test/java/com/jcabi/github/RtCommentTest.java
index 7113327ba..19c38734f 100644
--- a/src/test/java/com/jcabi/github/RtCommentTest.java
+++ b/src/test/java/com/jcabi/github/RtCommentTest.java
@@ -30,7 +30,7 @@
 package com.jcabi.github;
 
 import com.jcabi.github.mock.MkGithub;
-import com.rexsl.test.request.FakeRequest;
+import com.jcabi.http.request.FakeRequest;
 import javax.json.Json;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
diff --git a/src/test/java/com/jcabi/github/RtEventTest.java b/src/test/java/com/jcabi/github/RtEventTest.java
index 47522b487..56c15e94d 100644
--- a/src/test/java/com/jcabi/github/RtEventTest.java
+++ b/src/test/java/com/jcabi/github/RtEventTest.java
@@ -29,11 +29,11 @@
  */
 package com.jcabi.github;
 
-import com.rexsl.test.mock.MkAnswer;
-import com.rexsl.test.mock.MkContainer;
-import com.rexsl.test.mock.MkGrizzlyContainer;
-import com.rexsl.test.request.ApacheRequest;
-import com.rexsl.test.request.FakeRequest;
+import com.jcabi.http.mock.MkAnswer;
+import com.jcabi.http.mock.MkContainer;
+import com.jcabi.http.mock.MkGrizzlyContainer;
+import com.jcabi.http.request.ApacheRequest;
+import com.jcabi.http.request.FakeRequest;
 import java.net.HttpURLConnection;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
diff --git a/src/test/java/com/jcabi/github/RtGistTest.java b/src/test/java/com/jcabi/github/RtGistTest.java
index 891fec7ca..62a7defcd 100644
--- a/src/test/java/com/jcabi/github/RtGistTest.java
+++ b/src/test/java/com/jcabi/github/RtGistTest.java
@@ -30,10 +30,10 @@
 package com.jcabi.github;
 
 import com.jcabi.github.mock.MkGithub;
-import com.rexsl.test.mock.MkAnswer;
-import com.rexsl.test.mock.MkContainer;
-import com.rexsl.test.mock.MkGrizzlyContainer;
-import com.rexsl.test.request.ApacheRequest;
+import com.jcabi.http.mock.MkAnswer;
+import com.jcabi.http.mock.MkContainer;
+import com.jcabi.http.mock.MkGrizzlyContainer;
+import com.jcabi.http.request.ApacheRequest;
 import java.net.HttpURLConnection;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
diff --git a/src/test/java/com/jcabi/github/RtGistsTest.java b/src/test/java/com/jcabi/github/RtGistsTest.java
index 609f444dc..0a91ef779 100644
--- a/src/test/java/com/jcabi/github/RtGistsTest.java
+++ b/src/test/java/com/jcabi/github/RtGistsTest.java
@@ -30,10 +30,10 @@
 package com.jcabi.github;
 
 import com.jcabi.github.mock.MkGithub;
-import com.rexsl.test.mock.MkAnswer;
-import com.rexsl.test.mock.MkContainer;
-import com.rexsl.test.mock.MkGrizzlyContainer;
-import com.rexsl.test.request.ApacheRequest;
+import com.jcabi.http.mock.MkAnswer;
+import com.jcabi.http.mock.MkContainer;
+import com.jcabi.http.mock.MkGrizzlyContainer;
+import com.jcabi.http.request.ApacheRequest;
 import java.net.HttpURLConnection;
 import java.util.Collections;
 import org.hamcrest.MatcherAssert;
diff --git a/src/test/java/com/jcabi/github/RtGithubTest.java b/src/test/java/com/jcabi/github/RtGithubTest.java
index 9ae48982e..784ed98c1 100644
--- a/src/test/java/com/jcabi/github/RtGithubTest.java
+++ b/src/test/java/com/jcabi/github/RtGithubTest.java
@@ -29,7 +29,7 @@
  */
 package com.jcabi.github;
 
-import com.rexsl.test.request.FakeRequest;
+import com.jcabi.http.request.FakeRequest;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Test;
diff --git a/src/test/java/com/jcabi/github/RtIssueTest.java b/src/test/java/com/jcabi/github/RtIssueTest.java
index 3d0aed177..2be4faaab 100644
--- a/src/test/java/com/jcabi/github/RtIssueTest.java
+++ b/src/test/java/com/jcabi/github/RtIssueTest.java
@@ -29,13 +29,13 @@
  */
 package com.jcabi.github;
 
-import com.rexsl.test.Request;
-import com.rexsl.test.mock.MkAnswer;
-import com.rexsl.test.mock.MkContainer;
-import com.rexsl.test.mock.MkGrizzlyContainer;
-import com.rexsl.test.mock.MkQuery;
-import com.rexsl.test.request.ApacheRequest;
-import com.rexsl.test.request.FakeRequest;
+import com.jcabi.http.Request;
+import com.jcabi.http.mock.MkAnswer;
+import com.jcabi.http.mock.MkContainer;
+import com.jcabi.http.mock.MkGrizzlyContainer;
+import com.jcabi.http.mock.MkQuery;
+import com.jcabi.http.request.ApacheRequest;
+import com.jcabi.http.request.FakeRequest;
 import java.net.HttpURLConnection;
 import javax.json.Json;
 import org.hamcrest.MatcherAssert;
@@ -93,7 +93,7 @@ public void fetchesEvents() throws Exception {
         );
     }
 
-    /**
+    /**
      * RtIssue should be able to describe itself in JSON format.
      *
      * @throws Exception if a problem occurs.
@@ -144,7 +144,7 @@ public void patchWithJson() throws Exception {
         }
     }
 
-    /**
+    /**
      * RtIssue should be able to compare different instances.
      *
      * @throws Exception when a problem occurs.
@@ -158,7 +158,7 @@ public void canCompareInstances() throws Exception {
         );
         MatcherAssert.assertThat(
             greater.compareTo(less), Matchers.greaterThan(0)
-        );
+        );
     }
 
     /**
diff --git a/src/test/java/com/jcabi/github/RtIssuesTest.java b/src/test/java/com/jcabi/github/RtIssuesTest.java
index 758ab19ea..f2a50fce0 100644
--- a/src/test/java/com/jcabi/github/RtIssuesTest.java
+++ b/src/test/java/com/jcabi/github/RtIssuesTest.java
@@ -29,12 +29,12 @@
  */
 package com.jcabi.github;
 
+import com.jcabi.http.Request;
+import com.jcabi.http.mock.MkAnswer;
+import com.jcabi.http.mock.MkContainer;
+import com.jcabi.http.mock.MkGrizzlyContainer;
+import com.jcabi.http.request.JdkRequest;
 import com.jcabi.immutable.ArrayMap;
-import com.rexsl.test.Request;
-import com.rexsl.test.mock.MkAnswer;
-import com.rexsl.test.mock.MkContainer;
-import com.rexsl.test.mock.MkGrizzlyContainer;
-import com.rexsl.test.request.JdkRequest;
 import java.net.HttpURLConnection;
 import javax.json.Json;
 import javax.json.JsonObject;
diff --git a/src/test/java/com/jcabi/github/RtJsonTest.java b/src/test/java/com/jcabi/github/RtJsonTest.java
index 90f973d9f..eb75ac658 100644
--- a/src/test/java/com/jcabi/github/RtJsonTest.java
+++ b/src/test/java/com/jcabi/github/RtJsonTest.java
@@ -29,10 +29,10 @@
  */
 package com.jcabi.github;
 
-import com.rexsl.test.mock.MkAnswer;
-import com.rexsl.test.mock.MkContainer;
-import com.rexsl.test.mock.MkGrizzlyContainer;
-import com.rexsl.test.request.ApacheRequest;
+import com.jcabi.http.mock.MkAnswer;
+import com.jcabi.http.mock.MkContainer;
+import com.jcabi.http.mock.MkGrizzlyContainer;
+import com.jcabi.http.request.ApacheRequest;
 import java.net.HttpURLConnection;
 import javax.json.Json;
 import org.hamcrest.MatcherAssert;
diff --git a/src/test/java/com/jcabi/github/RtLabelTest.java b/src/test/java/com/jcabi/github/RtLabelTest.java
index b2d23f7a1..282b0f5fb 100644
--- a/src/test/java/com/jcabi/github/RtLabelTest.java
+++ b/src/test/java/com/jcabi/github/RtLabelTest.java
@@ -29,11 +29,11 @@
  */
 package com.jcabi.github;
 
-import com.rexsl.test.Request;
-import com.rexsl.test.mock.MkAnswer;
-import com.rexsl.test.mock.MkContainer;
-import com.rexsl.test.mock.MkGrizzlyContainer;
-import com.rexsl.test.request.ApacheRequest;
+import com.jcabi.http.Request;
+import com.jcabi.http.mock.MkAnswer;
+import com.jcabi.http.mock.MkContainer;
+import com.jcabi.http.mock.MkGrizzlyContainer;
+import com.jcabi.http.request.ApacheRequest;
 import java.net.HttpURLConnection;
 import javax.json.Json;
 import org.hamcrest.MatcherAssert;
diff --git a/src/test/java/com/jcabi/github/RtLabelsTest.java b/src/test/java/com/jcabi/github/RtLabelsTest.java
index 571a3c3b8..c559d39d9 100644
--- a/src/test/java/com/jcabi/github/RtLabelsTest.java
+++ b/src/test/java/com/jcabi/github/RtLabelsTest.java
@@ -29,12 +29,12 @@
  */
 package com.jcabi.github;
 
-import com.rexsl.test.Request;
-import com.rexsl.test.mock.MkAnswer;
-import com.rexsl.test.mock.MkContainer;
-import com.rexsl.test.mock.MkGrizzlyContainer;
-import com.rexsl.test.mock.MkQuery;
-import com.rexsl.test.request.JdkRequest;
+import com.jcabi.http.Request;
+import com.jcabi.http.mock.MkAnswer;
+import com.jcabi.http.mock.MkContainer;
+import com.jcabi.http.mock.MkGrizzlyContainer;
+import com.jcabi.http.mock.MkQuery;
+import com.jcabi.http.request.JdkRequest;
 import java.net.HttpURLConnection;
 import javax.json.Json;
 import javax.json.JsonObject;
diff --git a/src/test/java/com/jcabi/github/RtLimitTest.java b/src/test/java/com/jcabi/github/RtLimitTest.java
index 40f237048..d9695492c 100644
--- a/src/test/java/com/jcabi/github/RtLimitTest.java
+++ b/src/test/java/com/jcabi/github/RtLimitTest.java
@@ -29,7 +29,7 @@
  */
 package com.jcabi.github;
 
-import com.rexsl.test.request.FakeRequest;
+import com.jcabi.http.request.FakeRequest;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
 import org.junit.Test;
diff --git a/src/test/java/com/jcabi/github/RtMarkdownTest.java b/src/test/java/com/jcabi/github/RtMarkdownTest.java
index f6ce9e0e8..a00a8698c 100644
--- a/src/test/java/com/jcabi/github/RtMarkdownTest.java
+++ b/src/test/java/com/jcabi/github/RtMarkdownTest.java
@@ -30,10 +30,10 @@
 package com.jcabi.github;
 
 import com.jcabi.github.mock.MkGithub;
-import com.rexsl.test.mock.MkAnswer;
-import com.rexsl.test.mock.MkContainer;
-import com.rexsl.test.mock.MkGrizzlyContainer;
-import com.rexsl.test.request.ApacheRequest;
+import com.jcabi.http.mock.MkAnswer;
+import com.jcabi.http.mock.MkContainer;
+import com.jcabi.http.mock.MkGrizzlyContainer;
+import com.jcabi.http.request.ApacheRequest;
 import java.net.HttpURLConnection;
 import javax.json.Json;
 import javax.ws.rs.core.MediaType;
diff --git a/src/test/java/com/jcabi/github/RtPaginationTest.java b/src/test/java/com/jcabi/github/RtPaginationTest.java
index 8b1a16fb5..181f11cee 100644
--- a/src/test/java/com/jcabi/github/RtPaginationTest.java
+++ b/src/test/java/com/jcabi/github/RtPaginationTest.java
@@ -29,11 +29,11 @@
  */
 package com.jcabi.github;
 
-import com.rexsl.test.Request;
-import com.rexsl.test.mock.MkAnswer;
-import com.rexsl.test.mock.MkContainer;
-import com.rexsl.test.mock.MkGrizzlyContainer;
-import com.rexsl.test.request.ApacheRequest;
+import com.jcabi.http.Request;
+import com.jcabi.http.mock.MkAnswer;
+import com.jcabi.http.mock.MkContainer;
+import com.jcabi.http.mock.MkGrizzlyContainer;
+import com.jcabi.http.request.ApacheRequest;
 import java.net.HttpURLConnection;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
diff --git a/src/test/java/com/jcabi/github/RtPullTest.java b/src/test/java/com/jcabi/github/RtPullTest.java
index 1b97926cb..9eeeb72f4 100644
--- a/src/test/java/com/jcabi/github/RtPullTest.java
+++ b/src/test/java/com/jcabi/github/RtPullTest.java
@@ -29,13 +29,13 @@
  */
 package com.jcabi.github;
 
-import com.rexsl.test.Request;
-import com.rexsl.test.mock.MkAnswer;
-import com.rexsl.test.mock.MkContainer;
-import com.rexsl.test.mock.MkGrizzlyContainer;
-import com.rexsl.test.mock.MkQuery;
-import com.rexsl.test.request.ApacheRequest;
-import com.rexsl.test.request.FakeRequest;
+import com.jcabi.http.Request;
+import com.jcabi.http.mock.MkAnswer;
+import com.jcabi.http.mock.MkContainer;
+import com.jcabi.http.mock.MkGrizzlyContainer;
+import com.jcabi.http.mock.MkQuery;
+import com.jcabi.http.request.ApacheRequest;
+import com.jcabi.http.request.FakeRequest;
 import java.net.HttpURLConnection;
 import org.hamcrest.MatcherAssert;
 import org.hamcrest.Matchers;
diff --git a/src/test/java/com/jcabi/github/RtPullsTest.java b/src/test/java/com/jcabi/github/RtPullsTest.java
index e12f9866f..ffcdbcc51 100644
--- a/src/test/java/com/jcabi/github/RtPullsTest.java
+++ b/src/test/java/com/jcabi/github/RtPullsTest.java
@@ -29,11 +29,11 @@
  */
 package com.jcabi.github;
 
-import com.rexsl.test.Request;
-import com.rexsl.test.mock.MkAnswer;
-import com.rexsl.test.mock.MkContainer;
-import com.rexsl.test.mock.MkGrizzlyContainer;
-import com.rexsl.test.request.ApacheRequest;
+import com.jcabi.http.Request;
+import com.jcabi.http.mock.MkAnswer;
+import com.jcabi.http.mock.MkContainer;
+import com.jcabi.http.mock.MkGrizzlyContainer;
+import com.jcabi.http.request.ApacheRequest;
 import java.net.HttpURLConnection;
 import java.util.Random;
 import javax.json.Json;
diff --git a/src/test/java/com/jcabi/github/RtRepoTest.java b/src/test/java/com/jcabi/github/RtRepoTest.java
index 2c5a74923..6a8e71fa1 100644
--- a/src/test/java/com/jcabi/github/RtRepoTest.java
+++ b/src/test/java/com/jcabi/github/RtRepoTest.java
@@ -29,12 +29,12 @@
  */
 package com.jcabi.github;
 
-import com.rexsl.test.Request;
-import com.rexsl.test.mock.MkAnswer;
-import com.rexsl.test.mock.MkContainer;
-import com.rexsl.test.mock.MkGrizzlyContainer;
-import com.rexsl.test.request.ApacheRequest;
-import com.rexsl.test.request.FakeRequest;
+import com.jcabi.http.Request;
+import com.jcabi.http.mock.MkAnswer;
+import com.jcabi.http.mock.MkContainer;
+import com.jcabi.http.mock.MkGrizzlyContainer;
+import com.jcabi.http.request.ApacheRequest;
+import com.jcabi.http.request.FakeRequest;
 import java.net.HttpURLConnection;
 import javax.json.Json;
 import javax.json.JsonObject;
diff --git a/src/test/java/com/jcabi/github/RtUserTest.java b/src/test/java/com/jcabi/github/RtUserTest.java
index 12dbadfee..e54788cfd 100644
--- a/src/test/java/com/jcabi/github/RtUserTest.java
+++ b/src/test/java/com/jcabi/github/RtUserTest.java
@@ -29,12 +29,12 @@
  */
 package com.jcabi.github;
 
-import com.rexsl.test.Request;
-import com.rexsl.test.mock.MkAnswer;
-import com.rexsl.test.mock.MkContainer;
-import com.rexsl.test.mock.MkGrizzlyContainer;
-import com.rexsl.test.request.ApacheRequest;
-import com.rexsl.test.request.FakeRequest;
+import com.jcabi.http.Request;
+import com.jcabi.http.mock.MkAnswer;
+import com.jcabi.http.mock.MkContainer;
+import com.jcabi.http.mock.MkGrizzlyContainer;
+import com.jcabi.http.request.ApacheRequest;
+import com.jcabi.http.request.FakeRequest;
 import java.net.HttpURLConnection;
 import javax.json.Json;
 import org.hamcrest.MatcherAssert;
diff --git a/src/test/java/com/jcabi/github/RtUsersTest.java b/src/test/java/com/jcabi/github/RtUsersTest.java
index 5530cfdaf..e8d111051 100644
--- a/src/test/java/com/jcabi/github/RtUsersTest.java
+++ b/src/test/java/com/jcabi/github/RtUsersTest.java
@@ -29,10 +29,10 @@
  */
 package com.jcabi.github;
 
-import com.rexsl.test.mock.MkAnswer;
-import com.rexsl.test.mock.MkContainer;
-import com.rexsl.test.mock.MkGrizzlyContainer;
-import com.rexsl.test.request.ApacheRequest;
+import com.jcabi.http.mock.MkAnswer;
+import com.jcabi.http.mock.MkContainer;
+import com.jcabi.http.mock.MkGrizzlyContainer;
+import com.jcabi.http.request.ApacheRequest;
 import java.net.HttpURLConnection;
 import javax.json.Json;
 import javax.json.JsonObject;