This is an automated email from the ASF dual-hosted git repository.
exceptionfactory pushed a commit to branch support/nifi-1.x
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/support/nifi-1.x by this push:
new 3e1824264c NIFI-13464 Replaced nifi-deprecation-log with logger in
Registry
3e1824264c is described below
commit 3e1824264cc08c7bc996e4d6c178f3e0e5f5ff15
Author: Pierre Villard <[email protected]>
AuthorDate: Sat Jun 29 20:52:53 2024 +0200
NIFI-13464 Replaced nifi-deprecation-log with logger in Registry
This closes #9019
Signed-off-by: David Handermann <[email protected]>
---
.../nifi-registry-core/nifi-registry-properties-loader/pom.xml | 5 -----
.../nifi/registry/properties/NiFiRegistryPropertiesLoader.java | 5 +----
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-properties-loader/pom.xml
b/nifi-registry/nifi-registry-core/nifi-registry-properties-loader/pom.xml
index d542e0830e..a7230b9b2f 100644
--- a/nifi-registry/nifi-registry-core/nifi-registry-properties-loader/pom.xml
+++ b/nifi-registry/nifi-registry-core/nifi-registry-properties-loader/pom.xml
@@ -36,10 +36,5 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-property-protection-loader</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-deprecation-log</artifactId>
- <version>1.27.0-SNAPSHOT</version>
- </dependency>
</dependencies>
</project>
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-properties-loader/src/main/java/org/apache/nifi/registry/properties/NiFiRegistryPropertiesLoader.java
b/nifi-registry/nifi-registry-core/nifi-registry-properties-loader/src/main/java/org/apache/nifi/registry/properties/NiFiRegistryPropertiesLoader.java
index e9a06818e7..ada588979a 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-properties-loader/src/main/java/org/apache/nifi/registry/properties/NiFiRegistryPropertiesLoader.java
+++
b/nifi-registry/nifi-registry-core/nifi-registry-properties-loader/src/main/java/org/apache/nifi/registry/properties/NiFiRegistryPropertiesLoader.java
@@ -16,8 +16,6 @@
*/
package org.apache.nifi.registry.properties;
-import org.apache.nifi.deprecation.log.DeprecationLogger;
-import org.apache.nifi.deprecation.log.DeprecationLoggerFactory;
import org.apache.nifi.properties.BootstrapProperties;
import org.apache.nifi.properties.SensitivePropertyProvider;
import org.apache.nifi.properties.SensitivePropertyProviderFactory;
@@ -35,7 +33,6 @@ import java.util.Properties;
public class NiFiRegistryPropertiesLoader {
- private static final DeprecationLogger deprecationLogger =
DeprecationLoggerFactory.getLogger(NiFiRegistryPropertiesLoader.class);
private static final Logger logger =
LoggerFactory.getLogger(NiFiRegistryPropertiesLoader.class);
private String keyHex;
@@ -128,7 +125,7 @@ public class NiFiRegistryPropertiesLoader {
public NiFiRegistryProperties load(final File file) {
final ProtectedNiFiRegistryProperties protectedNiFiProperties =
readProtectedPropertiesFromDisk(file);
if (protectedNiFiProperties.hasProtectedKeys()) {
- deprecationLogger.warn("Support for encrypted application
properties is deprecated for removal in NiFi 2.0.0");
+ logger.warn("Support for encrypted application properties is
deprecated for removal in NiFi 2.0.0");
Security.addProvider(new BouncyCastleProvider());
getSensitivePropertyProviderFactory()