From 346df749110ff080aeb85ca305f085743a4aec3e Mon Sep 17 00:00:00 2001 From: Kashif Faraz Date: Thu, 20 Oct 2022 18:31:57 +0530 Subject: [PATCH 1/3] Fix cves --- licenses.yaml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/licenses.yaml b/licenses.yaml index 0a81365b3752..5b7947685c41 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -278,7 +278,7 @@ name: Jackson license_category: binary module: java-core license_name: Apache License version 2.0 -version: 2.10.5.1 +version: 2.13.4.2 libraries: - com.fasterxml.jackson.core: jackson-databind notice: | diff --git a/pom.xml b/pom.xml index 9fc48fd849ae..3c36756ae839 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ 1.3 9.4.48.v20220622 1.19.4 - 2.10.5.20201202 + 2.13.4.2 1.9.13 2.18.0 5.1.49 From d2378fbaf418f1d84d191f48af09213c350d6a41 Mon Sep 17 00:00:00 2001 From: Kashif Faraz Date: Thu, 20 Oct 2022 21:02:39 +0530 Subject: [PATCH 2/3] Use correct version for jackson-bom --- licenses.yaml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/licenses.yaml b/licenses.yaml index 5b7947685c41..43172c3addb0 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -237,7 +237,7 @@ name: Jackson license_category: binary module: java-core license_name: Apache License version 2.0 -version: 2.10.5 +version: 2.13.4 libraries: - com.fasterxml.jackson.core: jackson-annotations - com.fasterxml.jackson.core: jackson-core diff --git a/pom.xml b/pom.xml index 3c36756ae839..0ad99ad16521 100644 --- a/pom.xml +++ b/pom.xml @@ -98,7 +98,7 @@ 1.3 9.4.48.v20220622 1.19.4 - 2.13.4.2 + 2.13.4.20221013 1.9.13 2.18.0 5.1.49 From 0044688c5807a373c4e4eb13d239bcf40fa18e12 Mon Sep 17 00:00:00 2001 From: Kashif Faraz Date: Thu, 20 Oct 2022 21:53:28 +0530 Subject: [PATCH 3/3] Remove usage of method deleted in latest jackson-databind --- .../org/apache/druid/guice/GuiceAnnotationIntrospector.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/org/apache/druid/guice/GuiceAnnotationIntrospector.java b/core/src/main/java/org/apache/druid/guice/GuiceAnnotationIntrospector.java index ce49253e0ffb..1f1a20d43f99 100644 --- a/core/src/main/java/org/apache/druid/guice/GuiceAnnotationIntrospector.java +++ b/core/src/main/java/org/apache/druid/guice/GuiceAnnotationIntrospector.java @@ -58,9 +58,9 @@ public Object findInjectableValueId(AnnotatedMember m) if (m instanceof AnnotatedMethod) { throw new IAE("Annotated methods don't work very well yet..."); } - return Key.get(m.getGenericType()); + return Key.get(m.getType()); } - return Key.get(m.getGenericType(), guiceAnnotation); + return Key.get(m.getType(), guiceAnnotation); } /**