Repository: nifi-minifi Updated Branches: refs/heads/master bf3f7c12f -> 6bdf1fdca
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 <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi/commit/6bdf1fdc Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/6bdf1fdc Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/6bdf1fdc Branch: refs/heads/master Commit: 6bdf1fdca53fa296bf051782b271dd52b377badd Parents: bf3f7c1 Author: Aldrin Piri <[email protected]> Authored: Tue Oct 3 21:42:49 2017 -0400 Committer: joewitt <[email protected]> Committed: Fri Oct 6 13:50:22 2017 -0400 ---------------------------------------------------------------------- minifi-assembly/pom.xml | 14 -------------- .../minifi-framework-nar/pom.xml | 6 ++++++ minifi-nar-bundles/minifi-standard-nar/pom.xml | 15 ++++++++++----- 3 files changed, 16 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/6bdf1fdc/minifi-assembly/pom.xml ---------------------------------------------------------------------- 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 @@ limitations under the License. <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 @@ limitations under the License. </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 @@ limitations under the License. <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> http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/6bdf1fdc/minifi-nar-bundles/minifi-framework-bundle/minifi-framework-nar/pom.xml ---------------------------------------------------------------------- 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 @@ limitations under the License. <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> http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/6bdf1fdc/minifi-nar-bundles/minifi-standard-nar/pom.xml ---------------------------------------------------------------------- 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 @@ limitations under the License. <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 @@ limitations under the License. <scope>provided</scope> </dependency> </dependencies> -</project> \ No newline at end of file +</project>
