diff --git a/acme4j-client/src/main/java/org/shredzone/acme4j/Session.java b/acme4j-client/src/main/java/org/shredzone/acme4j/Session.java index b0efed2f..97efb3e7 100644 --- a/acme4j-client/src/main/java/org/shredzone/acme4j/Session.java +++ b/acme4j-client/src/main/java/org/shredzone/acme4j/Session.java @@ -162,27 +162,6 @@ public class Session { this.locale = locale != null ? locale : Locale.getDefault(); } - /** - * Gets the {@link Proxy} to be used for connections. - * - * @deprecated Use {@code networkSettings().getProxy()} - */ - @Deprecated - public Proxy getProxy() { - return networkSettings.getProxy(); - } - - /** - * Sets a {@link Proxy} that is to be used for all connections. If {@code null}, - * {@link Proxy#NO_PROXY} is used, which is also the default. - * - * @deprecated Use {@code networkSettings().setProxy(Proxy)} - */ - @Deprecated - public void setProxy(@Nullable Proxy proxy) { - networkSettings.setProxy(proxy); - } - /** * Returns the current {@link NetworkSettings}. * diff --git a/acme4j-smime/src/main/java/org/shredzone/acme4j/smime/email/EmailProcessor.java b/acme4j-smime/src/main/java/org/shredzone/acme4j/smime/email/EmailProcessor.java index abb73898..c7f11a74 100644 --- a/acme4j-smime/src/main/java/org/shredzone/acme4j/smime/email/EmailProcessor.java +++ b/acme4j-smime/src/main/java/org/shredzone/acme4j/smime/email/EmailProcessor.java @@ -107,43 +107,6 @@ public final class EmailProcessor { return new Builder(); } - /** - * Performs an S/MIME validation and processes the given e-mail message. - *

- * The owner of the given certificate must be the sender of that email. - * - * @param message - * E-mail that was received from the CA. - * @param mailSession - * A {@link Session} that can be used for processing inner e-mails. - * @param signCert - * The signing certificate of the sender. - * @param strict - * If {@code true}, the S/MIME protected headers "From", "To", and "Subject" - * must match the headers of the received message. If {@code false}, - * only the S/MIME protected headers are used, and the headers of the received - * message are ignored. - * @return EmailProcessor for this e-mail - * @throws AcmeInvalidMessageException - * if a validation failed, and the message must be rejected. - * @since 2.15 - * @deprecated Use {@link #signedMessage(Message)} or {@link #builder()} instead. - */ - @Deprecated - public static EmailProcessor smimeMessage(Message message, Session mailSession, - X509Certificate signCert, boolean strict) - throws AcmeInvalidMessageException { - var builder = builder() - .mailSession(mailSession) - .certificate(signCert); - if (strict) { - builder.strict(); - } else { - builder.relaxed(); - } - return builder.build(message); - } - /** * Creates a new {@link EmailProcessor} for the incoming "Challenge" message. *

diff --git a/src/doc/docs/migration.md b/src/doc/docs/migration.md index 86034b14..85649dca 100644 --- a/src/doc/docs/migration.md +++ b/src/doc/docs/migration.md @@ -5,6 +5,7 @@ This document will help you migrate your code to the latest _acme4j_ version. ## Migration to Version 3.0.0 - Starting with _acme4j_ v3, we will require the smallest Java SE LTS version that is still receiving premier support according to the [Oracle Java SE Support Roadmap](https://www.oracle.com/java/technologies/java-se-support-roadmap.html). At the moment of writing, these are Java 11 and Java 17, so _acme4j_ requires Java 11 starting from now. With the prospected release of Java 21 (LTS) in September 2023, we will start to require Java 17, and so on. If you still need Java 8, you can use _acme4j_ v2, which will receive bugfixes until September 2023. +- All deprecated methods have been removed. ## Migration to Version 2.16