diff --git a/README.md b/README.md index 5f0ba59..5e5839d 100644 --- a/README.md +++ b/README.md @@ -124,7 +124,7 @@ The maven groupId, artifactId and version, this plugin is in the **Maven Central ```xml io.github.vdaburon junit-reporter-kpi-from-jmeter-report-csv -1.5 +1.6 ``` Just include the plugin in your `pom.xml` and execute `mvn verify`
or individual launch `mvn -DjmeterReportFile=synthesis.csv -DkpiFile=kpi.csv -DjunitFile=jmeter-junit-plugin-jmreport.xml exec:java@create_junit-report-kpi-from-jmeter-report` @@ -142,7 +142,7 @@ or individual launch `mvn -DjmeterReportFile=synthesis.csv -DkpiFile=kpi.csv -Dj io.github.vdaburon junit-reporter-kpi-from-jmeter-report-csv - 1.5 + 1.6 @@ -204,6 +204,8 @@ junit-reporter-kpi-from-jmeter-report-csv.sh -csvJMReport summary.csv -kpiFile k Usually this plugin is use with [jmeter-graph-tool-maven-plugin](https://github.com/vdaburon/jmeter-graph-tool-maven-plugin) ## Versions +version 1.6 change the default freemaker directory for html_templates because same directory and same files name than others tools junit-report-kpi-xxx generate errors + version 1.5 add jmeter-plugins.org installer version 1.4 export result in html, json or csv format diff --git a/pom.xml b/pom.xml index d80b5dd..d3c95b3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ io.github.vdaburon junit-reporter-kpi-from-jmeter-report-csv - 1.5 + 1.6 jar Create a JUnit XML file with KPI rules from JMeter CSV Report A tool that creates a JUnit XML file with KPI rules from JMeter CSV Report, export result in html, csv or json format @@ -61,6 +61,7 @@ 1.8 1.8 UTF-8 + false @@ -184,7 +185,7 @@ ossrh https://s01.oss.sonatype.org/ - false + ${mavenCentralAutoReleaseAfterClose} diff --git a/src/main/java/io/github/vdaburon/jmeter/utils/reportkpi/JUnitReportFromJMReportCsv.java b/src/main/java/io/github/vdaburon/jmeter/utils/reportkpi/JUnitReportFromJMReportCsv.java index d1772ef..2d1a0c5 100644 --- a/src/main/java/io/github/vdaburon/jmeter/utils/reportkpi/JUnitReportFromJMReportCsv.java +++ b/src/main/java/io/github/vdaburon/jmeter/utils/reportkpi/JUnitReportFromJMReportCsv.java @@ -64,7 +64,7 @@ public class JUnitReportFromJMReportCsv { public static final String K_CSV_JMREPORT_COL_LABEL_DEFAULT = "Label"; // Freemarker Html Template - public static final String K_FREEMARKER_HTML_TEMPLATE_DIRECTORY = "/templates_freemarker"; + public static final String K_FREEMARKER_HTML_TEMPLATE_DIRECTORY = "/templates_freemarker_reportkpi"; public static final String K_FREEMARKER_HTML_TEMPLATE = "template_html_result.ftl"; public static final String K_FREEMARKER_DIV_HTML_TEMPLATE = "template_div_result.ftl"; diff --git a/src/main/resources/templates_freemarker/template_div_result.ftl b/src/main/resources/templates_freemarker_reportkpi/template_div_result.ftl similarity index 100% rename from src/main/resources/templates_freemarker/template_div_result.ftl rename to src/main/resources/templates_freemarker_reportkpi/template_div_result.ftl diff --git a/src/main/resources/templates_freemarker/template_html_result.ftl b/src/main/resources/templates_freemarker_reportkpi/template_html_result.ftl similarity index 100% rename from src/main/resources/templates_freemarker/template_html_result.ftl rename to src/main/resources/templates_freemarker_reportkpi/template_html_result.ftl