diff --git a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java index 73eb7902c..ae9898964 100644 --- a/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java +++ b/modello-core/src/main/java/org/codehaus/modello/plugin/AbstractModelloGenerator.java @@ -294,6 +294,11 @@ protected BuildContext getBuildContext() protected Writer newWriter( Path path ) { Charset charset = getEncoding() != null ? Charset.forName( getEncoding() ) : Charset.defaultCharset(); + return newWriter( path, charset ); + } + + protected Writer newWriter( Path path, Charset charset ) + { return new CachingWriter( getBuildContext(), path, charset ); } diff --git a/modello-plugins/modello-plugin-jsonschema/src/main/java/org/codehaus/modello/plugin/jsonschema/JsonSchemaGenerator.java b/modello-plugins/modello-plugin-jsonschema/src/main/java/org/codehaus/modello/plugin/jsonschema/JsonSchemaGenerator.java index b08b34463..8fe9e63a0 100644 --- a/modello-plugins/modello-plugin-jsonschema/src/main/java/org/codehaus/modello/plugin/jsonschema/JsonSchemaGenerator.java +++ b/modello-plugins/modello-plugin-jsonschema/src/main/java/org/codehaus/modello/plugin/jsonschema/JsonSchemaGenerator.java @@ -24,6 +24,7 @@ import java.io.File; import java.io.IOException; +import java.nio.charset.StandardCharsets; import java.util.LinkedList; import java.util.List; import java.util.Properties; @@ -107,7 +108,7 @@ private void generateJsonSchema( Properties parameters ) .enable( JsonWriteFeature.QUOTE_FIELD_NAMES.mappedFeature() ) .enable( JsonWriteFeature.QUOTE_FIELD_NAMES.mappedFeature() ) .disable( JsonWriteFeature.WRITE_NUMBERS_AS_STRINGS.mappedFeature() ) - .createGenerator( newWriter( schemaFile.toPath() ) ); + .createGenerator( newWriter( schemaFile.toPath(), StandardCharsets.UTF_8 ) ); generator.useDefaultPrettyPrinter();