Skip to content

Commit 74a87f6

Browse files
slawekjaranowskimichael-o
slawekjaranowski
and
michael-o
authored
[MINVOKER-351] Escape special xml character in junit report (#242)
--------- Co-authored-by: Michael Osipov <[email protected]>
1 parent 0e572a9 commit 74a87f6

File tree

6 files changed

+212
-0
lines changed

6 files changed

+212
-0
lines changed

‎pom.xml

+13
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,12 @@ under the License.
145145
<version>${mavenVersion}</version>
146146
<scope>provided</scope>
147147
</dependency>
148+
<dependency>
149+
<groupId>org.apache.maven.resolver</groupId>
150+
<artifactId>maven-resolver-api</artifactId>
151+
<version>1.4.1</version>
152+
<scope>provided</scope>
153+
</dependency>
148154
<dependency>
149155
<groupId>org.apache.maven.resolver</groupId>
150156
<artifactId>maven-resolver-util</artifactId>
@@ -205,6 +211,11 @@ under the License.
205211
<artifactId>maven-script-interpreter</artifactId>
206212
<version>1.6</version>
207213
</dependency>
214+
<dependency>
215+
<groupId>org.slf4j</groupId>
216+
<artifactId>slf4j-api</artifactId>
217+
<version>1.7.36</version>
218+
</dependency>
208219

209220
<dependency>
210221
<groupId>${beanshell-groupId}</groupId>
@@ -236,6 +247,8 @@ under the License.
236247
<dependency>
237248
<groupId>org.codehaus.plexus</groupId>
238249
<artifactId>plexus-xml</artifactId>
250+
<!-- TODO check with next parent -->
251+
<version>3.0.1</version>
239252
</dependency>
240253
<dependency>
241254
<groupId>org.codehaus.plexus</groupId>

‎src/it/MINVOKER-351/invoker.properties

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
invoker.goals.1 = initialize
19+
invoker.buildResult.1 = failure
20+
21+
invoker.goals.2 = site

‎src/it/MINVOKER-351/pom.xml

+92
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
-->
21+
22+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
24+
<modelVersion>4.0.0</modelVersion>
25+
26+
<groupId>example.minvoker351</groupId>
27+
<artifactId>minvoker-351</artifactId>
28+
<version>1.0-SNAPSHOT</version>
29+
<packaging>pom</packaging>
30+
31+
<description>Special XML chars in build-job, junit reports</description>
32+
33+
<properties>
34+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
35+
<version.maven-compiler-plugin>@version.maven-compiler-plugin@</version.maven-compiler-plugin>
36+
<version.maven-surefire>@version.maven-surefire@</version.maven-surefire>
37+
</properties>
38+
39+
<build>
40+
<plugins>
41+
<plugin>
42+
<groupId>org.apache.maven.plugins</groupId>
43+
<artifactId>maven-site-plugin</artifactId>
44+
<version>@version.maven-site-plugin@</version>
45+
</plugin>
46+
<plugin>
47+
<groupId>org.apache.maven.plugins</groupId>
48+
<artifactId>maven-invoker-plugin</artifactId>
49+
<version>@project.version@</version>
50+
<configuration>
51+
<cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
52+
<localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
53+
<writeJunitReport>true</writeJunitReport>
54+
</configuration>
55+
<executions>
56+
<execution>
57+
<id>integration-test</id>
58+
<phase>initialize</phase>
59+
<goals>
60+
<goal>install</goal>
61+
<goal>run</goal>
62+
</goals>
63+
</execution>
64+
</executions>
65+
</plugin>
66+
</plugins>
67+
</build>
68+
69+
<!-- Run "mvn site" to see failure due to invalid XML characters -->
70+
<reporting>
71+
<excludeDefaults>true</excludeDefaults>
72+
<plugins>
73+
<plugin>
74+
<groupId>org.apache.maven.plugins</groupId>
75+
<artifactId>maven-surefire-report-plugin</artifactId>
76+
<version>${version.maven-surefire}</version>
77+
<configuration>
78+
<reportsDirectories>
79+
<reportsDirectory>${project.build.directory}/invoker-reports-test</reportsDirectory>
80+
</reportsDirectories>
81+
</configuration>
82+
<reportSets>
83+
<reportSet>
84+
<reports>
85+
<report>report-only</report>
86+
</reports>
87+
</reportSet>
88+
</reportSets>
89+
</plugin>
90+
</plugins>
91+
</reporting>
92+
</project>

‎src/it/MINVOKER-351/src/it/minvoker-351/pom.xml

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
-->
21+
22+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
23+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
24+
<modelVersion>4.0.0</modelVersion>
25+
26+
<groupId>example.minvoker351</groupId>
27+
<artifactId>minvoker-351</artifactId>
28+
<version>1.0-SNAPSHOT</version>
29+
<packaging>pom</packaging>
30+
31+
<properties>
32+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
33+
</properties>
34+
35+
</project>

‎src/it/MINVOKER-351/src/it/minvoker-351/postbuild.groovy

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
throw new Exception("Special chars \tcharName=" + Character.getName(7) + ": " + (char) 7)

‎src/it/MINVOKER-351/verify.groovy

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
/*
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
20+
// we have a special chars in build.log
21+
def buildLog = new File(basedir, 'target/it/minvoker-351/build.log').text
22+
buildLog.contains('Special chars \tcharName=BEL: \u0007')
23+
24+
def surefireReport = new File(basedir, 'target/site/surefire-report.html').text
25+
assert surefireReport.contains('maven.invoker.it.minvoker-351')
26+
27+
// TODO remove after next release
28+
// Due to error parsing junit-reports by Jenkins with forbidden chars
29+
new File(basedir, 'build.log').delete()
30+
31+
return true

0 commit comments

Comments
 (0)