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

Revert commons-io to 2.11.0 #826

Merged
merged 3 commits into from
Oct 10, 2023
Merged

Revert commons-io to 2.11.0 #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85f3f94
Revert "Replaced deprecated and now broken `ReaderInputStream` constr…
uhafner Oct 10, 2023
ffc445c
Revert commons-io to 2.11.0.
uhafner Oct 10, 2023
51c8802
Remove PMD rule `LocalVariableNamingConventions`.
uhafner Oct 10, 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
1 change: 1 addition & 0 deletions etc/pmd-configuration.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
<exclude name="OnlyOneReturn"/>
<exclude name="EmptyMethodInAbstractClassShouldBeAbstract"/>
<exclude name="ConfusingTernary"/>
<exclude name="LocalVariableNamingConventions"/>
<exclude name="ClassNamingConventions"/>
</rule>
<rule ref="category/java/codestyle.xml/UnnecessaryConstructor">
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
<!-- Project Dependencies Configuration -->
<spotbugs.version>4.7.3</spotbugs.version>
<commons.lang.version>3.13.0</commons.lang.version>
<commons.io.version>2.14.0</commons.io.version>
<commons.io.version>2.11.0</commons.io.version>
<javax.annotation-api.version>1.3.2</javax.annotation-api.version>
<byte-buddy.version>1.14.8</byte-buddy.version>

Expand Down
5 changes: 2 additions & 3 deletions src/main/java/edu/hm/hafner/util/SecureXmlParserFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,8 @@ public Document readDocument(final Reader reader, final Charset charset) {
}
}

private InputSource createInputSource(final Reader reader, final Charset charset) throws IOException {
var inputStream = ReaderInputStream.builder().setCharset(charset).setReader(reader).get();
return new InputSource(inputStream);
private InputSource createInputSource(final Reader reader, final Charset charset) {
return new InputSource(new ReaderInputStream(reader, charset));
}

/**
Expand Down
Loading