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

Jump to bottom

Make allowed version of freemarker explicit #633

Merged
merged 1 commit into from
Nov 8, 2020
Merged

Make allowed version of freemarker explicit #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/core/src/main/java/org/apache/jmeter/report/dashboard/HtmlTemplateExporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ public void export(SampleContext context, File file,
addToContext(DATA_CTX_OVERALL_FILTER, configuration.getSampleFilter(), dataContext);

// Walk template directory to copy files and process templated ones
Configuration templateCfg = new Configuration(Configuration.getVersion());
Configuration templateCfg = new Configuration(Configuration.VERSION_2_3_30);
try {
templateCfg.setDirectoryForTemplateLoading(templateDirectory);
templateCfg.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
Expand Down
2 changes: 1 addition & 1 deletion src/core/src/main/java/org/apache/jmeter/util/TemplateUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ private TemplateUtil() {
}

private static Configuration init() {
Configuration templateConfiguration = new Configuration(Configuration.getVersion());
Configuration templateConfiguration = new Configuration(Configuration.VERSION_2_3_30);
templateConfiguration.setDefaultEncoding(StandardCharsets.UTF_8.name());
templateConfiguration.setInterpolationSyntax(Configuration.SQUARE_BRACKET_INTERPOLATION_SYNTAX);
templateConfiguration.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER);
Expand Down