Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update dependencies #26

Merged
merged 2 commits into from
Dec 13, 2023
Merged

Update dependencies #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
019384b
Update dependencies
cstamas Dec 11, 2023
daa7bd9
nullcheck
cstamas Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ limitations under the License.
<parent>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus</artifactId>
<version>13</version>
<version>16</version>
</parent>

<artifactId>plexus-xml</artifactId>
Expand Down Expand Up @@ -55,7 +55,7 @@ limitations under the License.
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-xml-impl</artifactId>
<version>4.0.0-alpha-7</version>
<version>4.0.0-alpha-8</version>
<exclusions>
<exclusion>
<groupId>org.eclipse.sisu</groupId>
Expand All @@ -66,26 +66,20 @@ limitations under the License.
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<version>1.36</version>
<version>1.37</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-generator-annprocess</artifactId>
<version>1.36</version>
<version>1.37</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest</artifactId>
<version>2.2</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
Expand Down
16 changes: 8 additions & 8 deletions src/test/java/org/codehaus/plexus/util/xml/pull/MXParserTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,6 @@
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.ValueSource;

import static org.hamcrest.MatcherAssert.*;
import static org.hamcrest.Matchers.*;
import static org.junit.jupiter.api.Assertions.*;

/**
Expand Down Expand Up @@ -1485,14 +1483,16 @@ void testBlankAtBeginning(String ws) throws XmlPullParserException, IOException

MXParser parser = new MXParser();
parser.setInput(new StringReader(ws + xml));
assertThat(
assertThrows(XmlPullParserException.class, parser::next).getMessage(),
containsString("XMLDecl is only allowed as first characters in input"));

String message;
message = assertThrows(XmlPullParserException.class, parser::next).getMessage();
assertNotNull(message);
assertTrue(message.contains("XMLDecl is only allowed as first characters in input"), message);

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