Skip to content

Commit 4ad020d

Browse files
authored
Merge pull request #286 from karlduderstadt/jackson-dataformat-smile
add jackson-dataformat-smile to pom
2 parents 333a14d + 0751d6f commit 4ad020d

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

pom.xml

+7
Original file line numberDiff line numberDiff line change
@@ -1840,11 +1840,13 @@
18401840
<jackson-core.version>${jackson.version}</jackson-core.version>
18411841
<jackson-databind.version>${jackson.version}</jackson-databind.version>
18421842
<jackson-dataformat-cbor.version>${jackson.version}</jackson-dataformat-cbor.version>
1843+
<jackson-dataformat-smile.version>${jackson.version}</jackson-dataformat-smile.version>
18431844
<jackson-dataformat-yaml.version>${jackson.version}</jackson-dataformat-yaml.version>
18441845
<com.fasterxml.jackson.core.jackson-annotations.version>${jackson-annotations.version}</com.fasterxml.jackson.core.jackson-annotations.version>
18451846
<com.fasterxml.jackson.core.jackson-core.version>${jackson-core.version}</com.fasterxml.jackson.core.jackson-core.version>
18461847
<com.fasterxml.jackson.core.jackson-databind.version>${jackson-databind.version}</com.fasterxml.jackson.core.jackson-databind.version>
18471848
<com.fasterxml.jackson.dataformat.jackson-dataformat-cbor.version>${jackson-dataformat-cbor.version}</com.fasterxml.jackson.dataformat.jackson-dataformat-cbor.version>
1849+
<com.fasterxml.jackson.dataformat.jackson-dataformat-smile.version>${jackson-dataformat-smile.version}</com.fasterxml.jackson.dataformat.jackson-dataformat-smile.version>
18481850
<com.fasterxml.jackson.dataformat.jackson-dataformat-yaml.version>${jackson-dataformat-yaml.version}</com.fasterxml.jackson.dataformat.jackson-dataformat-yaml.version>
18491851

18501852
<!-- Java Advanced Imaging - https://java.net/projects/jai-core -->
@@ -5430,6 +5432,11 @@
54305432
<artifactId>jackson-dataformat-cbor</artifactId>
54315433
<version>${com.fasterxml.jackson.dataformat.jackson-dataformat-cbor.version}</version>
54325434
</dependency>
5435+
<dependency>
5436+
<groupId>com.fasterxml.jackson.dataformat</groupId>
5437+
<artifactId>jackson-dataformat-smile</artifactId>
5438+
<version>${com.fasterxml.jackson.dataformat.jackson-dataformat-smile.version}</version>
5439+
</dependency>
54335440
<dependency>
54345441
<groupId>com.fasterxml.jackson.dataformat</groupId>
54355442
<artifactId>jackson-dataformat-yaml</artifactId>

tests/generate-mega-melt.py

+4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ def child(node, tag):
3131
# because it has a module-info.java, so skip it until the
3232
# component collection is updated from Java 8 to Java 11.
3333
'ij',
34+
# TEMP: The original ImageJ introduced changes in
35+
# 1.54m/1.54n/1.54p that breaks some downstream tests.
36+
# Disable them till we have time to address the issue.
37+
'ij1-patcher', 'imagej-legacy',
3438
# NB: Skip artifacts requiring minimum Java version >8.
3539
'algart-tiff',
3640
# NB: The following artifacts have messy dependency trees.

0 commit comments

Comments
 (0)