Skip to content

Commit 9d5647a

Browse files
author
Andrei Kamarouski
committed
bump up dependencies
1 parent 22348d2 commit 9d5647a

File tree

5 files changed

+65
-69
lines changed

5 files changed

+65
-69
lines changed

‎.gitignore‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1-
.idea/
2-
out/
3-
target/
1+
.project
2+
target
3+
bin
4+
.classpath
5+
/test-output
6+
/.settings
7+
**/.settings
8+
/com
9+
/application.log
10+
/sql.log
11+
*.checkstyle
12+
.idea
13+
*.iml
14+
test-output
15+
*.log
16+
/reports
17+
/out
18+
dependency-reduced-pom.xml

‎pom.xml‎

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1313
<selenium.version>4.15.0</selenium.version>
1414
<commons-logging.version>1.2</commons-logging.version>
15-
<commons-io.version>2.7</commons-io.version>
16-
<commons-lang3.version>3.5</commons-lang3.version>
17-
<jackson-databind.version>2.9.10.8</jackson-databind.version>
18-
<httpclient.version>4.5.13</httpclient.version>
19-
<genson.version>0.99</genson.version>
15+
<commons-lang3.version>3.14.0</commons-lang3.version>
16+
<jackson-databind.version>2.16.0</jackson-databind.version>
17+
<httpclient.version>5.2.2</httpclient.version>
18+
<genson.version>1.6</genson.version>
2019
<jersey-bundle.version>1.19.4</jersey-bundle.version>
2120
<lombok.version>1.18.30</lombok.version>
2221
<maven-shade-plugin.version>3.5.0</maven-shade-plugin.version>
@@ -26,31 +25,21 @@
2625
<maven-javadoc-plugin.version>3.6.2</maven-javadoc-plugin.version>
2726
</properties>
2827
<dependencies>
29-
<dependency>
30-
<groupId>org.projectlombok</groupId>
31-
<artifactId>lombok</artifactId>
32-
<version>${lombok.version}</version>
33-
<scope>provided</scope>
34-
</dependency>
3528
<dependency>
3629
<groupId>org.seleniumhq.selenium</groupId>
3730
<artifactId>selenium-grid</artifactId>
38-
<version>4.15.0</version>
31+
<version>${selenium.version}</version>
3932
</dependency>
4033
<dependency>
4134
<groupId>org.seleniumhq.selenium</groupId>
4235
<artifactId>selenium-api</artifactId>
4336
<version>${selenium.version}</version>
4437
</dependency>
4538
<dependency>
46-
<groupId>commons-logging</groupId>
47-
<artifactId>commons-logging</artifactId>
48-
<version>${commons-logging.version}</version>
49-
</dependency>
50-
<dependency>
51-
<groupId>commons-io</groupId>
52-
<artifactId>commons-io</artifactId>
53-
<version>${commons-io.version}</version>
39+
<groupId>org.projectlombok</groupId>
40+
<artifactId>lombok</artifactId>
41+
<version>${lombok.version}</version>
42+
<scope>provided</scope>
5443
</dependency>
5544
<dependency>
5645
<groupId>org.apache.commons</groupId>
@@ -63,8 +52,8 @@
6352
<version>${jackson-databind.version}</version>
6453
</dependency>
6554
<dependency>
66-
<groupId>org.apache.httpcomponents</groupId>
67-
<artifactId>httpclient</artifactId>
55+
<groupId>org.apache.httpcomponents.client5</groupId>
56+
<artifactId>httpclient5</artifactId>
6857
<version>${httpclient.version}</version>
6958
</dependency>
7059
<dependency>
@@ -77,11 +66,10 @@
7766
<artifactId>jersey-bundle</artifactId>
7867
<version>${jersey-bundle.version}</version>
7968
</dependency>
80-
8169
<dependency>
82-
<groupId>javax.annotation</groupId>
83-
<artifactId>javax.annotation-api</artifactId>
84-
<version>1.2</version>
70+
<groupId>jakarta.annotation</groupId>
71+
<artifactId>jakarta.annotation-api</artifactId>
72+
<version>3.0.0-M1</version>
8573
</dependency>
8674
</dependencies>
8775
<build>
@@ -118,13 +106,6 @@
118106
</goals>
119107
<configuration>
120108
<minimizeJar>false</minimizeJar>
121-
<archive>
122-
<manifest>
123-
<mainClass>
124-
org.openqa.selenium.grid.Bootstrap
125-
</mainClass>
126-
</manifest>
127-
</archive>
128109
<filters>
129110
<filter>
130111
<artifact>*:*</artifact>

‎src/main/java/com/zebrunner/mcloud/grid/util/GensonProvider.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,20 @@
1616
package com.zebrunner.mcloud.grid.util;
1717

1818
import com.owlike.genson.Genson;
19+
import com.owlike.genson.GensonBuilder;
1920

2021
import javax.ws.rs.ext.ContextResolver;
2122
import javax.ws.rs.ext.Provider;
2223

2324
/**
2425
* GensonProvider - allows to deserialize timestamp to Date.
25-
*
26+
*
2627
* @author akhursevich
2728
*/
2829
@Provider
2930
public class GensonProvider implements ContextResolver<Genson> {
3031

31-
private final Genson genson = new Genson.Builder().useTimeInMillis(true).create();
32+
private final Genson genson = new GensonBuilder().create();
3233

3334
@Override
3435
public Genson getContext(Class<?> type) {

‎src/main/java/com/zebrunner/mcloud/grid/util/HttpClient.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import org.apache.commons.lang3.concurrent.LazyInitializer;
3636
import org.apache.commons.lang3.exception.ExceptionUtils;
3737

38-
public class HttpClient {
38+
public final class HttpClient {
3939
private static final Logger LOGGER = Logger.getLogger(HttpClient.class.getName());
4040

4141
private static final LazyInitializer<Client> CLIENT = new LazyInitializer<>() {
@@ -48,6 +48,10 @@ protected Client initialize() throws ConcurrentException {
4848
}
4949
};
5050

51+
private HttpClient() {
52+
//hide
53+
}
54+
5155
public static Executor uri(Path path, String serviceUrl, Object... parameters) {
5256
String url = path.build(serviceUrl, parameters);
5357
return uri(url, null);
@@ -183,7 +187,5 @@ public void setObject(T object) {
183187
public String toString() {
184188
return "Response [status=" + status + ", object=" + object + "]";
185189
}
186-
187190
}
188-
189191
}

‎src/main/java/com/zebrunner/mcloud/grid/util/HttpClientApache.java‎

Lines changed: 25 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,40 +17,39 @@
1717

1818
import java.io.IOException;
1919
import java.net.URI;
20+
import java.time.Duration;
2021
import java.util.logging.Level;
2122
import java.util.logging.Logger;
2223

23-
import org.apache.http.HttpEntity;
24-
import org.apache.http.client.config.RequestConfig;
25-
import org.apache.http.client.methods.CloseableHttpResponse;
26-
import org.apache.http.client.methods.HttpDelete;
27-
import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
28-
import org.apache.http.client.methods.HttpGet;
29-
import org.apache.http.client.methods.HttpPost;
30-
import org.apache.http.client.methods.HttpPut;
31-
import org.apache.http.client.methods.HttpUriRequest;
32-
import org.apache.http.impl.client.CloseableHttpClient;
33-
import org.apache.http.impl.client.HttpClientBuilder;
34-
import org.apache.http.util.EntityUtils;
24+
import org.apache.hc.client5.http.classic.methods.HttpDelete;
25+
import org.apache.hc.client5.http.classic.methods.HttpGet;
26+
import org.apache.hc.client5.http.classic.methods.HttpPost;
27+
import org.apache.hc.client5.http.classic.methods.HttpPut;
28+
import org.apache.hc.client5.http.classic.methods.HttpUriRequest;
29+
import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
30+
import org.apache.hc.client5.http.config.RequestConfig;
31+
import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
32+
import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
33+
import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
34+
import org.apache.hc.core5.http.HttpEntity;
35+
import org.apache.hc.core5.http.ParseException;
36+
import org.apache.hc.core5.http.io.entity.EntityUtils;
37+
import org.apache.hc.core5.util.Timeout;
3538

3639
import com.zebrunner.mcloud.grid.integration.client.Path;
3740
import com.zebrunner.mcloud.grid.util.HttpClient.Response;
3841

39-
public class HttpClientApache {
42+
public final class HttpClientApache {
4043

41-
private static Logger LOGGER = Logger.getLogger(HttpClientApache.class.getName());
42-
43-
private final static RequestConfig DEFAULT_REQUEST_CFG = RequestConfig.custom()
44-
.setConnectionRequestTimeout(1000)
45-
.setConnectTimeout(1000)
46-
.setSocketTimeout(3000)
44+
private static final Logger LOGGER = Logger.getLogger(HttpClientApache.class.getName());
45+
private static final RequestConfig DEFAULT_REQUEST_CFG = RequestConfig.custom()
46+
.setConnectionRequestTimeout(Timeout.of(Duration.ofSeconds(3)))
4747
.build();
48-
4948
private RequestConfig requestConfig = DEFAULT_REQUEST_CFG;
50-
5149
private String url;
5250

5351
private HttpClientApache() {
52+
//hide
5453
}
5554

5655
public static HttpClientApache create() {
@@ -75,12 +74,11 @@ public Response<String> get() {
7574
return execute(new HttpGet(url));
7675
}
7776

78-
public static class HttpGetWithEntity extends HttpEntityEnclosingRequestBase {
77+
public static class HttpGetWithEntity extends HttpUriRequestBase {
7978
public static final String METHOD_NAME = "GET";
8079

8180
public HttpGetWithEntity(final String uri) {
82-
super();
83-
setURI(URI.create(uri));
81+
super(METHOD_NAME, URI.create(uri));
8482
}
8583

8684
@Override
@@ -129,17 +127,16 @@ public Response<String> delete() {
129127
}
130128

131129
private Response<String> execute(HttpUriRequest req) {
132-
Response<String> result = new Response<String>();
130+
Response<String> result = new Response<>();
133131
try (CloseableHttpClient httpClient = HttpClientBuilder.create()
134132
.setDefaultRequestConfig(requestConfig)
135133
.build();
136134
CloseableHttpResponse response = httpClient.execute(req)) {
137-
result.setStatus(response.getStatusLine().getStatusCode());
135+
result.setStatus(response.getCode());
138136
result.setObject(EntityUtils.toString(response.getEntity()));
139-
} catch (IOException e) {
137+
} catch (IOException | ParseException e) {
140138
LOGGER.log(Level.SEVERE, e.getMessage(), e);
141139
}
142140
return result;
143141
}
144-
145142
}

0 commit comments

Comments
 (0)