Skip to content
Permalink
Browse files
Merge remote-tracking branch 'remotes/origin/master' into JENKINS-36472
# Conflicts:
#	src/main/resources/de/tracetronic/jenkins/plugins/ecutest/report/atx/ATXBuildAction/index.jelly
#	src/main/resources/de/tracetronic/jenkins/plugins/ecutest/report/generator/ReportGeneratorBuildAction/index.jelly
#	src/main/resources/de/tracetronic/jenkins/plugins/ecutest/report/log/ETLogBuildAction/index.jelly
#	src/main/resources/de/tracetronic/jenkins/plugins/ecutest/report/trf/TRFBuildAction/index.jelly
  • Loading branch information
cpoenisch committed Jul 21, 2016
2 parents d91c999 + aa0c9eb commit 09041cfc02caa9427c1075d7a997008b917ca440
@@ -61,7 +61,7 @@
/**
* Defines the TEST-GUIDE version that the provided ATX configuration is based on.
*/
public static final ToolVersion ATX_VERSION = new ToolVersion(1, 30, 0, 0);
public static final ToolVersion ATX_VERSION = new ToolVersion(1, 33, 0, 0);

/**
* Helper class to easily compare tool versions defined by major, minor, micro and qualifier version. Mainly used to
@@ -421,16 +421,38 @@
<INITIAL-LANGUAGE xsi:type="unicode">de_DE</INITIAL-LANGUAGE>
</DESCRIPTION>
</SETTING>
<SETTING name="captureSubPackageOnVerdict" default=""
xsi:type="reportConfigItem">
<DESCRIPTION xsi:type="I18NItem">
<MULTILANGDATA>
<ELEMENT dkey="de_DE">
<DVALUE xsi:type="unicode">Legt fest bei welchen Ergebnissen der
SubPackages deren TestSteps mit erfasst werden sollen. Beispiel:
FAILED; ERROR
</DVALUE>
</ELEMENT>
<ELEMENT dkey="en_US">
<DVALUE xsi:type="unicode">Defines the results of the sub packages on
which the test steps have to be recorded. Example: FAILED; ERROR
</DVALUE>
</ELEMENT>
</MULTILANGDATA>
<INITIAL-LANGUAGE xsi:type="unicode">de_DE</INITIAL-LANGUAGE>
</DESCRIPTION>
</SETTING>
<SETTING name="includeResourceAdapterInfo" default="True"
xsi:type="reportConfigItem">
<DESCRIPTION xsi:type="I18NItem">
<MULTILANGDATA>
<ELEMENT dkey="de_DE">
<DVALUE xsi:type="unicode">True, wenn die ResourceAdapter Informationen als
ATX-Konstanten erfasst werden sollen, sonst False.</DVALUE>
<DVALUE xsi:type="unicode">True, wenn die ResourceAdapter
Informationen als
ATX-Konstanten erfasst werden sollen, sonst
False.</DVALUE>
</ELEMENT>
<ELEMENT dkey="en_US">
<DVALUE xsi:type="unicode">True, if the ResourceAdapter info should be
<DVALUE xsi:type="unicode">True, if the ResourceAdapter info should
be
recorded as ATX constant, otherwise False.</DVALUE>
</ELEMENT>
</MULTILANGDATA>

0 comments on commit 09041cf

Please sign in to comment.