Skip to content

Commit

Permalink
Update jackson dependency (#163)
Browse files Browse the repository at this point in the history
Pull in Jackson security fixes
  • Loading branch information
ksclarke authored Jun 1, 2022
1 parent deb748f commit a62c1da
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 13 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
<revision>0.0.0-SNAPSHOT</revision>

<!-- Project dependencies -->
<jackson.version>2.12.6</jackson.version>
<jackson.databind.version>2.12.6.1</jackson.databind.version>
<jackson.version>2.13.3</jackson.version>
<jackson.databind.version>2.13.3</jackson.databind.version>
<guava.version>31.1-jre</guava.version>
<freelib.utils.version>3.0.1</freelib.utils.version>
<vertx.version>3.9.11</vertx.version>
<vertx.version>4.3.1</vertx.version>

<!-- Test related versions -->
<opencsv.version>4.6</opencsv.version>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class CollectionTest {
public void setUp() {
myID = UUID.randomUUID().toString();
myLabel = "label-" + UUID.randomUUID().toString();
myVertx = Vertx.factory.vertx();
myVertx = Vertx.vertx();
}

/**
Expand All @@ -53,7 +53,7 @@ public void setUp() {
@Test
public void testCollectionManifestManifestConstructor() {
final Collection.Manifest manifest =
new Collection.Manifest(new info.freelibrary.iiif.presentation.v2.Collection.Manifest(myID, myLabel));
new Collection.Manifest(new info.freelibrary.iiif.presentation.v2.Collection.Manifest(myID, myLabel));

assertEquals(URI.create(myID), manifest.getID());
assertEquals(new Label(myLabel), manifest.getLabel());
Expand Down Expand Up @@ -151,7 +151,7 @@ public void testFromJSON() {
@Test
public void testFromString() {
final String json =
myVertx.fileSystem().readFileBlocking(TEST_FILE1.getAbsolutePath()).toString(StandardCharsets.UTF_8);
myVertx.fileSystem().readFileBlocking(TEST_FILE1.getAbsolutePath()).toString(StandardCharsets.UTF_8);
final Collection collection = Collection.fromString(json);

assertEquals(new JsonObject(json), collection.toJSON());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import info.freelibrary.iiif.presentation.v2.properties.ViewingHint;
import info.freelibrary.iiif.presentation.v2.services.ImageInfoService;
import info.freelibrary.iiif.presentation.v2.utils.Constants;

import io.vertx.core.Vertx;
import io.vertx.core.buffer.Buffer;
import io.vertx.core.json.JsonObject;
Expand Down Expand Up @@ -51,11 +50,9 @@ public class ManifestTest extends AbstractTest {

private static final String TEST_TITLE = "Georgian NF Fragment 68a";

private static final List<String[]> METADATA_PAIRS = Stream
.of(new String[] { "Title", TEST_TITLE }, new String[] { "Extent", "1 f" },
new String[] { "Overtext Language", "Georgian" },
new String[] { "Undertext Language(s)", "Christian Palestinian Aramaic" })
.collect(Collectors.toList());
private static final List<String[]> METADATA_PAIRS = Stream.of(new String[] { "Title", TEST_TITLE },
new String[] { "Extent", "1 f" }, new String[] { "Overtext Language", "Georgian" },
new String[] { "Undertext Language(s)", "Christian Palestinian Aramaic" }).collect(Collectors.toList());

private static final int HEIGHT = 8176;

Expand Down Expand Up @@ -135,7 +132,7 @@ public void setUp() throws IOException {
}

sequence.addCanvas(canvas1, canvas2);
myVertx = Vertx.factory.vertx();
myVertx = Vertx.vertx();
}

/**
Expand Down

0 comments on commit a62c1da

Please sign in to comment.