diff --git a/pom.xml b/pom.xml
index 7014e66..5a763b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -83,27 +83,27 @@
io.sentry
sentry
- 1.3.0
+ 1.4.0
com.amazonaws
aws-java-sdk-core
- 1.11.37
+ 1.11.179
com.amazonaws
aws-java-sdk-dynamodb
- 1.11.37
+ 1.11.179
com.amazonaws
aws-java-sdk-cloudfront
- 1.11.37
+ 1.11.179
org.takes
takes
- 1.1
+ 1.6
com.jcabi.incubator
@@ -113,7 +113,7 @@
org.cactoos
cactoos
- 0.11.4
+ 0.13.4
org.hamcrest
@@ -170,7 +170,7 @@
com.jcabi
jcabi-http
- 1.16
+ 1.17.1
com.jcabi
@@ -185,7 +185,7 @@
com.jcabi
jcabi-matchers
- 1.3
+ 1.4
org.apache.velocity
@@ -196,7 +196,7 @@
com.sun.jersey
jersey-client
- 1.19.2
+ 1.19.4
runtime
@@ -225,7 +225,7 @@
com.h2database
h2
- 1.4.193
+ 1.4.196
test
diff --git a/src/main/java/io/jare/cached/CdBase.java b/src/main/java/io/jare/cached/CdBase.java
index 104d039..100f114 100644
--- a/src/main/java/io/jare/cached/CdBase.java
+++ b/src/main/java/io/jare/cached/CdBase.java
@@ -29,7 +29,7 @@
import java.util.concurrent.TimeUnit;
import lombok.EqualsAndHashCode;
import lombok.ToString;
-import org.cactoos.list.MappedIterable;
+import org.cactoos.iterable.Mapped;
/**
* Cached Base.
@@ -64,7 +64,7 @@ public User user(final String name) {
@Override
@Cacheable(lifetime = 1, unit = TimeUnit.MINUTES)
public Iterable domain(final String name) {
- return new MappedIterable<>(
+ return new Mapped<>(
this.origin.domain(name),
CdDomain::new
);
@@ -73,7 +73,7 @@ public Iterable domain(final String name) {
@Override
@Cacheable(unit = TimeUnit.HOURS, lifetime = 1)
public Iterable all() {
- return new MappedIterable<>(
+ return new Mapped<>(
this.origin.all(),
CdDomain::new
);
diff --git a/src/main/java/io/jare/tk/TkInvalidate.java b/src/main/java/io/jare/tk/TkInvalidate.java
index 9b2b39f..386f6ae 100644
--- a/src/main/java/io/jare/tk/TkInvalidate.java
+++ b/src/main/java/io/jare/tk/TkInvalidate.java
@@ -22,9 +22,10 @@
*/
package io.jare.tk;
+import com.amazonaws.auth.AWSStaticCredentialsProvider;
import com.amazonaws.auth.BasicAWSCredentials;
import com.amazonaws.services.cloudfront.AmazonCloudFront;
-import com.amazonaws.services.cloudfront.AmazonCloudFrontClient;
+import com.amazonaws.services.cloudfront.AmazonCloudFrontClientBuilder;
import com.amazonaws.services.cloudfront.model.CreateInvalidationRequest;
import com.amazonaws.services.cloudfront.model.CreateInvalidationResult;
import com.amazonaws.services.cloudfront.model.InvalidationBatch;
@@ -80,9 +81,13 @@ public Response act(final Request req) throws IOException {
"UTF-8"
)
);
- final AmazonCloudFront aws = new AmazonCloudFrontClient(
- new BasicAWSCredentials(this.key, this.secret)
- );
+ final AmazonCloudFront aws = AmazonCloudFrontClientBuilder.standard()
+ .withCredentials(
+ new AWSStaticCredentialsProvider(
+ new BasicAWSCredentials(this.key, this.secret)
+ )
+ )
+ .build();
final CreateInvalidationResult result = aws.createInvalidation(
new CreateInvalidationRequest(
"E2QC66VZY6F0QA",
diff --git a/src/main/java/io/jare/tk/TkRelay.java b/src/main/java/io/jare/tk/TkRelay.java
index 5b89ae1..3a9f191 100644
--- a/src/main/java/io/jare/tk/TkRelay.java
+++ b/src/main/java/io/jare/tk/TkRelay.java
@@ -32,12 +32,12 @@
import java.util.Iterator;
import java.util.Locale;
import java.util.regex.Pattern;
-import org.cactoos.list.ConcatIterable;
-import org.cactoos.list.SkippedIterable;
+import org.cactoos.iterable.Skipped;
import org.takes.HttpException;
import org.takes.Request;
import org.takes.Response;
import org.takes.Take;
+import org.takes.misc.Concat;
import org.takes.rq.RqHref;
import org.takes.rs.RsWithHeaders;
import org.takes.rs.RsWithoutHeader;
@@ -152,14 +152,14 @@ private static Request request(final Request req, final String path) {
return new Request() {
@Override
public Iterable head() throws IOException {
- return new ConcatIterable(
+ return new Concat(
Collections.singleton(
String.format(
"GET %s HTTP/1.1",
path
)
),
- new SkippedIterable<>(req.head(), 1)
+ new Skipped<>(req.head(), 1)
);
}
@Override