Skip to content

chore: remove commons-codec dependency from sigstore-java #1098

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

Open
vlsi wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: remove commons-codec dependency from sigstore-java #1098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions sigstore-cli/src/main/java/dev/sigstore/cli/Verify.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import static com.google.common.io.Files.asByteSource;

import com.google.common.hash.Hashing;
import com.google.common.io.BaseEncoding;
import dev.sigstore.KeylessVerifier;
import dev.sigstore.TrustedRootProvider;
import dev.sigstore.VerificationOptions;
Expand All @@ -30,7 +31,6 @@
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.concurrent.Callable;
import org.apache.commons.codec.binary.Hex;
import picocli.CommandLine.ArgGroup;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
Expand Down Expand Up @@ -117,7 +117,8 @@ static class Policy {
public Integer call() throws Exception {
byte[] digest;
if (artifact.startsWith(SHA256_PREFIX)) {
digest = Hex.decodeHex(artifact.substring(SHA256_PREFIX.length()));
digest =
BaseEncoding.base16().ignoreCase().decode(artifact.substring(SHA256_PREFIX.length()));
} else {
if (workingDirectory != null) {
artifact = workingDirectory.resolve(artifact).toString();
Expand Down
5 changes: 4 additions & 1 deletion sigstore-java/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ plugins {
description = "A Java client for signing and verifying using Sigstore"

dependencies {
constraints {
// Just in case third-party dependencies use it
implementation("commons-codec:commons-codec:1.20.0")
}
compileOnly("org.immutables:gson:2.10.1")
compileOnly("org.immutables:value-annotations:2.10.1")
annotationProcessor("org.immutables:value:2.10.1")
Expand All @@ -34,7 +38,6 @@ dependencies {
runtimeOnly("io.grpc:grpc-netty-shaded")
compileOnly("org.apache.tomcat:annotations-api:6.0.53") // java 9+ only

implementation("commons-codec:commons-codec:1.18.0")
implementation("com.google.code.gson:gson:2.13.2")
implementation("org.bouncycastle:bcutil-jdk18on:1.82")
implementation("org.bouncycastle:bcpkix-jdk18on:1.82")
Expand Down
Loading