From 3306024fc8bf9372130deded8d8b029d9f8bdaab Mon Sep 17 00:00:00 2001 From: Carter Kozak Date: Wed, 15 May 2024 15:00:58 -0400 Subject: [PATCH 1/2] The default CAs are namespaced and accessed via a relative path This allows the `keystores` jar to be shaded without breaking functionality. --- .../java/com/palantir/conjure/java/config/ssl/DefaultCas.java | 2 +- .../palantir/conjure/java/config/ssl}/ca-certificates.crt | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename keystores/src/main/resources/{ => com/palantir/conjure/java/config/ssl}/ca-certificates.crt (100%) diff --git a/keystores/src/main/java/com/palantir/conjure/java/config/ssl/DefaultCas.java b/keystores/src/main/java/com/palantir/conjure/java/config/ssl/DefaultCas.java index 9733b8c0d..76f999e47 100644 --- a/keystores/src/main/java/com/palantir/conjure/java/config/ssl/DefaultCas.java +++ b/keystores/src/main/java/com/palantir/conjure/java/config/ssl/DefaultCas.java @@ -41,7 +41,7 @@ final class DefaultCas { /** * This is managed by an excavator. */ - private static final String CA_CERTIFICATES_CRT = "/ca-certificates.crt"; + private static final String CA_CERTIFICATES_CRT = "ca-certificates.crt"; private static final Supplier> TRUSTED_CERTIFICATES = Suppliers.memoize(DefaultCas::getTrustedCertificates); diff --git a/keystores/src/main/resources/ca-certificates.crt b/keystores/src/main/resources/com/palantir/conjure/java/config/ssl/ca-certificates.crt similarity index 100% rename from keystores/src/main/resources/ca-certificates.crt rename to keystores/src/main/resources/com/palantir/conjure/java/config/ssl/ca-certificates.crt From 246aef291ec4f49c9b20b911713f4a1371e521b7 Mon Sep 17 00:00:00 2001 From: svc-changelog Date: Wed, 15 May 2024 19:03:46 +0000 Subject: [PATCH 2/2] Add generated changelog entries --- changelog/@unreleased/pr-2906.v2.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 changelog/@unreleased/pr-2906.v2.yml diff --git a/changelog/@unreleased/pr-2906.v2.yml b/changelog/@unreleased/pr-2906.v2.yml new file mode 100644 index 000000000..7d3b91258 --- /dev/null +++ b/changelog/@unreleased/pr-2906.v2.yml @@ -0,0 +1,6 @@ +type: improvement +improvement: + description: The default CAs are namespaced and accessed via a relative path, allowing + the keystores library to be shaded + links: + - https://github.com/palantir/conjure-java-runtime/pull/2906