This is an automated email from the ASF dual-hosted git repository. joewitt 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 afa85a03ce NIFI-10286 This closes #6251. Removed c2-client-api references from nifi-nar-utils afa85a03ce is described below commit afa85a03ce1a0b012e11189290384cdc3b58efc5 Author: exceptionfactory <exceptionfact...@apache.org> AuthorDate: Wed Jul 27 07:55:46 2022 -0500 NIFI-10286 This closes #6251. Removed c2-client-api references from nifi-nar-utils Signed-off-by: Joe Witt <joew...@apache.org> --- c2/c2-client-bundle/c2-client-http/pom.xml | 1 - c2/c2-client-bundle/c2-client-service/pom.xml | 1 - .../main/java/org/apache/nifi/controller/StandardFlowService.java | 2 +- .../nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml | 5 ----- .../src/main/java/org/apache/nifi/nar/NarClassLoaders.java | 6 +----- 5 files changed, 2 insertions(+), 13 deletions(-) diff --git a/c2/c2-client-bundle/c2-client-http/pom.xml b/c2/c2-client-bundle/c2-client-http/pom.xml index 927c3621b3..d3671de1e1 100644 --- a/c2/c2-client-bundle/c2-client-http/pom.xml +++ b/c2/c2-client-bundle/c2-client-http/pom.xml @@ -32,7 +32,6 @@ limitations under the License. <groupId>org.apache.nifi</groupId> <artifactId>c2-client-api</artifactId> <version>1.17.0-SNAPSHOT</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.nifi</groupId> diff --git a/c2/c2-client-bundle/c2-client-service/pom.xml b/c2/c2-client-bundle/c2-client-service/pom.xml index b45f7d225b..42fc19f9c9 100644 --- a/c2/c2-client-bundle/c2-client-service/pom.xml +++ b/c2/c2-client-bundle/c2-client-service/pom.xml @@ -32,7 +32,6 @@ limitations under the License. <groupId>org.apache.nifi</groupId> <artifactId>c2-client-api</artifactId> <version>1.17.0-SNAPSHOT</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.nifi</groupId> diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java index 1900685d23..da966c1892 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java @@ -303,7 +303,7 @@ public class StandardFlowService implements FlowService, ProtocolHandler { c2NifiClientService = new C2NifiClientService(nifiProperties, this.controller); c2NifiClientService.start(); } else { - logger.info("C2 Property [{}] missing or disabled: C2 client not created", C2NiFiProperties.C2_ENABLE_KEY); + logger.debug("C2 Property [{}] missing or disabled: C2 client not created", C2NiFiProperties.C2_ENABLE_KEY); c2NifiClientService = null; } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml index 11559ebfd0..15dd9e301b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml @@ -34,11 +34,6 @@ <groupId>org.apache.nifi</groupId> <artifactId>nifi-framework-api</artifactId> </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>c2-client-api</artifactId> - <version>1.17.0-SNAPSHOT</version> - </dependency> <!-- Compile-only dependency. At runtime, the agent will use aspectjweaver.jar directly, not from the classpath (see bootstrap.conf).--> <dependency> diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoaders.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoaders.java index f95ae8c4ef..403f76fe56 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoaders.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoaders.java @@ -20,7 +20,6 @@ import org.apache.nifi.NiFiServer; import org.apache.nifi.bundle.Bundle; import org.apache.nifi.bundle.BundleCoordinate; import org.apache.nifi.bundle.BundleDetails; -import org.apache.nifi.c2.client.api.C2Client; import org.apache.nifi.util.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,7 +42,6 @@ import java.util.stream.Collectors; /** * Used to initialize the extension and framework classloaders. - * * The core framework should obtain a singleton reference from NarClassLoadersHolder. */ public final class NarClassLoaders { @@ -69,7 +67,6 @@ public final class NarClassLoaders { final Bundle frameworkBundle, final Bundle jettyBundle, final NiFiServer serverInstance, - final C2Client c2ClientInstance, final Map<String, Bundle> bundles) { this.frameworkWorkingDir = frameworkDir; this.extensionWorkingDir = extensionDir; @@ -168,7 +165,6 @@ public final class NarClassLoaders { } NiFiServer serverInstance = null; - C2Client c2ClientInstance = null; if (!narWorkingDirContents.isEmpty()) { final List<BundleDetails> narDetails = new ArrayList<>(); final Map<String, String> narCoordinatesToWorkingDir = new HashMap<>(); @@ -311,7 +307,7 @@ public final class NarClassLoaders { .filter(b -> b.getBundleDetails().getCoordinate().getId().equals(JETTY_NAR_ID)) .findFirst().orElse(null); - return new InitContext(frameworkWorkingDir, extensionsWorkingDir, frameworkBundle, jettyBundle, serverInstance, c2ClientInstance, new LinkedHashMap<>(narDirectoryBundleLookup)); + return new InitContext(frameworkWorkingDir, extensionsWorkingDir, frameworkBundle, jettyBundle, serverInstance, new LinkedHashMap<>(narDirectoryBundleLookup)); } /**