Skip to content

Commit f3ff154

Browse files
committed
Remove Guava
1 parent 0008feb commit f3ff154

File tree

14 files changed

+39
-19
lines changed

14 files changed

+39
-19
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
The format is based on [Keep a Changelog](http://keepachangelog.com/)
33
and this project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## 3.1.4 (12/10/2021)
6+
- Remove Guava as a dependency.
7+
- Update Log4j dependency from 2.14.1 to 2.15.0 for [CVE-2021-44228](https://nvd.nist.gov/vuln/detail/CVE-2021-44228).
8+
9+
510
## 3.1.3 (08/11/2021)
611
- [Issue-55](https://github.com/SourceLabOrg/kafka-connect-client/issues/55) Create new HttpContext for every request.
712
- [PR-59](https://github.com/SourceLabOrg/kafka-connect-client/pull/59) Adds supported method to modify the underlying configuration of HttpClient via HttpClientConfigHooks interface.

pom.xml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,6 @@
8585
<version>${http-components.version}</version>
8686
</dependency>
8787

88-
<!-- Guava for Preconditions and URI Escaping -->
89-
<dependency>
90-
<groupId>com.google.guava</groupId>
91-
<artifactId>guava</artifactId>
92-
<version>${guava.version}</version>
93-
</dependency>
94-
9588
<!-- For parsing XML responses to POJOs -->
9689
<dependency>
9790
<groupId>com.fasterxml.jackson.core</groupId>

src/main/java/org/sourcelab/kafka/connect/apiclient/util/UrlEscapingUtil.java

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,23 @@
1+
/**
2+
* Copyright 2018, 2019, 2020, 2021 SourceLab.org https://github.com/SourceLabOrg/kafka-connect-client
3+
*
4+
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
5+
* documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
6+
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
7+
* persons to whom the Software is furnished to do so, subject to the following conditions:
8+
*
9+
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
10+
* Software.
11+
*
12+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
13+
* WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
14+
* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
15+
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
16+
*/
17+
118
package org.sourcelab.kafka.connect.apiclient.util;
219

320
import org.apache.http.client.utils.URLEncodedUtils;
4-
521
import java.util.Objects;
622

723
/**

src/test/java/org/sourcelab/kafka/connect/apiclient/request/get/connector/GetConnectServerVersionTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.sourcelab.kafka.connect.apiclient.request.AbstractRequestTest;
2222
import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectServerVersion;
2323
import org.sourcelab.kafka.connect.apiclient.request.get.GetConnectServerVersion;
24-
import org.sourcelab.kafka.connect.apiclient.request.get.GetConnector;
2524

2625
import java.io.IOException;
2726

src/test/java/org/sourcelab/kafka/connect/apiclient/request/get/connector/GetConnectorConfigTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package org.sourcelab.kafka.connect.apiclient.request.get.connector;
1919

2020
import org.sourcelab.kafka.connect.apiclient.request.AbstractRequestTest;
21-
import org.sourcelab.kafka.connect.apiclient.request.get.GetConnector;
2221
import org.sourcelab.kafka.connect.apiclient.request.get.GetConnectorConfig;
2322

2423
import java.util.Map;

src/test/java/org/sourcelab/kafka/connect/apiclient/request/get/connector/GetConnectorPluginsTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import org.slf4j.LoggerFactory;
2323
import org.sourcelab.kafka.connect.apiclient.request.AbstractRequestTest;
2424
import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorPlugin;
25-
import org.sourcelab.kafka.connect.apiclient.request.get.GetConnector;
26-
import org.sourcelab.kafka.connect.apiclient.request.get.GetConnectorConfig;
2725
import org.sourcelab.kafka.connect.apiclient.request.get.GetConnectorPlugins;
2826

2927
import java.io.IOException;

src/test/java/org/sourcelab/kafka/connect/apiclient/request/get/connector/GetConnectorStatusTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.sourcelab.kafka.connect.apiclient.request.AbstractRequestTest;
2121
import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorDefinition;
2222
import org.sourcelab.kafka.connect.apiclient.request.get.GetConnector;
23-
import org.sourcelab.kafka.connect.apiclient.request.get.GetConnectorPlugins;
2423

2524
import static org.junit.Assert.assertEquals;
2625
import static org.junit.Assert.assertNotNull;

src/test/java/org/sourcelab/kafka/connect/apiclient/request/get/connector/GetConnectorTasksTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.junit.Test;
2121
import org.sourcelab.kafka.connect.apiclient.request.AbstractRequestTest;
2222
import org.sourcelab.kafka.connect.apiclient.request.dto.Task;
23-
import org.sourcelab.kafka.connect.apiclient.request.get.GetConnector;
2423
import org.sourcelab.kafka.connect.apiclient.request.get.GetConnectorTasks;
2524

2625
import java.io.IOException;

src/test/java/org/sourcelab/kafka/connect/apiclient/request/get/connector/GetConnectorsExpandAllDetailsTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorDefinition;
2424
import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorStatus;
2525
import org.sourcelab.kafka.connect.apiclient.request.dto.ConnectorsWithExpandedMetadata;
26-
import org.sourcelab.kafka.connect.apiclient.request.get.GetConnector;
2726
import org.sourcelab.kafka.connect.apiclient.request.get.GetConnectorsExpandAllDetails;
2827

2928
import java.io.IOException;

src/test/java/org/sourcelab/kafka/connect/apiclient/request/get/connector/GetConnectorsTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import org.junit.Test;
2121
import org.sourcelab.kafka.connect.apiclient.request.AbstractRequestTest;
22-
import org.sourcelab.kafka.connect.apiclient.request.get.GetConnector;
2322
import org.sourcelab.kafka.connect.apiclient.request.get.GetConnectors;
2423

2524
import java.io.IOException;

0 commit comments

Comments
 (0)