(nifi) branch main updated: NIFI-15137 Upgraded NiFi NAR Maven Plugin from 2.1.0 to 2.2.0

[pvillard]

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

pvillard 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 2114484423 NIFI-15137 Upgraded NiFi NAR Maven Plugin from 2.1.0 to 
2.2.0
2114484423 is described below

commit 2114484423f0dd53f123a366bb09189d3030abbf
Author: exceptionfactory <exceptionfact...@apache.org>
AuthorDate: Fri Oct 24 13:04:35 2025 -0500

    NIFI-15137 Upgraded NiFi NAR Maven Plugin from 2.1.0 to 2.2.0
    
    - Updated StandardRuntimeManifestBuilder to handle unknown Extension Types 
and log a warning
    - Added Flow Registry Client to internal enumeration of known Extension 
Types
    
    Signed-off-by: Pierre Villard <pierre.villard...@gmail.com>
    
    This closes #10462.
---
 .../org/apache/nifi/extension/manifest/ExtensionType.java   |  4 +++-
 .../manifest/impl/StandardRuntimeManifestBuilder.java       | 13 ++++++++++++-
 pom.xml                                                     |  2 +-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git 
a/nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension/manifest/ExtensionType.java
 
b/nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension/manifest/ExtensionType.java
index 20654c53cd..0413e260ed 100644
--- 
a/nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension/manifest/ExtensionType.java
+++ 
b/nifi-manifest/nifi-extension-manifest-model/src/main/java/org/apache/nifi/extension/manifest/ExtensionType.java
@@ -29,6 +29,8 @@ public enum ExtensionType {
 
     FLOW_ANALYSIS_RULE,
 
-    PARAMETER_PROVIDER;
+    PARAMETER_PROVIDER,
+
+    FLOW_REGISTRY_CLIENT;
 
 }
diff --git 
a/nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/StandardRuntimeManifestBuilder.java
 
b/nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/StandardRuntimeManifestBuilder.java
index 8383c6714c..28a124a0d0 100644
--- 
a/nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/StandardRuntimeManifestBuilder.java
+++ 
b/nifi-manifest/nifi-runtime-manifest-core/src/main/java/org/apache/nifi/runtime/manifest/impl/StandardRuntimeManifestBuilder.java
@@ -53,6 +53,7 @@ import org.apache.nifi.extension.manifest.DynamicProperty;
 import org.apache.nifi.extension.manifest.DynamicRelationship;
 import org.apache.nifi.extension.manifest.Extension;
 import org.apache.nifi.extension.manifest.ExtensionManifest;
+import org.apache.nifi.extension.manifest.ExtensionType;
 import org.apache.nifi.extension.manifest.Property;
 import org.apache.nifi.extension.manifest.ProvidedServiceAPI;
 import org.apache.nifi.extension.manifest.ResourceDefinition;
@@ -64,6 +65,8 @@ import 
org.apache.nifi.runtime.manifest.ComponentManifestBuilder;
 import org.apache.nifi.runtime.manifest.ExtensionManifestContainer;
 import org.apache.nifi.runtime.manifest.RuntimeManifestBuilder;
 import org.apache.nifi.scheduling.SchedulingStrategy;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -84,6 +87,8 @@ public class StandardRuntimeManifestBuilder implements 
RuntimeManifestBuilder {
     private static final String DEFAULT_PENALIZATION_PERIOD = "30 sec";
     private static final String DEFAULT_BULLETIN_LEVEL = LogLevel.WARN.name();
 
+    private static final Logger logger = 
LoggerFactory.getLogger(StandardRuntimeManifestBuilder.class);
+
     private String identifier;
     private String version;
     private String runtimeType;
@@ -193,7 +198,13 @@ public class StandardRuntimeManifestBuilder implements 
RuntimeManifestBuilder {
             throw new IllegalArgumentException("Extension cannot be null");
         }
 
-        switch (extension.getType()) {
+        final ExtensionType extensionType = extension.getType();
+        if (extensionType == null) {
+            logger.warn("Extension Type not found: Component Manifest 
Definition not added for [{}]", extension.getName());
+            return;
+        }
+
+        switch (extensionType) {
             case PROCESSOR:
                 addProcessorDefinition(extensionManifest, extension, 
additionalDetails, componentManifestBuilder);
                 break;
diff --git a/pom.xml b/pom.xml
index e8502e8b35..e9e8535e79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,7 @@
 
         <!-- NiFi build -->
         <nifi-api.version>2.4.0</nifi-api.version>
-        <nifi.nar.maven.plugin.version>2.1.0</nifi.nar.maven.plugin.version>
+        <nifi.nar.maven.plugin.version>2.2.0</nifi.nar.maven.plugin.version>
 
         <!-- AWS SDK -->
         <com.amazonaws.version>1.12.792</com.amazonaws.version>