This is an automated email from the ASF dual-hosted git repository.
dionusos pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/oozie.git
The following commit(s) were added to refs/heads/master by this push:
new 2d9ab4059 OOZIE-3689 Remove usage of commons-httpclient due to EOL
(jmakai via dionusos)
2d9ab4059 is described below
commit 2d9ab40595f5df0019bf9285f40c33bfdf5499c9
Author: Denes Bodo <[email protected]>
AuthorDate: Fri Dec 16 10:14:35 2022 +0100
OOZIE-3689 Remove usage of commons-httpclient due to EOL (jmakai via
dionusos)
---
.../apache/oozie/service/TestHAShareLibService.java | 20 ++++++++++----------
release-log.txt | 1 +
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git
a/core/src/test/java/org/apache/oozie/service/TestHAShareLibService.java
b/core/src/test/java/org/apache/oozie/service/TestHAShareLibService.java
index d7b637fec..934d617fd 100644
--- a/core/src/test/java/org/apache/oozie/service/TestHAShareLibService.java
+++ b/core/src/test/java/org/apache/oozie/service/TestHAShareLibService.java
@@ -23,11 +23,10 @@ import java.io.InputStreamReader;
import java.io.Reader;
import java.net.HttpURLConnection;
import java.net.URI;
+import java.net.URL;
import java.nio.charset.StandardCharsets;
import java.util.Date;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.oozie.client.rest.JsonTags;
@@ -95,13 +94,13 @@ public class TestHAShareLibService extends ZKXTestCase {
DummyZKOozie dummyOozie_2 = null;
try {
dummyOozie_1 = new DummyZKOozie("9876",
container.getServletURL("/other-oozie-server/*"));
- String url = container.getServletURL("/v2/admin/*") +
"update_sharelib?" + RestConstants.ALL_SERVER_REQUEST
- + "=true";
- HttpClient client = new HttpClient();
- GetMethod method = new GetMethod(url);
- int statusCode = client.executeMethod(method);
+ URL url = new URL(container.getServletURL("/v2/admin/*") +
"update_sharelib?" + RestConstants.ALL_SERVER_REQUEST
+ + "=true");
+
+ HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+ int statusCode = conn.getResponseCode();
assertEquals(HttpURLConnection.HTTP_OK, statusCode);
- Reader reader = new
InputStreamReader(method.getResponseBodyAsStream(), StandardCharsets.UTF_8);
+ Reader reader = new InputStreamReader(conn.getInputStream(),
StandardCharsets.UTF_8);
JSONArray sharelib = (JSONArray) JSONValue.parse(reader);
assertEquals(2, sharelib.size());
// 1st server update is successful
@@ -117,9 +116,10 @@ public class TestHAShareLibService extends ZKXTestCase {
// 3rd server not defined.should throw exception.
dummyOozie_2 = new DummyZKOozie("9873",
container.getServletURL("/") + "not-defined/");
- statusCode = client.executeMethod(method);
+ conn = (HttpURLConnection) url.openConnection();
+ statusCode = conn.getResponseCode();
assertEquals(HttpURLConnection.HTTP_OK, statusCode);
- reader = new
InputStreamReader(method.getResponseBodyAsStream(),StandardCharsets.UTF_8);
+ reader = new
InputStreamReader(conn.getInputStream(),StandardCharsets.UTF_8);
sharelib = (JSONArray) JSONValue.parse(reader);
assertEquals(3, sharelib.size());
diff --git a/release-log.txt b/release-log.txt
index 8f067d7ad..d219195a0 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
-- Oozie 5.3.0 release (trunk - unreleased)
+OOZIE-3689 Remove usage of commons-httpclient due to EOL (jmakai via dionusos)
OOZIE-3688 Introduce retry mechanism when starting embedded servlet containers
in unit tests (jmakai via dionusos)
OOZIE-3685 Repair flaky testCoordActionInputCheckXCommandUniqueness unit test
(jmakai via dionusos)
OOZIE-3686 Repair flaky testRetryConsoleUrlForked unit test (jmakai via
dionusos)
