You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ex...@apache.org on 2024/09/23 17:31:42 UTC

(nifi-maven) branch main updated: NIFI-13773 Support different versions of nifi-api and nifi-framework-api (#39)

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-maven.git


The following commit(s) were added to refs/heads/main by this push:
     new 007fc24  NIFI-13773 Support different versions of nifi-api and nifi-framework-api (#39)
007fc24 is described below

commit 007fc24d7694b26b944c58489f7aa492440e3055
Author: Peter Turcsanyi <35...@users.noreply.github.com>
AuthorDate: Mon Sep 23 19:31:37 2024 +0200

    NIFI-13773 Support different versions of nifi-api and nifi-framework-api (#39)
    
    - Added nifi-framework-api to the classpath only if it is a dependency of the extension and with the provided version
    
    Signed-off-by: David Handermann <ex...@apache.org>
---
 .../extraction/ExtensionClassLoaderFactory.java        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java
index ace4226..1a71e24 100644
--- a/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java
+++ b/src/main/java/org/apache/nifi/extension/definition/extraction/ExtensionClassLoaderFactory.java
@@ -239,23 +239,25 @@ public class ExtensionClassLoaderFactory {
     private ExtensionClassLoader createProvidedEntitiesClassLoader(final ArtifactsHolder artifactsHolder)
             throws MojoExecutionException, ProjectBuildingException {
 
+        final Set<Artifact> providedArtifacts = new HashSet<>();
+
         final String nifiApiVersion = determineProvidedEntityVersion(artifactsHolder.getAllArtifacts(), "org.apache.nifi", "nifi-api");
         if (nifiApiVersion == null) {
             throw new MojoExecutionException("Could not find any dependency, provided or otherwise, on [org.apache.nifi:nifi-api]");
         } else {
             getLog().info("Found a dependency on version " + nifiApiVersion + " of NiFi API");
         }
-
-        final String slf4jApiVersion = determineProvidedEntityVersion(artifactsHolder.getAllArtifacts(),"org.slf4j", "slf4j-api");
-
         final Artifact nifiApiArtifact = getProvidedArtifact("org.apache.nifi", "nifi-api", nifiApiVersion);
-        final Artifact nifiFrameworkApiArtifact = getProvidedArtifact("org.apache.nifi", "nifi-framework-api", nifiApiArtifact.getVersion());
+        providedArtifacts.add(nifiApiArtifact);
 
-        final Artifact slf4jArtifact = getProvidedArtifact("org.slf4j", "slf4j-api", slf4jApiVersion);
+        final String nifiFrameworkApiVersion = determineProvidedEntityVersion(artifactsHolder.getAllArtifacts(),"org.apache.nifi", "nifi-framework-api");
+        if (nifiFrameworkApiVersion != null) {
+            final Artifact nifiFrameworkApiArtifact = getProvidedArtifact("org.apache.nifi", "nifi-framework-api", nifiFrameworkApiVersion);
+            providedArtifacts.add(nifiFrameworkApiArtifact);
+        }
 
-        final Set<Artifact> providedArtifacts = new HashSet<>();
-        providedArtifacts.add(nifiApiArtifact);
-        providedArtifacts.add(nifiFrameworkApiArtifact);
+        final String slf4jApiVersion = determineProvidedEntityVersion(artifactsHolder.getAllArtifacts(),"org.slf4j", "slf4j-api");
+        final Artifact slf4jArtifact = getProvidedArtifact("org.slf4j", "slf4j-api", slf4jApiVersion);
         providedArtifacts.add(slf4jArtifact);
 
         getLog().debug("Creating Provided Entities Class Loader with artifacts: " + providedArtifacts);