Skip to content

Commit 761ff3d

Browse files
basmussendependabot[bot]Ben Asmussen
authored
Upgrade to Jackson 3.0.3 and json-schema-validator 3.0.0 (#68)
* Bump com.networknt:json-schema-validator from 2.0.0 to 3.0.0 Bumps [com.networknt:json-schema-validator](https://github.com/networknt/json-schema-validator) from 2.0.0 to 3.0.0. - [Release notes](https://github.com/networknt/json-schema-validator/releases) - [Changelog](https://github.com/networknt/json-schema-validator/blob/master/CHANGELOG.md) - [Commits](networknt/json-schema-validator@2.0.0...3.0.0) --- updated-dependencies: - dependency-name: com.networknt:json-schema-validator dependency-version: 3.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * Upgrade to Jackson 3.0.3 and asciidoc-linter 0.7.0 --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Ben Asmussen <ben.asmussen@dataliquid.de>
1 parent 78e7d2b commit 761ff3d

File tree

4 files changed

+27
-38
lines changed

4 files changed

+27
-38
lines changed

‎pom.xml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<asciidoctorj.diagram.version>3.1.0</asciidoctorj.diagram.version>
3737
<asciidoctorj.diagram.plantuml.version>1.2025.3</asciidoctorj.diagram.plantuml.version>
3838
<asciidoctorj.diagram.ditaamini.version>1.0.3</asciidoctorj.diagram.ditaamini.version>
39-
<jackson.version>2.20.1</jackson.version>
39+
<jackson.version>3.0.3</jackson.version>
4040
<maven.plugin.tools.version>3.15.2</maven.plugin.tools.version>
4141
</properties>
4242

@@ -85,13 +85,13 @@
8585
</dependency>
8686

8787
<dependency>
88-
<groupId>com.fasterxml.jackson.core</groupId>
88+
<groupId>tools.jackson.core</groupId>
8989
<artifactId>jackson-databind</artifactId>
9090
<version>${jackson.version}</version>
9191
</dependency>
92-
92+
9393
<dependency>
94-
<groupId>com.fasterxml.jackson.dataformat</groupId>
94+
<groupId>tools.jackson.dataformat</groupId>
9595
<artifactId>jackson-dataformat-yaml</artifactId>
9696
<version>${jackson.version}</version>
9797
</dependency>
@@ -111,7 +111,7 @@
111111
<dependency>
112112
<groupId>com.networknt</groupId>
113113
<artifactId>json-schema-validator</artifactId>
114-
<version>2.0.0</version>
114+
<version>3.0.0</version>
115115
</dependency>
116116

117117
<dependency>
@@ -164,7 +164,7 @@
164164
<dependency>
165165
<groupId>com.dataliquid</groupId>
166166
<artifactId>asciidoc-linter</artifactId>
167-
<version>0.6.0</version>
167+
<version>0.7.0</version>
168168
</dependency>
169169

170170
<dependency>

‎src/main/java/com/dataliquid/maven/asciidoc/mojo/LinterMojo.java‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -129,24 +129,14 @@ private OutputConfiguration createOutputConfiguration() throws IOException {
129129
SummaryConfig summaryConfig = baseConfig.getSummary();
130130
boolean showLineNumbers = baseConfig.getDisplay().isShowLineNumbers();
131131

132-
return OutputConfiguration
133-
.builder()
134-
.display(DisplayConfig
135-
.builder()
136-
.contextLines(contextLines)
137-
.highlightStyle(highlightErrors ? HighlightStyle.UNDERLINE : HighlightStyle.NONE)
138-
.useColors(useColors && MavenLogWriter.supportsAnsiColors())
139-
.showLineNumbers(showLineNumbers)
140-
.showHeader(false)
141-
.build())
142-
.suggestions(SuggestionsConfig
143-
.builder()
144-
.enabled(showSuggestions)
145-
.maxPerError(maxSuggestionsPerError)
146-
.showExamples(showExamples)
147-
.build())
148-
.summary(summaryConfig)
149-
.build();
132+
return new OutputConfiguration(null, // format - use default
133+
new DisplayConfig(contextLines, highlightErrors ? HighlightStyle.UNDERLINE : HighlightStyle.NONE,
134+
useColors && MavenLogWriter.supportsAnsiColors(), showLineNumbers, null, // maxLineWidth - use
135+
// default
136+
false // showHeader
137+
), new SuggestionsConfig(showSuggestions, maxSuggestionsPerError, showExamples), null, // errorGrouping
138+
// - use default
139+
summaryConfig);
150140
}
151141

152142
/**

‎src/main/java/com/dataliquid/maven/asciidoc/mojo/ValidateMojo.java‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@
2424

2525
import com.dataliquid.maven.asciidoc.model.ValidationError;
2626
import com.dataliquid.maven.asciidoc.util.MetadataCollector;
27-
import com.fasterxml.jackson.databind.JsonNode;
28-
import com.fasterxml.jackson.databind.ObjectMapper;
2927
import com.networknt.schema.Schema;
28+
29+
import tools.jackson.databind.JsonNode;
30+
import tools.jackson.databind.json.JsonMapper;
3031
import com.networknt.schema.SchemaRegistry;
3132
import com.networknt.schema.SpecificationVersion;
3233

@@ -52,7 +53,7 @@ public class ValidateMojo extends AbstractAsciiDocMojo {
5253
@Parameter(property = "asciidoc.metadataExportFile")
5354
private File metadataExportFile;
5455

55-
private final ObjectMapper objectMapper = new ObjectMapper();
56+
private final JsonMapper jsonMapper = new JsonMapper();
5657
private final MetadataCollector metadataCollector = new MetadataCollector();
5758

5859
@Override
@@ -77,9 +78,7 @@ protected void processFiles(List<Path> adocFiles) throws MojoExecutionException,
7778
// Log collected metadata in debug mode
7879
if (getLog().isDebugEnabled()) {
7980
try {
80-
String prettyJson = objectMapper
81-
.writerWithDefaultPrettyPrinter()
82-
.writeValueAsString(allMetadata);
81+
String prettyJson = jsonMapper.writerWithDefaultPrettyPrinter().writeValueAsString(allMetadata);
8382
getLog().debug("Collected metadata for " + relativePath + ":\n" + prettyJson);
8483
} catch (Exception e) {
8584
getLog().debug("Failed to serialize metadata for logging: " + e.getMessage());
@@ -127,7 +126,7 @@ private Schema loadSchema(File schemaFileToLoad) throws IOException, MojoExecuti
127126

128127
// Load schema from file
129128
String schemaContent = Files.readString(schemaFileToLoad.toPath());
130-
JsonNode schemaNode = objectMapper.readTree(schemaContent);
129+
JsonNode schemaNode = jsonMapper.readTree(schemaContent);
131130

132131
return registry.getSchema(schemaNode);
133132

@@ -228,7 +227,7 @@ private List<ValidationError> validate() {
228227

229228
// Convert metadata to JSON
230229
Map<String, Object> metadataJson = metadataCollector.toJson();
231-
JsonNode metadataNode = objectMapper.valueToTree(metadataJson);
230+
JsonNode metadataNode = jsonMapper.valueToTree(metadataJson);
232231

233232
// Validate against schema - returns List<Error> in 2.0.0
234233
List<com.networknt.schema.Error> validationErrors = schema.validate(metadataNode);
@@ -263,7 +262,7 @@ private void exportMetadata() throws IOException {
263262
Map<String, Object> metadataJson = metadataCollector.toJson();
264263

265264
// Write pretty-printed JSON to file
266-
String jsonOutput = objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(metadataJson);
265+
String jsonOutput = jsonMapper.writerWithDefaultPrettyPrinter().writeValueAsString(metadataJson);
267266

268267
Files.writeString(metadataExportFile.toPath(), jsonOutput);
269268

‎src/main/java/com/dataliquid/maven/asciidoc/parser/FrontMatterParser.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
import org.apache.maven.plugin.logging.Log;
77
import org.apache.maven.plugin.logging.SystemStreamLog;
88

9-
import com.fasterxml.jackson.core.type.TypeReference;
10-
import com.fasterxml.jackson.databind.ObjectMapper;
11-
import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
9+
import tools.jackson.core.type.TypeReference;
10+
import tools.jackson.databind.json.JsonMapper;
11+
import tools.jackson.dataformat.yaml.YAMLMapper;
1212

1313
@SuppressWarnings("PMD.GuardLogStatement")
1414
public class FrontMatterParser {
1515

16-
private final ObjectMapper yamlMapper = new ObjectMapper(new YAMLFactory());
17-
private final ObjectMapper jsonMapper = new ObjectMapper();
16+
private final YAMLMapper yamlMapper = new YAMLMapper();
17+
private final JsonMapper jsonMapper = new JsonMapper();
1818
private final Log log;
1919

2020
public FrontMatterParser() {

0 commit comments

Comments
 (0)