Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-10286 This closes #6251. Removed c2-client-api references from nifi-nar-utils 

Signed-off-by: Joe Witt <joewitt@apache.org>
This commit is contained in:
exceptionfactory 2022-07-27 07:55:46 -05:00 committed by Joe Witt
parent 9bb22fcb11
commit afa85a03ce
No known key found for this signature in database
GPG Key ID: 9093BF854F811A1A
5 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
c2/c2-client-bundle/c2-client-http/pom.xml
View File

@ -32,7 +32,6 @@ limitations under the License.
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>
<artifactId>c2-client-api</artifactId> <artifactId>c2-client-api</artifactId>
<version>1.17.0-SNAPSHOT</version> <version>1.17.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>

1
c2/c2-client-bundle/c2-client-service/pom.xml
View File

@ -32,7 +32,6 @@ limitations under the License.
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>
<artifactId>c2-client-api</artifactId> <artifactId>c2-client-api</artifactId>
<version>1.17.0-SNAPSHOT</version> <version>1.17.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-core/src/main/java/org/apache/nifi/controller/StandardFlowService.java
View File

@ -303,7 +303,7 @@ public class StandardFlowService implements FlowService, ProtocolHandler {
c2NifiClientService = new C2NifiClientService(nifiProperties, this.controller); c2NifiClientService = new C2NifiClientService(nifiProperties, this.controller);
c2NifiClientService.start(); c2NifiClientService.start();
} else { } 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; c2NifiClientService = null;
} }
} }

5
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/pom.xml
View File

@ -34,11 +34,6 @@
<groupId>org.apache.nifi</groupId> <groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-api</artifactId> <artifactId>nifi-framework-api</artifactId>
</dependency> </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).--> <!-- Compile-only dependency. At runtime, the agent will use aspectjweaver.jar directly, not from the classpath (see bootstrap.conf).-->
<dependency> <dependency>

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-nar-utils/src/main/java/org/apache/nifi/nar/NarClassLoaders.java
View File

@ -20,7 +20,6 @@ import org.apache.nifi.NiFiServer;
import org.apache.nifi.bundle.Bundle; import org.apache.nifi.bundle.Bundle;
import org.apache.nifi.bundle.BundleCoordinate; import org.apache.nifi.bundle.BundleCoordinate;
import org.apache.nifi.bundle.BundleDetails; import org.apache.nifi.bundle.BundleDetails;
import org.apache.nifi.c2.client.api.C2Client;
import org.apache.nifi.util.FileUtils; import org.apache.nifi.util.FileUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -43,7 +42,6 @@ import java.util.stream.Collectors;
/** /**
* Used to initialize the extension and framework classloaders. * Used to initialize the extension and framework classloaders.
*
* The core framework should obtain a singleton reference from NarClassLoadersHolder. * The core framework should obtain a singleton reference from NarClassLoadersHolder.
*/ */
public final class NarClassLoaders { public final class NarClassLoaders {
@ -69,7 +67,6 @@ public final class NarClassLoaders {
final Bundle frameworkBundle, final Bundle frameworkBundle,
final Bundle jettyBundle, final Bundle jettyBundle,
final NiFiServer serverInstance, final NiFiServer serverInstance,
final C2Client c2ClientInstance,
final Map<String, Bundle> bundles) { final Map<String, Bundle> bundles) {
this.frameworkWorkingDir = frameworkDir; this.frameworkWorkingDir = frameworkDir;
this.extensionWorkingDir = extensionDir; this.extensionWorkingDir = extensionDir;
@ -168,7 +165,6 @@ public final class NarClassLoaders {
} }
NiFiServer serverInstance = null; NiFiServer serverInstance = null;
C2Client c2ClientInstance = null;
if (!narWorkingDirContents.isEmpty()) { if (!narWorkingDirContents.isEmpty()) {
final List<BundleDetails> narDetails = new ArrayList<>(); final List<BundleDetails> narDetails = new ArrayList<>();
final Map<String, String> narCoordinatesToWorkingDir = new HashMap<>(); 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)) .filter(b -> b.getBundleDetails().getCoordinate().getId().equals(JETTY_NAR_ID))
.findFirst().orElse(null); .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));
} }
/** /**