From 19bd3f4c044750beb7d0d47550a8bda07988daa0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Nov 2023 09:40:24 +0000 Subject: [PATCH 1/2] Bump commons-io:commons-io from 2.6 to 2.7 in /pass-deposit-services Bumps commons-io:commons-io from 2.6 to 2.7. --- updated-dependencies: - dependency-name: commons-io:commons-io dependency-type: direct:development ... Signed-off-by: dependabot[bot] --- pass-deposit-services/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pass-deposit-services/pom.xml b/pass-deposit-services/pom.xml index 8b65e0d0..2fb5cde3 100644 --- a/pass-deposit-services/pom.xml +++ b/pass-deposit-services/pom.xml @@ -68,7 +68,7 @@ 1.4.12 3.9.0 1.21 - 2.6 + 2.7 23.5-jre 2.3.0 1.4.20 From c66ee749250f6f9fc681bca3e4164c5f896ce5ba Mon Sep 17 00:00:00 2001 From: Russ Poetker Date: Mon, 11 Dec 2023 09:56:52 -0500 Subject: [PATCH 2/2] Fix method scope issue --- .../org/apache/commons/io/input/ContentLengthObserver.java | 6 +++--- .../java/org/apache/commons/io/input/DigestObserver.java | 6 +++--- .../apache/commons/io/input/ResourceBuilderObserver.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pass-deposit-services/deposit-core/src/main/java/org/apache/commons/io/input/ContentLengthObserver.java b/pass-deposit-services/deposit-core/src/main/java/org/apache/commons/io/input/ContentLengthObserver.java index 37ddaa24..b7976afc 100644 --- a/pass-deposit-services/deposit-core/src/main/java/org/apache/commons/io/input/ContentLengthObserver.java +++ b/pass-deposit-services/deposit-core/src/main/java/org/apache/commons/io/input/ContentLengthObserver.java @@ -33,17 +33,17 @@ public ContentLengthObserver(ResourceBuilder builder) { } @Override - void data(int pByte) throws IOException { + public void data(int pByte) throws IOException { length++; } @Override - void data(byte[] pBuffer, int pOffset, int pLength) throws IOException { + public void data(byte[] pBuffer, int pOffset, int pLength) throws IOException { length += pLength; } @Override - void finished() throws IOException { + public void finished() throws IOException { if (!isFinished()) { builder.sizeBytes(this.length); } diff --git a/pass-deposit-services/deposit-core/src/main/java/org/apache/commons/io/input/DigestObserver.java b/pass-deposit-services/deposit-core/src/main/java/org/apache/commons/io/input/DigestObserver.java index d772f4af..e1e2ae63 100644 --- a/pass-deposit-services/deposit-core/src/main/java/org/apache/commons/io/input/DigestObserver.java +++ b/pass-deposit-services/deposit-core/src/main/java/org/apache/commons/io/input/DigestObserver.java @@ -65,17 +65,17 @@ public DigestObserver(ResourceBuilder builder, Checksum.OPTS algorithm) { } @Override - void data(int pByte) throws IOException { + public void data(int pByte) throws IOException { digest.update((byte) pByte); } @Override - void data(byte[] pBuffer, int pOffset, int pLength) throws IOException { + public void data(byte[] pBuffer, int pOffset, int pLength) throws IOException { digest.update(pBuffer, pOffset, pLength); } @Override - void finished() throws IOException { + public void finished() throws IOException { if (!isFinished()) { byte[] value = this.digest.digest(); builder.checksum(new ChecksumImpl(algo, value, getEncoder().encodeToString(value), encodeHexString(value))); diff --git a/pass-deposit-services/deposit-core/src/main/java/org/apache/commons/io/input/ResourceBuilderObserver.java b/pass-deposit-services/deposit-core/src/main/java/org/apache/commons/io/input/ResourceBuilderObserver.java index b1655676..cb027c29 100644 --- a/pass-deposit-services/deposit-core/src/main/java/org/apache/commons/io/input/ResourceBuilderObserver.java +++ b/pass-deposit-services/deposit-core/src/main/java/org/apache/commons/io/input/ResourceBuilderObserver.java @@ -43,7 +43,7 @@ public boolean isFinished() { } @Override - void finished() throws IOException { + public void finished() throws IOException { this.finished = true; } } \ No newline at end of file