Bump version.jackson from 2.12.5 to 2.13.1 (#2527)

* Bump version.jackson from 2.12.5 to 2.13.1 Bumps `version.jackson` from 2.12.5 to 2.13.1. Updates `jackson-annotations` from 2.12.5 to 2.13.1 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-core` from 2.12.5 to 2.13.1 - [Release notes](https://github.com/FasterXML/jackson-core/releases) - [Commits](FasterXML/jackson-core@jackson-core-2.12.5...jackson-core-2.13.1) Updates `jackson-databind` from 2.12.5 to 2.13.1 - [Release notes](https://github.com/FasterXML/jackson/releases) - [Commits](https://github.com/FasterXML/jackson/commits) Updates `jackson-dataformat-yaml` from 2.12.5 to 2.13.1 - [Release notes](https://github.com/FasterXML/jackson-dataformats-text/releases) - [Commits](FasterXML/jackson-dataformats-text@jackson-dataformats-text-2.12.5...jackson-dataformats-text-2.13.1) Updates `jackson-datatype-jdk8` from 2.12.5 to 2.13.1 Updates `jackson-datatype-jsr310` from 2.12.5 to 2.13.1 Updates `jackson-module-jaxb-annotations` from 2.12.5 to 2.13.1 - [Release notes](https://github.com/FasterXML/jackson-modules-base/releases) - [Commits](FasterXML/jackson-modules-base@jackson-modules-base-2.12.5...jackson-modules-base-2.13.1) Updates `jackson-module-parameter-names` from 2.12.5 to 2.13.1 - [Release notes](https://github.com/FasterXML/jackson-modules-java8/releases) - [Commits](FasterXML/jackson-modules-java8@jackson-modules-java8-2.12.5...jackson-modules-java8-2.13.1) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-annotations dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jdk8 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310 dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.module:jackson-module-jaxb-annotations dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: com.fasterxml.jackson.module:jackson-module-parameter-names dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Fixed non-deterministic serde registration order Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Aaron Klish <aklish@gmail.com> Co-authored-by: Aaron Klish <klish@verizonmedia.com>
yahoo · Mar 24, 2022 · d2c9068 · d2c9068
1 parent 1a644f6
commit d2c9068
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/elide-core/src/main/java/com/yahoo/elide/ElideSettingsBuilder.java b/elide-core/src/main/java/com/yahoo/elide/ElideSettingsBuilder.java
@@ -36,7 +36,7 @@
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.Date;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.TimeZone;
@@ -80,7 +80,7 @@ public ElideSettingsBuilder(DataStore dataStore) {
         this.joinFilterDialects = new ArrayList<>();
         this.subqueryFilterDialects = new ArrayList<>();
         updateStatusCode = HttpStatus.SC_NO_CONTENT;
-        this.serdes = new HashMap<>();
+        this.serdes = new LinkedHashMap<>();
         this.enableJsonLinks = false;
 
         //By default, Elide supports epoch based dates.

diff --git a/elide-core/src/main/java/com/yahoo/elide/core/utils/DefaultClassScanner.java b/elide-core/src/main/java/com/yahoo/elide/core/utils/DefaultClassScanner.java
@@ -15,7 +15,7 @@
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -74,7 +74,7 @@ public DefaultClassScanner() {
                 startupCache.put(annotationName, scanResult.getClassesWithAnnotation(annotationName)
                         .stream()
                         .map(ClassInfo::loadClass)
-                        .collect(Collectors.toSet()));
+                        .collect(Collectors.toCollection(LinkedHashSet::new)));
 
             }
         }
@@ -91,18 +91,18 @@ public Set<Class<?>> getAnnotatedClasses(String packageName, Class<? extends Ann
                 .filter(clazz ->
                         clazz.getPackage().getName().equals(packageName)
                                 || clazz.getPackage().getName().startsWith(packageName + "."))
-                .collect(Collectors.toSet());
+                .collect(Collectors.toCollection(LinkedHashSet::new));
     }
 
     @Override
     public Set<Class<?>> getAnnotatedClasses(List<Class<? extends Annotation>> annotations,
             FilterExpression filter) {
-        Set<Class<?>> result = new HashSet<>();
+        Set<Class<?>> result = new LinkedHashSet<>();
 
         for (Class<? extends Annotation> annotation : annotations) {
             result.addAll(startupCache.get(annotation.getCanonicalName()).stream()
                     .filter(filter::include)
-                    .collect(Collectors.toSet()));
+                    .collect(Collectors.toCollection(LinkedHashSet::new)));
         }
 
         return result;
@@ -124,7 +124,7 @@ public Set<Class<?>> getAllClasses(String packageName) {
                 .enableClassInfo().whitelistPackages(packageName).scan()) {
             return scanResult.getAllClasses().stream()
                     .map((ClassInfo::loadClass))
-                    .collect(Collectors.toSet());
+                    .collect(Collectors.toCollection(LinkedHashSet::new));
         }
     }
 

diff --git a/pom.xml b/pom.xml
@@ -88,7 +88,7 @@
         <version.logback>1.2.10</version.logback>
         <version.jetty>9.4.45.v20220203</version.jetty>
         <version.restassured>4.4.0</version.restassured>
-        <version.jackson>2.12.5</version.jackson>
+        <version.jackson>2.13.2</version.jackson>
         <version.jersey>2.35</version.jersey>
         <version.junit>5.8.2</version.junit>
         <version.junit.platform>1.8.2</version.junit.platform>