This is an automated email from the ASF dual-hosted git repository.

exceptionfactory pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new b2cde6b7ac NIFI-15217 Standardized property names by removing 
parentheses (#10528)
b2cde6b7ac is described below

commit b2cde6b7acd923404a2f5974c5d50c425567edf8
Author: dan-s1 <[email protected]>
AuthorDate: Fri Nov 14 09:18:08 2025 -0500

    NIFI-15217 Standardized property names by removing parentheses (#10528)
    
    Signed-off-by: David Handermann <[email protected]>
---
 .../schema/access/JsonSchemaRegistryComponent.java |  1 -
 .../aws/dynamodb/AbstractDynamoDBProcessor.java    | 11 +++++++++--
 .../nifi/processors/aws/lambda/PutLambda.java      |  9 ++++++++-
 .../org/apache/nifi/processors/aws/sns/PutSNS.java | 11 +++++++++--
 .../AbstractAzureLogAnalyticsReportingTask.java    | 15 +++++++++++---
 .../cdc/mysql/processors/CaptureChangeMySQL.java   |  5 +++--
 .../elasticsearch/PutElasticsearchRecord.java      |  6 ++++--
 .../org/apache/nifi/dbcp/utils/DBCPProperties.java |  8 ++++++--
 .../apache/nifi/processors/image/ResizeImage.java  |  6 ++++--
 .../apache/nifi/processors/mqtt/PublishMQTT.java   | 10 ++++++++--
 .../mqtt/common/AbstractMQTTProcessor.java         | 10 ++++++----
 .../org/apache/nifi/snmp/processors/GetSNMP.java   |  2 +-
 .../apache/nifi/snmp/processors/SendTrapSNMP.java  |  2 +-
 .../org/apache/nifi/snmp/processors/SetSNMP.java   |  2 +-
 .../processors/properties/BasicProperties.java     |  9 +++++++--
 .../processors/standard/HandleHttpResponse.java    |  8 +++++++-
 .../nifi/processors/standard/ListenHTTP.java       |  3 ++-
 .../controller/ControllerStatusReportingTask.java  | 23 +++++++++++++---------
 .../org/apache/nifi/dbcp/DBCPConnectionPool.java   |  4 +++-
 .../apache/nifi/dbcp/HadoopDBCPConnectionPool.java |  4 +++-
 20 files changed, 108 insertions(+), 41 deletions(-)

diff --git 
a/nifi-commons/nifi-json-schema-shared/src/main/java/org/apache/nifi/schema/access/JsonSchemaRegistryComponent.java
 
b/nifi-commons/nifi-json-schema-shared/src/main/java/org/apache/nifi/schema/access/JsonSchemaRegistryComponent.java
index 0fc53bed30..e2403ec711 100644
--- 
a/nifi-commons/nifi-json-schema-shared/src/main/java/org/apache/nifi/schema/access/JsonSchemaRegistryComponent.java
+++ 
b/nifi-commons/nifi-json-schema-shared/src/main/java/org/apache/nifi/schema/access/JsonSchemaRegistryComponent.java
@@ -23,7 +23,6 @@ public interface JsonSchemaRegistryComponent {
     PropertyDescriptor SCHEMA_VERSION = new PropertyDescriptor
         .Builder()
         .name("JSON Schema Version")
-        .displayName("JSON Schema Version")
         .description("The JSON schema specification")
         .required(true)
         .allowableValues(SchemaVersion.class)
diff --git 
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBProcessor.java
 
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBProcessor.java
index 792319c1c8..cb76352fe3 100644
--- 
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBProcessor.java
+++ 
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-abstract-processors/src/main/java/org/apache/nifi/processors/aws/dynamodb/AbstractDynamoDBProcessor.java
@@ -21,6 +21,7 @@ import org.apache.nifi.components.AllowableValue;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.migration.PropertyConfiguration;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.ProcessSession;
 import org.apache.nifi.processor.Relationship;
@@ -136,12 +137,12 @@ public abstract class AbstractDynamoDBProcessor extends 
AbstractAwsSyncProcessor
             .build();
 
     public static final PropertyDescriptor BATCH_SIZE = new 
PropertyDescriptor.Builder()
-            .name("Batch items for each request (between 1 and 50)")
+            .name("Batch Items Per Request")
             .required(false)
             .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT)
             .addValidator(StandardValidators.createLongValidator(1, 50, true))
             .defaultValue("1")
-            .description("The items to be retrieved in one batch")
+            .description("The number of items (between 1 and 50) to be 
retrieved in one batch")
             .build();
 
     public static final PropertyDescriptor DOCUMENT_CHARSET = new 
PropertyDescriptor.Builder()
@@ -164,6 +165,12 @@ public abstract class AbstractDynamoDBProcessor extends 
AbstractAwsSyncProcessor
         return COMMON_RELATIONSHIPS;
     }
 
+    @Override
+    public void migrateProperties(PropertyConfiguration config) {
+        super.migrateProperties(config);
+        config.renameProperty("Batch items for each request (between 1 and 
50)", BATCH_SIZE.getName());
+    }
+
     @Override
     protected DynamoDbClientBuilder createClientBuilder(final ProcessContext 
context) {
         return DynamoDbClient.builder();
diff --git 
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/PutLambda.java
 
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/PutLambda.java
index c462418d38..8d327c788d 100644
--- 
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/PutLambda.java
+++ 
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/lambda/PutLambda.java
@@ -26,6 +26,7 @@ import org.apache.nifi.annotation.documentation.Tags;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.migration.PropertyConfiguration;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.ProcessSession;
 import org.apache.nifi.processor.util.StandardValidators;
@@ -93,7 +94,7 @@ public class PutLambda extends 
AbstractAwsSyncProcessor<LambdaClient, LambdaClie
             .build();
 
     static final PropertyDescriptor AWS_LAMBDA_FUNCTION_QUALIFIER = new 
PropertyDescriptor.Builder()
-            .name("Amazon Lambda Qualifier (version)")
+            .name("Amazon Lambda Qualifier")
             .description("The Lambda Function Version")
             .defaultValue("$LATEST")
             .expressionLanguageSupported(ExpressionLanguageScope.NONE)
@@ -193,6 +194,12 @@ public class PutLambda extends 
AbstractAwsSyncProcessor<LambdaClient, LambdaClie
         }
     }
 
+    @Override
+    public void migrateProperties(PropertyConfiguration config) {
+        super.migrateProperties(config);
+        config.renameProperty("Amazon Lambda Qualifier (version)", 
AWS_LAMBDA_FUNCTION_QUALIFIER.getName());
+    }
+
     /**
      * Populate exception attributes in the flow file
      * @param session process session
diff --git 
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java
 
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java
index b6eb43cd59..3c9456412f 100644
--- 
a/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java
+++ 
b/nifi-extension-bundles/nifi-aws-bundle/nifi-aws-processors/src/main/java/org/apache/nifi/processors/aws/sns/PutSNS.java
@@ -28,6 +28,7 @@ import org.apache.nifi.components.AllowableValue;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.migration.PropertyConfiguration;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.ProcessSession;
 import org.apache.nifi.processor.exception.ProcessException;
@@ -104,8 +105,8 @@ public class PutSNS extends 
AbstractAwsSyncProcessor<SnsClient, SnsClientBuilder
 
 
     public static final PropertyDescriptor ARN = new 
PropertyDescriptor.Builder()
-            .name("Amazon Resource Name (ARN)")
-            .description("The name of the resource to which notifications 
should be published")
+            .name("Amazon Resource Name")
+            .description("The name of the resource (ARN) to which 
notifications should be published")
             
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
             .required(true)
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR)
@@ -239,6 +240,12 @@ public class PutSNS extends 
AbstractAwsSyncProcessor<SnsClient, SnsClientBuilder
         }
     }
 
+    @Override
+    public void migrateProperties(PropertyConfiguration config) {
+        super.migrateProperties(config);
+        config.renameProperty("Amazon Resource Name (ARN)", ARN.getName());
+    }
+
     @Override
     protected SnsClientBuilder createClientBuilder(final ProcessContext 
context) {
         return SnsClient.builder();
diff --git 
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java
 
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java
index b7844610e6..6db63dfbcb 100644
--- 
a/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java
+++ 
b/nifi-extension-bundles/nifi-azure-bundle/nifi-azure-reporting-task/src/main/java/org/apache/nifi/reporting/azure/loganalytics/AbstractAzureLogAnalyticsReportingTask.java
@@ -23,6 +23,7 @@ import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.expression.ExpressionLanguageScope;
+import org.apache.nifi.migration.PropertyConfiguration;
 import org.apache.nifi.processor.util.StandardValidators;
 import org.apache.nifi.reporting.AbstractReportingTask;
 
@@ -63,15 +64,18 @@ public abstract class 
AbstractAzureLogAnalyticsReportingTask extends AbstractRep
             .name("Log Analytics Workspace Key").description("Azure Log 
Analytic Worskspace Key").required(true)
             .expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT)
             
.addValidator(StandardValidators.NON_EMPTY_VALIDATOR).sensitive(true).build();
-    static final PropertyDescriptor APPLICATION_ID = new 
PropertyDescriptor.Builder().name("Application ID")
+    static final PropertyDescriptor APPLICATION_ID = new 
PropertyDescriptor.Builder()
+            .name("Application ID")
             .description("The Application ID to be included in the metrics 
sent to Azure Log Analytics WS")
             
.required(true).expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT).defaultValue("nifi")
             .addValidator(StandardValidators.NON_EMPTY_VALIDATOR).build();
-    static final PropertyDescriptor INSTANCE_ID = new 
PropertyDescriptor.Builder().name("Instance ID")
+    static final PropertyDescriptor INSTANCE_ID = new 
PropertyDescriptor.Builder()
+            .name("Instance ID")
             .description("Id of this NiFi instance to be included in the 
metrics sent to Azure Log Analytics WS")
             
.required(true).expressionLanguageSupported(ExpressionLanguageScope.ENVIRONMENT)
             
.defaultValue("${hostname(true)}").addValidator(StandardValidators.NON_EMPTY_VALIDATOR).build();
-    static final PropertyDescriptor PROCESS_GROUP_IDS = new 
PropertyDescriptor.Builder().name("Process group ID(s)")
+    static final PropertyDescriptor PROCESS_GROUP_IDS = new 
PropertyDescriptor.Builder()
+            .name("Process Group IDs")
             .description(
                     "If specified, the reporting task will send metrics the 
configured ProcessGroup(s) only. Multiple IDs should be separated by a comma. 
If"
                             + " none of the group-IDs could be found or no IDs 
are defined, the Root Process Group is used and global metrics are sent.")
@@ -99,6 +103,11 @@ public abstract class 
AbstractAzureLogAnalyticsReportingTask extends AbstractRep
             LOG_ANALYTICS_URL_ENDPOINT_FORMAT
     );
 
+    @Override
+    public void migrateProperties(PropertyConfiguration config) {
+        config.renameProperty("Process group ID(s)", 
PROCESS_GROUP_IDS.getName());
+    }
+
     protected String createAuthorization(String workspaceId, String key, int 
contentLength, String rfc1123Date) {
         try {
             String signature = 
String.format("POST\n%d\napplication/json\nx-ms-date:%s\n/api/logs", 
contentLength,
diff --git 
a/nifi-extension-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/main/java/org/apache/nifi/cdc/mysql/processors/CaptureChangeMySQL.java
 
b/nifi-extension-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/main/java/org/apache/nifi/cdc/mysql/processors/CaptureChangeMySQL.java
index ef06458a09..ce148965c5 100644
--- 
a/nifi-extension-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/main/java/org/apache/nifi/cdc/mysql/processors/CaptureChangeMySQL.java
+++ 
b/nifi-extension-bundles/nifi-cdc/nifi-cdc-mysql-bundle/nifi-cdc-mysql-processors/src/main/java/org/apache/nifi/cdc/mysql/processors/CaptureChangeMySQL.java
@@ -249,7 +249,7 @@ public class CaptureChangeMySQL extends 
AbstractSessionFactoryProcessor {
             .build();
 
     public static final PropertyDescriptor DRIVER_LOCATION = new 
PropertyDescriptor.Builder()
-            .name("MySQL Driver Location(s)")
+            .name("MySQL Driver Locations")
             .description("Comma-separated list of files/folders and/or URLs 
containing the MySQL driver JAR and its dependencies (if any). "
                     + "For example 
'/var/tmp/mysql-connector-java-5.1.38-bin.jar'")
             .required(false)
@@ -504,7 +504,8 @@ public class CaptureChangeMySQL extends 
AbstractSessionFactoryProcessor {
         config.renameProperty("capture-change-mysql-max-wait-time", 
CONNECT_TIMEOUT.getName());
         config.renameProperty("capture-change-mysql-hosts", HOSTS.getName());
         config.renameProperty("capture-change-mysql-driver-class", 
DRIVER_NAME.getName());
-        config.renameProperty("capture-change-mysql-driver-locations", 
DRIVER_LOCATION.getName());
+        List.of("capture-change-mysql-driver-locations", "MySQL Driver 
Location(s)").forEach(
+                oldNameProperty ->  config.renameProperty(oldNameProperty, 
DRIVER_LOCATION.getName()));
         config.renameProperty("capture-change-mysql-username", 
USERNAME.getName());
         config.renameProperty("capture-change-mysql-password", 
PASSWORD.getName());
         config.renameProperty("events-per-flowfile-strategy", 
EVENTS_PER_FLOWFILE_STRATEGY.getName());
diff --git 
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecord.java
 
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecord.java
index c05ca2cd06..efa399982f 100644
--- 
a/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecord.java
+++ 
b/nifi-extension-bundles/nifi-elasticsearch-bundle/nifi-elasticsearch-restapi-processors/src/main/java/org/apache/nifi/processors/elasticsearch/PutElasticsearchRecord.java
@@ -171,7 +171,7 @@ public class PutElasticsearchRecord extends 
AbstractPutElasticsearch {
         .build();
 
     public static final PropertyDescriptor RETAIN_ID_FIELD = new 
PropertyDescriptor.Builder()
-        .name("Retain ID (Record Path)")
+        .name("Retain Record Path ID Field")
         .description("Whether to retain the existing field used as the ID 
Record Path.")
         .addValidator(StandardValidators.BOOLEAN_VALIDATOR)
         .defaultValue("false")
@@ -347,7 +347,9 @@ public class PutElasticsearchRecord extends 
AbstractPutElasticsearch {
         config.renameProperty("put-es-record-at-timestamp", 
AT_TIMESTAMP.getName());
         config.renameProperty("put-es-record-index-op-path", 
INDEX_OP_RECORD_PATH.getName());
         config.renameProperty("put-es-record-id-path", 
ID_RECORD_PATH.getName());
-        config.renameProperty("put-es-record-retain-id-field", 
RETAIN_ID_FIELD.getName());
+        List.of("put-es-record-retain-id-field", "Retain ID (Record 
Path)").forEach(
+                oldNameProperty -> config.renameProperty(oldNameProperty, 
RETAIN_ID_FIELD.getName())
+        );
         config.renameProperty("put-es-record-index-record-path", 
INDEX_RECORD_PATH.getName());
         config.renameProperty("put-es-record-type-record-path", 
TYPE_RECORD_PATH.getName());
         config.renameProperty("put-es-record-at-timestamp-path", 
AT_TIMESTAMP_RECORD_PATH.getName());
diff --git 
a/nifi-extension-bundles/nifi-extension-utils/nifi-dbcp-base/src/main/java/org/apache/nifi/dbcp/utils/DBCPProperties.java
 
b/nifi-extension-bundles/nifi-extension-utils/nifi-dbcp-base/src/main/java/org/apache/nifi/dbcp/utils/DBCPProperties.java
index e056e61ca5..211dc21e7f 100644
--- 
a/nifi-extension-bundles/nifi-extension-utils/nifi-dbcp-base/src/main/java/org/apache/nifi/dbcp/utils/DBCPProperties.java
+++ 
b/nifi-extension-bundles/nifi-extension-utils/nifi-dbcp-base/src/main/java/org/apache/nifi/dbcp/utils/DBCPProperties.java
@@ -27,6 +27,7 @@ import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.kerberos.KerberosUserService;
 import org.apache.nifi.processor.util.StandardValidators;
 
+import java.util.List;
 import java.util.concurrent.TimeUnit;
 
 public final class DBCPProperties {
@@ -34,7 +35,10 @@ public final class DBCPProperties {
     private DBCPProperties() {
     }
 
-    public static final String OLD_DB_DRIVER_LOCATION_PROPERTY_NAME = 
"database-driver-locations";
+    public static final List<String> OLD_DB_DRIVER_LOCATION_PROPERTY_NAMES = 
List.of(
+            "database-driver-locations",
+            "Database Driver Location(s)"
+    );
     public static final String OLD_VALIDATION_QUERY_PROPERTY_NAME = 
"Validation-query";
     public static final String OLD_MIN_IDLE_PROPERTY_NAME = 
"dbcp-min-idle-conns";
     public static final String OLD_MAX_IDLE_PROPERTY_NAME = 
"dbcp-max-idle-conns";
@@ -79,7 +83,7 @@ public final class DBCPProperties {
             .build();
 
     public static final PropertyDescriptor DB_DRIVER_LOCATION = new 
PropertyDescriptor.Builder()
-            .name("Database Driver Location(s)")
+            .name("Database Driver Locations")
             .description("Comma-separated list of files/folders and/or URLs 
containing the driver JAR and its dependencies (if any). For example 
'/var/tmp/mariadb-java-client-1.1.7.jar'")
             .required(false)
             .identifiesExternalResource(ResourceCardinality.MULTIPLE, 
ResourceType.FILE, ResourceType.DIRECTORY, ResourceType.URL)
diff --git 
a/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ResizeImage.java
 
b/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ResizeImage.java
index f60d6c1ef8..f8b3d7bf51 100644
--- 
a/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ResizeImage.java
+++ 
b/nifi-extension-bundles/nifi-media-bundle/nifi-media-processors/src/main/java/org/apache/nifi/processors/image/ResizeImage.java
@@ -65,14 +65,14 @@ public class ResizeImage extends AbstractProcessor {
     static final AllowableValue RESIZE_AREA_AVERAGING = new 
AllowableValue("Area Averaging", "Area Averaging", "Use the Area Averaging 
scaling algorithm");
 
     static final PropertyDescriptor IMAGE_WIDTH = new 
PropertyDescriptor.Builder()
-        .name("Image Width (in pixels)")
+        .name("Image Width")
         .description("The desired number of pixels for the image's width")
         .required(true)
         
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
         .addValidator(StandardValidators.POSITIVE_INTEGER_VALIDATOR)
         .build();
     static final PropertyDescriptor IMAGE_HEIGHT = new 
PropertyDescriptor.Builder()
-        .name("Image Height (in pixels)")
+        .name("Image Height")
         .description("The desired number of pixels for the image's height")
         .required(true)
         
.expressionLanguageSupported(ExpressionLanguageScope.FLOWFILE_ATTRIBUTES)
@@ -230,6 +230,8 @@ public class ResizeImage extends AbstractProcessor {
     @Override
     public void migrateProperties(PropertyConfiguration config) {
         config.renameProperty("keep-ratio", KEEP_RATIO.getName());
+        config.renameProperty("Image Width (in pixels)", 
IMAGE_WIDTH.getName());
+        config.renameProperty("Image Height (in pixels)", 
IMAGE_HEIGHT.getName());
     }
 
     public Dimension getScaledDimension(int originalWidth, int originalHeight, 
int boundWidth, int boundHeight) {
diff --git 
a/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/PublishMQTT.java
 
b/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/PublishMQTT.java
index 669f954695..edcb1a4a3f 100644
--- 
a/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/PublishMQTT.java
+++ 
b/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/PublishMQTT.java
@@ -31,6 +31,7 @@ import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.expression.AttributeExpression;
 import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.flowfile.FlowFile;
+import org.apache.nifi.migration.PropertyConfiguration;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.ProcessSession;
 import org.apache.nifi.processor.ProcessorInitializationContext;
@@ -81,8 +82,7 @@ public class PublishMQTT extends AbstractMQTTProcessor {
             .build();
 
     public static final PropertyDescriptor PROP_QOS = new 
PropertyDescriptor.Builder()
-            .name("Quality of Service(QoS)")
-            .displayName("Quality of Service (QoS)")
+            .name("Quality of Service")
             .description("The Quality of Service (QoS) to send the message 
with. Accepts three values '0', '1' and '2'; '0' for 'at most once', '1' for 
'at least once', '2' for 'exactly once'. " +
                     "Expression language is allowed in order to support 
publishing messages with different QoS but the end value of the property must 
be either '0', '1' or '2'. ")
             .required(true)
@@ -219,6 +219,12 @@ public class PublishMQTT extends AbstractMQTTProcessor {
         }
     }
 
+    @Override
+    public void migrateProperties(PropertyConfiguration config) {
+        super.migrateProperties(config);
+        config.renameProperty("Quality of Service(QoS)", PROP_QOS.getName());
+    }
+
     private void processMultiMessageFlowFile(ProcessStrategy processStrategy, 
ProcessContext context, ProcessSession session, final FlowFile flowfile, String 
topic) {
         final StopWatch stopWatch = new StopWatch(true);
         final AtomicInteger processedRecords = new AtomicInteger();
diff --git 
a/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/common/AbstractMQTTProcessor.java
 
b/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/common/AbstractMQTTProcessor.java
index 1e7cc4f64a..f75a0e7545 100644
--- 
a/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/common/AbstractMQTTProcessor.java
+++ 
b/nifi-extension-bundles/nifi-mqtt-bundle/nifi-mqtt-processors/src/main/java/org/apache/nifi/processors/mqtt/common/AbstractMQTTProcessor.java
@@ -207,8 +207,8 @@ public abstract class AbstractMQTTProcessor extends 
AbstractSessionFactoryProces
             .build();
 
     public static final PropertyDescriptor PROP_CONN_TIMEOUT = new 
PropertyDescriptor.Builder()
-            .name("Connection Timeout (seconds)")
-            .description("Maximum time interval the client will wait for the 
network connection to the MQTT server " +
+            .name("Connection Timeout")
+            .description("Maximum time interval (in seconds), the client will 
wait for the network connection to the MQTT server " +
                     "to be established. The default timeout is 30 seconds. " +
                     "A value of 0 disables timeout processing meaning the 
client will wait until the network connection is made successfully or fails.")
             .required(false)
@@ -217,8 +217,8 @@ public abstract class AbstractMQTTProcessor extends 
AbstractSessionFactoryProces
             .build();
 
     public static final PropertyDescriptor PROP_KEEP_ALIVE_INTERVAL = new 
PropertyDescriptor.Builder()
-            .name("Keep Alive Interval (seconds)")
-            .description("Defines the maximum time interval between messages 
sent or received. It enables the " +
+            .name("Keep Alive")
+            .description("Defines the maximum time interval (in seconds), 
between messages sent or received. It enables the " +
                     "client to detect if the server is no longer available, 
without having to wait for the TCP/IP timeout. " +
                     "The client will ensure that at least one message travels 
across the network within each keep alive period. In the absence of a 
data-related message during the time period, " +
                     "the client sends a very small \"ping\" message, which the 
server will acknowledge. A value of 0 disables keepalive processing in the 
client.")
@@ -357,6 +357,8 @@ public abstract class AbstractMQTTProcessor extends 
AbstractSessionFactoryProces
         config.renameProperty("record-reader", BASE_RECORD_READER.getName());
         config.renameProperty("record-writer", BASE_RECORD_WRITER.getName());
         config.renameProperty("message-demarcator", 
BASE_MESSAGE_DEMARCATOR.getName());
+        config.renameProperty("Connection Timeout (seconds)", 
PROP_CONN_TIMEOUT.getName());
+        config.renameProperty("Keep Alive Interval (seconds)", 
PROP_KEEP_ALIVE_INTERVAL.getName());
     }
 
     protected boolean isConnected() {
diff --git 
a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/GetSNMP.java
 
b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/GetSNMP.java
index d990936eda..5ee09eaf5b 100644
--- 
a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/GetSNMP.java
+++ 
b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/GetSNMP.java
@@ -176,7 +176,7 @@ public class GetSNMP extends AbstractSNMPProcessor {
         config.renameProperty(BasicProperties.OLD_SNMP_VERSION_PROPERTY_NAME, 
BasicProperties.SNMP_VERSION.getName());
         
config.renameProperty(BasicProperties.OLD_SNMP_COMMUNITY_PROPERTY_NAME, 
BasicProperties.SNMP_COMMUNITY.getName());
         config.renameProperty(BasicProperties.OLD_SNMP_RETRIES_PROPERTY_NAME,  
BasicProperties.SNMP_RETRIES.getName());
-        config.renameProperty(BasicProperties.OLD_SNMP_TIMEOUT_PROPERTY_NAME, 
BasicProperties.SNMP_TIMEOUT.getName());
+        
BasicProperties.OLD_SNMP_TIMEOUT_PROPERTY_NAMES.forEach(oldPropertyName -> 
config.renameProperty(oldPropertyName, BasicProperties.SNMP_TIMEOUT.getName()));
         
config.renameProperty(V3SecurityProperties.OLD_SNMP_SECURITY_LEVEL_PROPERTY_NAME,
 V3SecurityProperties.SNMP_SECURITY_LEVEL.getName());
         
config.renameProperty(V3SecurityProperties.OLD_SNMP_SECURITY_NAME_PROPERTY_NAME,
 V3SecurityProperties.SNMP_SECURITY_NAME.getName());
         
config.renameProperty(V3SecurityProperties.OLD_SNMP_AUTH_PROTOCOL_PROPERTY_NAME,
 V3SecurityProperties.SNMP_AUTH_PROTOCOL.getName());
diff --git 
a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/SendTrapSNMP.java
 
b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/SendTrapSNMP.java
index 2248c331c4..991a396530 100644
--- 
a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/SendTrapSNMP.java
+++ 
b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/SendTrapSNMP.java
@@ -181,7 +181,7 @@ public class SendTrapSNMP extends AbstractSNMPProcessor {
         config.renameProperty(BasicProperties.OLD_SNMP_VERSION_PROPERTY_NAME, 
BasicProperties.SNMP_VERSION.getName());
         
config.renameProperty(BasicProperties.OLD_SNMP_COMMUNITY_PROPERTY_NAME, 
BasicProperties.SNMP_COMMUNITY.getName());
         config.renameProperty(BasicProperties.OLD_SNMP_RETRIES_PROPERTY_NAME,  
BasicProperties.SNMP_RETRIES.getName());
-        config.renameProperty(BasicProperties.OLD_SNMP_TIMEOUT_PROPERTY_NAME, 
BasicProperties.SNMP_TIMEOUT.getName());
+        
BasicProperties.OLD_SNMP_TIMEOUT_PROPERTY_NAMES.forEach(oldPropertyName -> 
config.renameProperty(oldPropertyName, BasicProperties.SNMP_TIMEOUT.getName()));
         
config.renameProperty(V3SecurityProperties.OLD_SNMP_SECURITY_LEVEL_PROPERTY_NAME,
 V3SecurityProperties.SNMP_SECURITY_LEVEL.getName());
         
config.renameProperty(V3SecurityProperties.OLD_SNMP_SECURITY_NAME_PROPERTY_NAME,
 V3SecurityProperties.SNMP_SECURITY_NAME.getName());
         
config.renameProperty(V3SecurityProperties.OLD_SNMP_AUTH_PROTOCOL_PROPERTY_NAME,
 V3SecurityProperties.SNMP_AUTH_PROTOCOL.getName());
diff --git 
a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/SetSNMP.java
 
b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/SetSNMP.java
index 86bc7269ca..133366f5fe 100644
--- 
a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/SetSNMP.java
+++ 
b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/SetSNMP.java
@@ -144,7 +144,7 @@ public class SetSNMP extends AbstractSNMPProcessor {
         config.renameProperty(BasicProperties.OLD_SNMP_VERSION_PROPERTY_NAME, 
BasicProperties.SNMP_VERSION.getName());
         
config.renameProperty(BasicProperties.OLD_SNMP_COMMUNITY_PROPERTY_NAME, 
BasicProperties.SNMP_COMMUNITY.getName());
         config.renameProperty(BasicProperties.OLD_SNMP_RETRIES_PROPERTY_NAME,  
BasicProperties.SNMP_RETRIES.getName());
-        config.renameProperty(BasicProperties.OLD_SNMP_TIMEOUT_PROPERTY_NAME, 
BasicProperties.SNMP_TIMEOUT.getName());
+        
BasicProperties.OLD_SNMP_TIMEOUT_PROPERTY_NAMES.forEach(oldPropertyName -> 
config.renameProperty(oldPropertyName, BasicProperties.SNMP_TIMEOUT.getName()));
         
config.renameProperty(V3SecurityProperties.OLD_SNMP_SECURITY_LEVEL_PROPERTY_NAME,
 V3SecurityProperties.SNMP_SECURITY_LEVEL.getName());
         
config.renameProperty(V3SecurityProperties.OLD_SNMP_SECURITY_NAME_PROPERTY_NAME,
 V3SecurityProperties.SNMP_SECURITY_NAME.getName());
         
config.renameProperty(V3SecurityProperties.OLD_SNMP_AUTH_PROTOCOL_PROPERTY_NAME,
 V3SecurityProperties.SNMP_AUTH_PROTOCOL.getName());
diff --git 
a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/properties/BasicProperties.java
 
b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/properties/BasicProperties.java
index 80cdb9d4d9..ae84c5fea2 100644
--- 
a/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/properties/BasicProperties.java
+++ 
b/nifi-extension-bundles/nifi-snmp-bundle/nifi-snmp-processors/src/main/java/org/apache/nifi/snmp/processors/properties/BasicProperties.java
@@ -20,6 +20,8 @@ import org.apache.nifi.components.AllowableValue;
 import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.processor.util.StandardValidators;
 
+import java.util.List;
+
 public class BasicProperties {
 
     private BasicProperties() {
@@ -33,7 +35,10 @@ public class BasicProperties {
     public static final String OLD_SNMP_VERSION_PROPERTY_NAME = "snmp-version";
     public static final String OLD_SNMP_COMMUNITY_PROPERTY_NAME = 
"snmp-community";
     public static final String OLD_SNMP_RETRIES_PROPERTY_NAME = "snmp-retries";
-    public static final String OLD_SNMP_TIMEOUT_PROPERTY_NAME = "snmp-timeout";
+    public static final List<String> OLD_SNMP_TIMEOUT_PROPERTY_NAMES = List.of(
+            "snmp-timeout",
+            "Timeout (ms)"
+    );
 
     public static final PropertyDescriptor SNMP_VERSION = new 
PropertyDescriptor.Builder()
             .name("SNMP Version")
@@ -68,7 +73,7 @@ public class BasicProperties {
             .build();
 
     public static final PropertyDescriptor SNMP_TIMEOUT = new 
PropertyDescriptor.Builder()
-            .name("Timeout (ms)")
+            .name("Timeout")
             .description("Set the timeout in ms when requesting the SNMP 
Agent.")
             .required(false)
             .defaultValue("5000")
diff --git 
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java
 
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java
index 0506d20251..a6bd9da25f 100644
--- 
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java
+++ 
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/HandleHttpResponse.java
@@ -29,6 +29,7 @@ import org.apache.nifi.components.PropertyDescriptor;
 import org.apache.nifi.expression.ExpressionLanguageScope;
 import org.apache.nifi.flowfile.FlowFile;
 import org.apache.nifi.http.HttpContextMap;
+import org.apache.nifi.migration.PropertyConfiguration;
 import org.apache.nifi.processor.AbstractProcessor;
 import org.apache.nifi.processor.ProcessContext;
 import org.apache.nifi.processor.ProcessSession;
@@ -76,7 +77,7 @@ public class HandleHttpResponse extends AbstractProcessor {
             .identifiesControllerService(HttpContextMap.class)
             .build();
     public static final PropertyDescriptor ATTRIBUTES_AS_HEADERS_REGEX = new 
PropertyDescriptor.Builder()
-            .name("Attributes to add to the HTTP Response (Regex)")
+            .name("Attributes for HTTP Response")
             .description("Specifies the Regular Expression that determines the 
names of FlowFile attributes that should be added to the HTTP response")
             .addValidator(StandardValidators.REGULAR_EXPRESSION_VALIDATOR)
             .required(false)
@@ -217,6 +218,11 @@ public class HandleHttpResponse extends AbstractProcessor {
         session.transfer(flowFile, REL_SUCCESS);
     }
 
+    @Override
+    public void migrateProperties(PropertyConfiguration config) {
+        config.renameProperty("Attributes to add to the HTTP Response 
(Regex)", ATTRIBUTES_AS_HEADERS_REGEX.getName());
+    }
+
     private static boolean isNumber(final String value) {
         if (value.isEmpty()) {
             return false;
diff --git 
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java
 
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java
index fd080a2430..93d9af193b 100644
--- 
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java
+++ 
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java
@@ -245,7 +245,7 @@ public class ListenHTTP extends 
AbstractSessionFactoryProcessor implements Liste
         .dependsOn(SSL_CONTEXT_SERVICE)
         .build();
     public static final PropertyDescriptor HEADERS_AS_ATTRIBUTES_REGEX = new 
PropertyDescriptor.Builder()
-        .name("HTTP Headers to receive as Attributes (Regex)")
+        .name("HTTP Headers for Attributes")
         .description("Specifies the Regular Expression that determines the 
names of HTTP Headers that should be passed along as FlowFile attributes")
         .addValidator(StandardValidators.REGULAR_EXPRESSION_VALIDATOR)
         .required(false)
@@ -416,6 +416,7 @@ public class ListenHTTP extends 
AbstractSessionFactoryProcessor implements Liste
         config.renameProperty("max-thread-pool-size", 
MAX_THREAD_POOL_SIZE.getName());
         config.renameProperty("record-reader", RECORD_READER.getName());
         config.renameProperty("record-writer", RECORD_WRITER.getName());
+        config.renameProperty("HTTP Headers to receive as Attributes (Regex)", 
HEADERS_AS_ATTRIBUTES_REGEX.getName());
     }
 
     @OnShutdown
diff --git 
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/main/java/org/apache/nifi/controller/ControllerStatusReportingTask.java
 
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/main/java/org/apache/nifi/controller/ControllerStatusReportingTask.java
index 656646d61e..53b96db3f8 100644
--- 
a/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/main/java/org/apache/nifi/controller/ControllerStatusReportingTask.java
+++ 
b/nifi-extension-bundles/nifi-standard-bundle/nifi-standard-reporting-tasks/src/main/java/org/apache/nifi/controller/ControllerStatusReportingTask.java
@@ -25,6 +25,7 @@ import org.apache.nifi.components.PropertyDescriptor.Builder;
 import org.apache.nifi.controller.status.ConnectionStatus;
 import org.apache.nifi.controller.status.ProcessGroupStatus;
 import org.apache.nifi.controller.status.ProcessorStatus;
+import org.apache.nifi.migration.PropertyConfiguration;
 import org.apache.nifi.reporting.AbstractReportingTask;
 import org.apache.nifi.reporting.ReportingContext;
 import org.apache.nifi.util.FormatUtils;
@@ -60,8 +61,7 @@ public class ControllerStatusReportingTask extends 
AbstractReportingTask {
             .defaultValue("true")
             .build();
     static final PropertyDescriptor REPORTING_GRANULARITY = new Builder()
-        .name("reporting-granularity")
-        .displayName("Reporting Granularity")
+        .name("Reporting Granularity")
         .description("When reporting information, specifies the granularity of 
the metrics to report")
         .allowableValues(FIVE_MINUTE_GRANULARITY, ONE_SECOND_GRANULARITY)
         .defaultValue(FIVE_MINUTE_GRANULARITY.getValue())
@@ -79,6 +79,11 @@ public class ControllerStatusReportingTask extends 
AbstractReportingTask {
 
     private static final String COUNTER_LINE_FORMAT = "| %1$-36.36s | 
%2$-36.36s | %3$-36.36s |\n";
 
+    private static final List<PropertyDescriptor> PROPERTY_DESCRIPTORS = 
List.of(
+            SHOW_DELTAS,
+            REPORTING_GRANULARITY
+    );
+
     private volatile String processorLineFormat;
     private volatile String processorHeader;
     private volatile String processorBorderLine;
@@ -98,10 +103,7 @@ public class ControllerStatusReportingTask extends 
AbstractReportingTask {
 
     @Override
     public final List<PropertyDescriptor> getSupportedPropertyDescriptors() {
-        final List<PropertyDescriptor> descriptors = new ArrayList<>();
-        descriptors.add(SHOW_DELTAS);
-        descriptors.add(REPORTING_GRANULARITY);
-        return descriptors;
+        return PROPERTY_DESCRIPTORS;
     }
 
     @OnScheduled
@@ -123,9 +125,7 @@ public class ControllerStatusReportingTask extends 
AbstractReportingTask {
 
     private String createLine(final String valueToUnderscore) {
         final StringBuilder processorBorderBuilder = new 
StringBuilder(valueToUnderscore.length());
-        for (int i = 0; i < valueToUnderscore.length(); i++) {
-            processorBorderBuilder.append('-');
-        }
+        processorBorderBuilder.append("-".repeat(valueToUnderscore.length()));
         return processorBorderBuilder.toString();
     }
 
@@ -149,6 +149,11 @@ public class ControllerStatusReportingTask extends 
AbstractReportingTask {
         printCounters(controllerStatus, showDeltas, divisor);
     }
 
+    @Override
+    public void migrateProperties(PropertyConfiguration config) {
+        config.renameProperty("reporting-granularity", 
REPORTING_GRANULARITY.getName());
+    }
+
     private void printProcessorStatuses(final ProcessGroupStatus 
controllerStatus, final boolean showDeltas, final long divisor) {
         final StringBuilder builder = new StringBuilder();
 
diff --git 
a/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java
 
b/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java
index b2581e3f99..dd27c90ba2 100644
--- 
a/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java
+++ 
b/nifi-extension-bundles/nifi-standard-services/nifi-dbcp-service-bundle/nifi-dbcp-service/src/main/java/org/apache/nifi/dbcp/DBCPConnectionPool.java
@@ -127,7 +127,9 @@ public class DBCPConnectionPool extends 
AbstractDBCPConnectionPool implements DB
         config.removeProperty("kerberos-principal");
         config.removeProperty("kerberos-password");
         config.removeProperty("kerberos-credentials-service");
-        
config.renameProperty(DBCPProperties.OLD_DB_DRIVER_LOCATION_PROPERTY_NAME, 
DB_DRIVER_LOCATION.getName());
+        
DBCPProperties.OLD_DB_DRIVER_LOCATION_PROPERTY_NAMES.forEach(oldPropertyName ->
+                config.renameProperty(oldPropertyName, 
DB_DRIVER_LOCATION.getName())
+                );
         
config.renameProperty(DBCPProperties.OLD_VALIDATION_QUERY_PROPERTY_NAME, 
VALIDATION_QUERY.getName());
         config.renameProperty(DBCPProperties.OLD_MIN_IDLE_PROPERTY_NAME, 
MIN_IDLE.getName());
         config.renameProperty(DBCPProperties.OLD_MAX_IDLE_PROPERTY_NAME, 
MAX_IDLE.getName());
diff --git 
a/nifi-extension-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java
 
b/nifi-extension-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java
index f3550b3470..c377c68b18 100644
--- 
a/nifi-extension-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java
+++ 
b/nifi-extension-bundles/nifi-standard-services/nifi-hadoop-dbcp-service-bundle/nifi-hadoop-dbcp-service/src/main/java/org/apache/nifi/dbcp/HadoopDBCPConnectionPool.java
@@ -143,7 +143,9 @@ public class HadoopDBCPConnectionPool extends 
AbstractDBCPConnectionPool {
         config.removeProperty("Kerberos Keytab");
         config.removeProperty("kerberos-credentials-service");
         config.renameProperty("hadoop-config-resources", 
HADOOP_CONFIGURATION_RESOURCES.getName());
-        
config.renameProperty(DBCPProperties.OLD_DB_DRIVER_LOCATION_PROPERTY_NAME, 
DB_DRIVER_LOCATION.getName());
+        
DBCPProperties.OLD_DB_DRIVER_LOCATION_PROPERTY_NAMES.forEach(oldPropertyName ->
+                config.renameProperty(oldPropertyName, 
DB_DRIVER_LOCATION.getName())
+        );
         
config.renameProperty(DBCPProperties.OLD_VALIDATION_QUERY_PROPERTY_NAME, 
VALIDATION_QUERY.getName());
         config.renameProperty(DBCPProperties.OLD_MIN_IDLE_PROPERTY_NAME, 
MIN_IDLE.getName());
         config.renameProperty(DBCPProperties.OLD_MAX_IDLE_PROPERTY_NAME, 
MAX_IDLE.getName());


Reply via email to