Skip to content

Commit

Permalink
Merge pull request #64 from arnoweiss/bug-27
Browse files Browse the repository at this point in the history
Bump jackson to 2.14.2 and adjust API
  • Loading branch information
FrankSchnicke authored Mar 6, 2023
2 parents 3dd8ec0 + ef2eba2 commit 063fe24
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import java.util.Collection;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.cfg.MapperConfig;
import com.fasterxml.jackson.databind.introspect.Annotated;
import com.fasterxml.jackson.databind.introspect.AnnotatedClass;
import com.fasterxml.jackson.databind.introspect.AnnotatedMethod;
Expand Down Expand Up @@ -45,8 +46,8 @@ public XmlDataformatAnnotationIntrospector() {
}

@Override
public String findNamespace(Annotated ann) {
String ns = super.findNamespace(ann);
public String findNamespace(MapperConfig<?> config, Annotated ann) {
String ns = super.findNamespace(null, ann);
if (ns == null) {
return myDefaultNamespace;
} else {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
<commons-lang3.version>3.12.0</commons-lang3.version>
<guava.version>30.1.1-jre</guava.version>
<guice.version>5.0.1</guice.version>
<jackson.version>2.12.3</jackson.version>
<jackson.version>2.14.2</jackson.version>
<javax-validation.version>2.0.1.Final</javax-validation.version>
<jaxb.version>2.3.1</jaxb.version>
<jaxb-rich-contract.version>2.1.0</jaxb-rich-contract.version>
Expand Down

0 comments on commit 063fe24

Please sign in to comment.