Skip to content

Commit 9c3b460

Browse files
committed
DRILL-8531: Update Various Libraries due to CVEs (apache#3016)
1 parent 59191e4 commit 9c3b460

File tree

13 files changed

+460
-352
lines changed

13 files changed

+460
-352
lines changed

common/src/main/java/org/apache/drill/common/KerberosUtil.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,17 @@
1717
*/
1818
package org.apache.drill.common;
1919

20+
import org.slf4j.Logger;
21+
import org.slf4j.LoggerFactory;
22+
2023
import java.lang.reflect.InvocationTargetException;
2124
import java.lang.reflect.Method;
2225

2326
import static com.google.common.base.Preconditions.checkNotNull;
2427
import static com.google.common.base.Preconditions.checkState;
2528

2629
public final class KerberosUtil {
27-
private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(KerberosUtil.class);
30+
private static final Logger logger = LoggerFactory.getLogger(KerberosUtil.class);
2831

2932
// Per this link http://docs.oracle.com/javase/jndi/tutorial/ldap/security/gssapi.html
3033
// "... GSS-API SASL mechanism was retrofitted to mean only Kerberos v5 ..."

common/src/main/java/org/apache/drill/common/exceptions/UserExceptionUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,8 @@ private static String decorateHint(final String text) {
3333
return String.format("[Hint: %s]", text);
3434
}
3535
public static String getUserHint(final Throwable ex) {
36-
if (ex.getMessage().startsWith("Error getting user info for current user")) {
36+
final String message = ex.getMessage();
37+
if (message != null && message.startsWith("Error getting user info for current user")) {
3738
//User does not exist hint
3839
return decorateHint(USER_DOES_NOT_EXIST);
3940
} else {

contrib/storage-hive/hive-exec-shade/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<name>Drill : Contrib : Storage : Hive : Exec Shaded</name>
3333

3434
<properties>
35-
<hive.parquet.version>1.15.1</hive.parquet.version>
35+
<hive.parquet.version>1.15.2</hive.parquet.version>
3636
</properties>
3737

3838
<dependencyManagement>

0 commit comments

Comments
 (0)