From 68dc0f7b1592c7a53c55a0f0f0063387fbaf3122 Mon Sep 17 00:00:00 2001 From: Tomas Vavricka Date: Tue, 30 Jan 2024 14:24:44 +0100 Subject: [PATCH] QPID-8663: [Broker-J] AESKeyFileEncrypter deprecated since 9.2.0 --- .../qpid/server/security/encryption/AESKeyFileEncrypter.java | 2 +- .../security/encryption/AESKeyFileEncrypterFactory.java | 2 +- .../security/encryption/AESKeyFileEncrypterFactoryTest.java | 4 ++++ .../server/security/encryption/AESKeyFileEncrypterTest.java | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypter.java b/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypter.java index ad45a3cf3e..9e02cf5774 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypter.java +++ b/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypter.java @@ -39,7 +39,7 @@ /** * Class is deprecated in favor of AESGCMKeyFileEncrypter, it will be deleted in one of the next releases */ -@Deprecated(since = "9.1.1", forRemoval = true) +@Deprecated(since = "9.2.0", forRemoval = true) class AESKeyFileEncrypter implements ConfigurationSecretEncrypter { private static final String CIPHER_NAME = "AES/CBC/PKCS5Padding"; diff --git a/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java b/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java index 6dd0b25447..cf48249504 100644 --- a/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java +++ b/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java @@ -28,7 +28,7 @@ * Class is deprecated in favor of AESGCMKeyFileEncrypterFactory, it will be deleted in one of the next releases */ @PluggableService -@Deprecated(since = "9.1.1", forRemoval = true) +@Deprecated(since = "9.2.0", forRemoval = true) public class AESKeyFileEncrypterFactory extends AbstractAESKeyFileEncrypterFactory { public static final String TYPE = "AESKeyFile"; diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java index f293e058d5..4e8f5aedf1 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java +++ b/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java @@ -34,6 +34,10 @@ import org.apache.qpid.test.utils.UnitTestBase; +/** + * Unit test is deprecated due to deprecation of AESKeyFileEncrypterFactory, it will be deleted in one of the next releases + */ +@Deprecated(since = "9.2.0", forRemoval = true) public class AESKeyFileEncrypterFactoryTest extends UnitTestBase { private AESKeyFileEncrypterFactory _factory; diff --git a/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterTest.java b/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterTest.java index 9162201cc3..6e732c0954 100644 --- a/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterTest.java +++ b/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterTest.java @@ -43,9 +43,9 @@ import org.apache.qpid.test.utils.UnitTestBase; /** - * Unit test is deprecated due to deprecation of AESGCMKeyFileEncrypter, it will be deleted in one of the next releases + * Unit test is deprecated due to deprecation of AESKeyFileEncrypter, it will be deleted in one of the next releases */ -@Deprecated(since = "9.1.1", forRemoval = true) +@Deprecated(since = "9.2.0", forRemoval = true) public class AESKeyFileEncrypterTest extends UnitTestBase { private final SecureRandom _random = new SecureRandom();