Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump jackson.version from 2.14.2 to 2.15.0 #563

Merged
merged 2 commits into from
Apr 25, 2023
Merged

Bump jackson.version from 2.14.2 to 2.15.0 #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c9285a
Bump jackson.version from 2.14.2 to 2.15.0
dependabot[bot] Apr 24, 2023
442b205
fix JsonAnySetter
msbarry Apr 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions planetiler-core/src/main/java/com/onthegomap/planetiler/pmtiles/Pmtiles.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,14 +363,19 @@ public static List<Entry> directoryFromBytes(byte[] bytes) {
*/
public record JsonMetadata(
@JsonProperty("vector_layers") List<LayerStats.VectorLayer> vectorLayers,
@JsonAnyGetter @JsonAnySetter Map<String, String> otherMetadata
@JsonAnyGetter Map<String, String> otherMetadata
) {

@JsonCreator
JsonMetadata(@JsonProperty("vector_layers") List<LayerStats.VectorLayer> vectorLayers) {
public JsonMetadata(@JsonProperty("vector_layers") List<LayerStats.VectorLayer> vectorLayers) {
this(vectorLayers, new HashMap<>());
}

@JsonAnySetter
private void setExtraMetadata(String key, String val) {
otherMetadata.put(key, val);
}

public byte[] toBytes() {

try {
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.source.excludeResources>true</maven.source.excludeResources>
<jackson.version>2.14.2</jackson.version>
<jackson.version>2.15.0</jackson.version>
<junit.version>5.9.2</junit.version>
<sonar.host.url>https://sonarcloud.io</sonar.host.url>
<sonar.organization>onthegomap</sonar.organization>
Expand Down