Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

HADOOP-19259. ugrade to jackson 2.18.0 #7022

Draft
wants to merge 3 commits into
base: trunk
Choose a base branch
from
+30 −12
Draft

HADOOP-19259. ugrade to jackson 2.18.0 #7022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
675c5ad
use jackson 2.18.0-rc1
pjfanning Sep 1, 2024
aaed920
update maven-shade-plugin because older version can't handle META-INF…
pjfanning Sep 2, 2024
b34b9d1
try to make exception manipulation more robust
pjfanning Sep 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions LICENSE-binary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,12 +218,12 @@ com.aliyun:aliyun-java-sdk-sts:3.0.0
com.aliyun.oss:aliyun-sdk-oss:3.13.2
com.cedarsoftware:java-util:1.9.0
com.cedarsoftware:json-io:2.5.1
com.fasterxml.jackson.core:jackson-annotations:2.12.7
com.fasterxml.jackson.core:jackson-core:2.12.7
com.fasterxml.jackson.core:jackson-databind:2.12.7.1
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.12.7
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.12.7
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.12.7
com.fasterxml.jackson.core:jackson-annotations:2.18.0-rc1
com.fasterxml.jackson.core:jackson-core:2.18.0-rc1
com.fasterxml.jackson.core:jackson-databind:2.18.0-rc1
com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.18.0-rc1
com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.18.0-rc1
com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.18.0-rc1
com.fasterxml.uuid:java-uuid-generator:3.1.4
com.fasterxml.woodstox:woodstox-core:5.4.0
com.github.ben-manes.caffeine:caffeine:2.9.3
Expand Down
24 changes: 21 additions & 3 deletions ...roject/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/WebHdfsFileSystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -846,9 +846,27 @@ private T runWithRetry() throws IOException {
node = url.getAuthority();
}
try {
IOException newIoe = ioe.getClass().getConstructor(String.class)
.newInstance(node + ": " + ioe.getMessage());
newIoe.initCause(ioe.getCause());
final Throwable cause = ioe.getCause();
IOException newIoe = null;
if (cause != null) {
try {
ioe.getClass().getConstructor(String.class, Throwable.class)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

our new DynMethods classes (copied from Parquet) may help here. If they don't that's an opportunity for improvement

.newInstance(node + ": " + ioe.getMessage(), cause);
} catch (NoSuchMethodException e) {
// no matching constructor - try next approach below
}
}
if (newIoe == null) {
newIoe = ioe.getClass().getConstructor(String.class)
.newInstance(node + ": " + ioe.getMessage());
if (cause != null) {
try {
newIoe.initCause(cause);
} catch (Exception e) {
// Unable to initCause. Ignore the exception.
}
}
}
newIoe.setStackTrace(ioe.getStackTrace());
ioe = newIoe;
} catch (NoSuchMethodException | SecurityException
Expand Down
6 changes: 3 additions & 3 deletions hadoop-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@
<jersey.version>1.19.4</jersey.version>

<!-- jackson versions -->
<jackson2.version>2.12.7</jackson2.version>
<jackson2.databind.version>2.12.7.1</jackson2.databind.version>
<jackson2.version>2.18.0-rc1</jackson2.version>
<jackson2.databind.version>2.18.0-rc1</jackson2.databind.version>

<!-- httpcomponents versions -->
<httpclient.version>4.5.13</httpclient.version>
Expand Down Expand Up @@ -177,7 +177,7 @@
<maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
<maven-install-plugin.version>2.5.1</maven-install-plugin.version>
<maven-resources-plugin.version>2.6</maven-resources-plugin.version>
<maven-shade-plugin.version>3.4.1</maven-shade-plugin.version>
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
<maven-jar-plugin.version>2.5</maven-jar-plugin.version>
<maven-war-plugin.version>3.1.0</maven-war-plugin.version>
<maven-source-plugin.version>2.3</maven-source-plugin.version>
Expand Down
Loading