Repository: nifi-minifi Updated Branches: refs/heads/master ec04ec95e -> 49defc148
MINIFI-21 MINIFI-24 Excluding duplicated dependencies transitively provided to the assembly. Excluding NiFi specific configuration files that dealt with user facing components removed in MiNiFi. This closes #27 Signed-off-by: Joseph Percivall <[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/49defc14 Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi/tree/49defc14 Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi/diff/49defc14 Branch: refs/heads/master Commit: 49defc148b034f1ff314818d06b67f1e43a22c6e Parents: ec04ec9 Author: Aldrin Piri <[email protected]> Authored: Tue Jul 5 13:57:53 2016 -0400 Committer: Joseph Percivall <[email protected]> Committed: Tue Jul 5 16:57:18 2016 -0400 ---------------------------------------------------------------------- .../src/main/assembly/dependencies.xml | 23 ++++++++++++++++++++ 1 file changed, 23 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/49defc14/minifi-assembly/src/main/assembly/dependencies.xml ---------------------------------------------------------------------- diff --git a/minifi-assembly/src/main/assembly/dependencies.xml b/minifi-assembly/src/main/assembly/dependencies.xml index 4fd3fab..659fda3 100644 --- a/minifi-assembly/src/main/assembly/dependencies.xml +++ b/minifi-assembly/src/main/assembly/dependencies.xml @@ -35,6 +35,23 @@ <excludes> <exclude>minifi-bootstrap</exclude> <exclude>minifi-resources</exclude> + <!-- Filter items introduced via transitive dependencies that are provided in associated NARs --> + <exclude>spring-aop</exclude> + <exclude>spring-context</exclude> + <exclude>spring-security-core</exclude> + <exclude>spring-beans</exclude> + <exclude>swagger-annotations</exclude> + <exclude>slf4j-log4j12</exclude> + <exclude>aspectjweaver</exclude> + <exclude>h2</exclude> + <exclude>netty</exclude> + <exclude>jaxb-impl</exclude> + <exclude>httpclient</exclude> + <exclude>quartz</exclude> + <exclude>mail</exclude> + <exclude>log4j</exclude> + <exclude>lucene-queryparser</exclude> + <exclude>commons-net</exclude> </excludes> </dependencySet> @@ -72,6 +89,12 @@ <includes> <include>conf/*</include> </includes> + <excludes> + <exclude>conf/authority-providers.xml</exclude> + <exclude>conf/authorized-users.xml</exclude> + <exclude>conf/identity-providers.xml</exclude> + <exclude>conf/zookeeper.properties</exclude> + </excludes> </unpackOptions> </dependencySet>
