MINIFI-403 - This closes #91. Adjusting included NiFi dependencies and remove those API
JARs that were treated as System bundles preventing dependent NARs from
finding a compatible API NAR.
Signed-off-by: joewitt <joewitt@apache.org>
diff --git a/minifi-assembly/pom.xml b/minifi-assembly/pom.xml
index 5995ef4..bd55ee2 100644
--- a/minifi-assembly/pom.xml
+++ b/minifi-assembly/pom.xml
@@ -142,12 +142,6 @@
<version>0.2.1-SNAPSHOT</version>
</dependency>
- <!-- MiNiFi NiFi Dependencies -->
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-processor-utils</artifactId>
- </dependency>
-
<!-- NiFi Assembly Dependencies-->
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -155,10 +149,6 @@
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
- <artifactId>nifi-ssl-context-service-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
<artifactId>nifi-framework-api</artifactId>
</dependency>
<dependency>
@@ -187,10 +177,6 @@
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-persistent-provenance-repository</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-distributed-cache-client-service-api</artifactId>
- </dependency>
<!-- Provided in NiFi so must include here too -->
<dependency>
diff --git a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
index ba7a4d9..e8d8c23 100644
--- a/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
+++ b/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml
@@ -43,6 +43,12 @@
<artifactId>minifi-api</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-standard-services-api-nar</artifactId>
+ <type>nar</type>
+ <scope>provided</scope>
+ </dependency>
<!-- NiFi Framework level dependencies -->
<dependency>
diff --git a/minifi-nar-bundles/minifi-standard-nar/pom.xml b/minifi-nar-bundles/minifi-standard-nar/pom.xml
index 03762f9..36fc9ee 100644
--- a/minifi-nar-bundles/minifi-standard-nar/pom.xml
+++ b/minifi-nar-bundles/minifi-standard-nar/pom.xml
@@ -33,13 +33,18 @@
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
- <artifactId>nifi-standard-services-api-nar</artifactId>
- <type>nar</type>
+ <artifactId>nifi-standard-processors</artifactId>
+ <version>${org.apache.nifi.version}</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
- <artifactId>nifi-standard-processors</artifactId>
- <version>${org.apache.nifi.version}</version>
+ <artifactId>nifi-distributed-cache-client-service-api</artifactId>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>nifi-standard-services-api-nar</artifactId>
+ <type>nar</type>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -98,4 +103,4 @@
<scope>provided</scope>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
