Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,8 @@ else if (targetLocation.startsWith(JAR_PREFIX)) {
// Begin new entry
String entryName = zipEntryPrefix + aRelativePath + aExtension
+ compression.getExtension();
if (Paths.get(entryName).normalize().startsWith("..")) {
if (entryName.contains("..") || entryName.startsWith("/") || entryName.startsWith("\\")
|| Paths.get(entryName).isAbsolute()) {
throw new IOException(
"ZIP entry name [" + entryName + "] would escape archive root");
}
Expand Down
2 changes: 0 additions & 2 deletions dkpro-core-asl/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,6 @@
<module>../dkpro-core-api-ner-asl</module>
<module>../dkpro-core-api-frequency-asl</module>
<module>../dkpro-core-api-xml-asl</module>
<!-- FS modules -->
<module>../dkpro-core-fs-hdfs-asl</module>
<!-- IO modules -->
<module>../dkpro-core-io-aclanthology-asl</module>
<module>../dkpro-core-io-ancora-asl</module>
Expand Down
17 changes: 0 additions & 17 deletions dkpro-core-build/src/main/resources/dkpro-core/version-rules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -89,23 +89,6 @@
</ignoreVersions>
</rule>

<!--
PIN: Hadoop 3.4.x
Hadoop 3.5 bumps the bundled Jetty to a version that enforces stricter
QueuedThreadPool budgets, which breaks MiniDFSCluster startup in
HdfsResourceLoaderLocatorTest with "Insufficient configured threads".
Revisit once Hadoop ships a release where MiniDFSCluster sizes its
embedded HTTP server appropriately for newer Jetty.
-->
<rule groupId="org.apache.hadoop" comparisonMethod="maven">
<ignoreVersions>
<ignoreVersion type="regex">^3\.[5-9].*</ignoreVersion>
<ignoreVersion type="regex">^3\.[1-9][0-9]+.*</ignoreVersion>
<ignoreVersion type="regex">^[4-9].*</ignoreVersion>
<ignoreVersion type="regex">^[1-9][0-9]+.*</ignoreVersion>
</ignoreVersions>
</rule>

<!--
PIN: com.sun.xml.bind:jaxb-core / jaxb-impl 2.x
The 2.x line is the last to implement the javax.xml.bind API; 3.x+ ships
Expand Down
2 changes: 0 additions & 2 deletions dkpro-core-doc/src/main/asciidoc/developer-guide/modules.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,6 @@ need to be prefixed with `../`.
<module>../dkpro-core-api-anomaly-asl</module>
<module>../dkpro-core-api-coref-asl</module>
...
<!-- FS modules -->
<module>../dkpro-core-fs-hdfs-asl</module>
<!-- IO modules -->
<module>../dkpro-core-io-aclanthology-asl</module>
<module>../dkpro-core-io-ancora-asl</module>
Expand Down
202 changes: 0 additions & 202 deletions dkpro-core-fs-hdfs-asl/LICENSE.txt

This file was deleted.

Loading
Loading