Skip to content

Commit d4d166d

Browse files
authored
HIVE-29518: Upgrade jackson to 2.18.6 due to GHSA-72hv-8253-57qq (#6385)
1 parent 6d34720 commit d4d166d

4 files changed

Lines changed: 8 additions & 3 deletions

File tree

common/src/java/org/apache/hadoop/hive/common/JavaVersionUtils.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ public static String getAddOpensFlagsIfNeeded() {
4141
return " --add-opens=java.base/java.net=ALL-UNNAMED" +
4242
" --add-opens=java.base/java.util=ALL-UNNAMED" +
4343
" --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" +
44+
" --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" +
4445
" --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" +
4546
" --add-opens=java.base/java.lang=ALL-UNNAMED" +
4647
" --add-opens=java.base/java.io=ALL-UNNAMED" +

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<test.excludes.additional/>
9393
<!-- Plugin and Plugin Dependency Versions -->
9494
<ant.contrib.version>1.0b3</ant.contrib.version>
95-
<maven.test.jvm.args>-Xmx2048m -DJETTY_AVAILABLE_PROCESSORS=4 -Duser.country=US -Dio.netty.tryReflectionSetAccessible=true -Djava.locale.providers=COMPAT,CLDR --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.sql/java.sql=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED</maven.test.jvm.args>
95+
<maven.test.jvm.args>-Xmx2048m -DJETTY_AVAILABLE_PROCESSORS=4 -Duser.country=US -Dio.netty.tryReflectionSetAccessible=true -Djava.locale.providers=COMPAT,CLDR --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED --add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.sql/java.sql=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED</maven.test.jvm.args>
9696
<maven.checkstyle.plugin.version>3.5.0</maven.checkstyle.plugin.version>
9797
<maven.build-helper.plugin.version>3.4.0</maven.build-helper.plugin.version>
9898
<maven.eclipse.plugin.version>2.10</maven.eclipse.plugin.version>
@@ -154,7 +154,7 @@
154154
<httpcomponents5.core.version>5.3.4</httpcomponents5.core.version>
155155
<httpcomponents5.client.version>5.5</httpcomponents5.client.version>
156156
<ivy.version>2.5.2</ivy.version>
157-
<jackson.version>2.16.1</jackson.version>
157+
<jackson.version>2.18.6</jackson.version>
158158
<jamon.plugin.version>2.3.4</jamon.plugin.version>
159159
<jamon-runtime.version>2.4.1</jamon-runtime.version>
160160
<javax-servlet.version>3.1.0</javax-servlet.version>

ql/src/java/org/apache/hadoop/hive/ql/stats/OperatorStats.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ public String getOperatorId() {
5757
return operatorId;
5858
}
5959

60+
public void setOperatorId(final String operatorId) {
61+
this.operatorId = operatorId;
62+
}
63+
6064
@Override
6165
public String toString() {
6266
return String.format("OperatorStats %s records: %d", operatorId, outputRecords);

standalone-metastore/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
<guava.version>22.0</guava.version>
8888
<hadoop.version>3.4.2</hadoop.version>
8989
<hikaricp.version>4.0.3</hikaricp.version>
90-
<jackson.version>2.16.1</jackson.version>
90+
<jackson.version>2.18.6</jackson.version>
9191
<jexl.version>3.3</jexl.version>
9292
<javolution.version>5.5.1</javolution.version>
9393
<junit.version>4.13.2</junit.version>

0 commit comments

Comments
 (0)