Skip to content

Commit af19cb7

Browse files
committed
[JENKINS-17309] Escape message texts that contain XML symbols.
1 parent 2e19448 commit af19cb7

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed
Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
<<<<<<< HEAD
1+
=\=\=\=\=\=\=
2+
<<<<<<<=HEAD
3+
>>>>>>>=branch 'master' of https\://github.com/habast/warnings-plugin.git
24
eclipse.preferences.version=1
35
encoding//src/main/java=ISO-8859-1
46
encoding//src/main/resources=ISO-8859-1
@@ -7,13 +9,3 @@ encoding//src/test/resources=ISO-8859-1
79
encoding//src/test/resources/hudson/plugins/warnings/parser/issue7178.txt=UTF-8
810
encoding//target/generated-sources/localizer=ISO-8859-1
911
encoding/<project>=ISO-8859-1
10-
=======
11-
eclipse.preferences.version=1
12-
encoding//src/main/java=ISO-8859-1
13-
encoding//src/main/resources=ISO-8859-1
14-
encoding//src/test/java=ISO-8859-1
15-
encoding//src/test/resources=ISO-8859-1
16-
encoding//src/test/resources/hudson/plugins/warnings/parser/issue7178.txt=UTF-8
17-
encoding//target/generated-sources/localizer=ISO-8859-1
18-
encoding/<project>=ISO-8859-1
19-
>>>>>>> branch 'master' of https://github.com/habast/warnings-plugin.git

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<dependency>
3737
<groupId>org.jvnet.hudson.plugins</groupId>
3838
<artifactId>analysis-core</artifactId>
39-
<version>1.50</version>
39+
<version>1.51</version>
4040
</dependency>
4141
<dependency>
4242
<groupId>org.jvnet.hudson.plugins</groupId>

src/test/java/hudson/plugins/warnings/parser/ParserTester.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
import java.io.Reader;
77
import java.io.UnsupportedEncodingException;
88

9+
import org.apache.commons.lang.StringEscapeUtils;
10+
911
import hudson.plugins.analysis.util.model.FileAnnotation;
1012
import hudson.plugins.analysis.util.model.Priority;
1113

@@ -38,7 +40,7 @@ protected void checkWarning(final FileAnnotation annotation, final int lineNumbe
3840
assertEquals("Wrong number of ranges detected.", 1, warning.getLineRanges().size());
3941
assertEquals("Wrong ranges start detected.", lineNumber, warning.getLineRanges().iterator().next().getStart());
4042
assertEquals("Wrong ranges end detected.", lineNumber, warning.getLineRanges().iterator().next().getEnd());
41-
assertEquals("Wrong message detected.", message, warning.getMessage());
43+
assertEquals("Wrong message detected.", StringEscapeUtils.escapeXml(message), warning.getMessage());
4244
assertEquals("Wrong filename detected.", fileName, warning.getFileName());
4345
}
4446

0 commit comments

Comments
 (0)