QPID-8663: [Broker-J] AESKeyFileEncrypter deprecated since 9.2.0

apache · Jan 30, 2024 · 68dc0f7 · 68dc0f7
1 parent 2f4dd51
commit 68dc0f7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/...er-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypter.java b/...er-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/.../src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java b/.../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/.../test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java b/.../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/...ore/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterTest.java b/...ore/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();