Skip to content

Commit aa82ed3

Browse files
authored
Update dependencies (#26)
* Update dependencies Changes: * parent POM to 16 * remove sole use of hamcrest * jmh update * nullcheck
1 parent 7bfeb09 commit aa82ed3

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

pom.xml

+4-10
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020
<parent>
2121
<groupId>org.codehaus.plexus</groupId>
2222
<artifactId>plexus</artifactId>
23-
<version>13</version>
23+
<version>16</version>
2424
</parent>
2525

2626
<artifactId>plexus-xml</artifactId>
@@ -55,7 +55,7 @@ limitations under the License.
5555
<dependency>
5656
<groupId>org.apache.maven</groupId>
5757
<artifactId>maven-xml-impl</artifactId>
58-
<version>4.0.0-alpha-7</version>
58+
<version>4.0.0-alpha-8</version>
5959
<exclusions>
6060
<exclusion>
6161
<groupId>org.eclipse.sisu</groupId>
@@ -66,26 +66,20 @@ limitations under the License.
6666
<dependency>
6767
<groupId>org.openjdk.jmh</groupId>
6868
<artifactId>jmh-core</artifactId>
69-
<version>1.36</version>
69+
<version>1.37</version>
7070
<scope>test</scope>
7171
</dependency>
7272
<dependency>
7373
<groupId>org.openjdk.jmh</groupId>
7474
<artifactId>jmh-generator-annprocess</artifactId>
75-
<version>1.36</version>
75+
<version>1.37</version>
7676
<scope>test</scope>
7777
</dependency>
7878
<dependency>
7979
<groupId>org.junit.jupiter</groupId>
8080
<artifactId>junit-jupiter</artifactId>
8181
<scope>test</scope>
8282
</dependency>
83-
<dependency>
84-
<groupId>org.hamcrest</groupId>
85-
<artifactId>hamcrest</artifactId>
86-
<version>2.2</version>
87-
<scope>test</scope>
88-
</dependency>
8983
<dependency>
9084
<groupId>org.codehaus.plexus</groupId>
9185
<artifactId>plexus-utils</artifactId>

src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@
3333
import org.junit.jupiter.params.ParameterizedTest;
3434
import org.junit.jupiter.params.provider.ValueSource;
3535

36-
import static org.hamcrest.MatcherAssert.*;
37-
import static org.hamcrest.Matchers.*;
3836
import static org.junit.jupiter.api.Assertions.*;
3937

4038
/**
@@ -1485,14 +1483,16 @@ void testBlankAtBeginning(String ws) throws XmlPullParserException, IOException
14851483

14861484
MXParser parser = new MXParser();
14871485
parser.setInput(new StringReader(ws + xml));
1488-
assertThat(
1489-
assertThrows(XmlPullParserException.class, parser::next).getMessage(),
1490-
containsString("XMLDecl is only allowed as first characters in input"));
1486+
1487+
String message;
1488+
message = assertThrows(XmlPullParserException.class, parser::next).getMessage();
1489+
assertNotNull(message);
1490+
assertTrue(message.contains("XMLDecl is only allowed as first characters in input"), message);
14911491

14921492
parser.setInput(new StringReader(ws + xml));
14931493
assertEquals(XmlPullParser.IGNORABLE_WHITESPACE, parser.nextToken());
1494-
assertThat(
1495-
assertThrows(XmlPullParserException.class, parser::nextToken).getMessage(),
1496-
containsString("processing instruction can not have PITarget with reserved xml name"));
1494+
message = assertThrows(XmlPullParserException.class, parser::nextToken).getMessage();
1495+
assertNotNull(message);
1496+
assertTrue(message.contains("processing instruction can not have PITarget with reserved xml name"), message);
14971497
}
14981498
}

0 commit comments

Comments
 (0)