Skip to content

Commit

Permalink
[MRRESOURCES-142] Bump commons-io from 2.13.0 to 2.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
slawekjaranowski committed Oct 10, 2023
1 parent 936941d commit 3a781a5
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 5 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ under the License.
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.13.0</version>
<version>2.14.0</version>
</dependency>
<dependency>
<groupId>org.apache.velocity</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -620,8 +620,10 @@ protected boolean copyResourceIfExists(File file, String relFileName, VelocityCo

if (source.exists() && !source.equals(file)) {
if (source == templateSource) {
try (DeferredFileOutputStream os =
new DeferredFileOutputStream(velocityFilterInMemoryThreshold, file)) {
try (DeferredFileOutputStream os = DeferredFileOutputStream.builder()
.setThreshold(velocityFilterInMemoryThreshold)
.setOutputFile(file)
.get()) {
try (Reader reader = getReader(source);
Writer writer = getWriter(os)) {
velocity.evaluate(context, writer, "", reader);
Expand Down Expand Up @@ -951,8 +953,10 @@ protected void processResourceBundles(ClassLoader classLoader, VelocityContext c

if (!copyResourceIfExists(f, projectResource, context)) {
if (doVelocity) {
try (DeferredFileOutputStream os =
new DeferredFileOutputStream(velocityFilterInMemoryThreshold, f)) {
try (DeferredFileOutputStream os = DeferredFileOutputStream.builder()
.setThreshold(velocityFilterInMemoryThreshold)
.setOutputFile(f)
.get()) {
try (Writer writer = bundle.getSourceEncoding() == null
? new OutputStreamWriter(os)
: new OutputStreamWriter(os, bundle.getSourceEncoding())) {
Expand Down

0 comments on commit 3a781a5

Please sign in to comment.