Merge branch 'develop' into NIFI-353
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2b07b0bc Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2b07b0bc Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2b07b0bc Branch: refs/heads/NIFI-353 Commit: 2b07b0bc1da9f4da6f40c31258c66afed30ffa4e Parents: f920902 eb757a4 Author: joewitt <joew...@apache.org> Authored: Mon Mar 16 16:38:08 2015 -0400 Committer: joewitt <joew...@apache.org> Committed: Mon Mar 16 16:38:08 2015 -0400 ---------------------------------------------------------------------- nifi/NOTICE | 5 - nifi/nifi-api/pom.xml | 2 +- nifi/nifi-assembly/pom.xml | 2 +- nifi/nifi-bootstrap/pom.xml | 2 +- .../nifi-data-provenance-utils/pom.xml | 2 +- .../nifi-expression-language/pom.xml | 2 +- .../nifi-commons/nifi-flowfile-packager/pom.xml | 2 +- nifi/nifi-commons/nifi-logging-utils/pom.xml | 2 +- .../nifi-processor-utilities/pom.xml | 2 +- nifi/nifi-commons/nifi-properties/pom.xml | 2 +- nifi/nifi-commons/nifi-security-utils/pom.xml | 2 +- .../nifi-site-to-site-client/pom.xml | 8 +- nifi/nifi-commons/nifi-socket-utils/pom.xml | 2 +- nifi/nifi-commons/nifi-utils/pom.xml | 4 +- nifi/nifi-commons/nifi-web-utils/pom.xml | 2 +- nifi/nifi-commons/nifi-write-ahead-log/pom.xml | 2 +- nifi/nifi-commons/pom.xml | 2 +- nifi/nifi-docs/pom.xml | 2 +- nifi/nifi-external/nifi-spark-receiver/pom.xml | 72 +++---- nifi/nifi-external/pom.xml | 2 +- .../nifi-processor-bundle-archetype/pom.xml | 6 +- nifi/nifi-maven-archetypes/pom.xml | 5 +- nifi/nifi-mock/pom.xml | 2 +- .../nifi-framework-nar/pom.xml | 2 +- .../nifi-framework/nifi-administration/pom.xml | 2 +- .../nifi-framework/nifi-client-dto/pom.xml | 2 +- .../nifi-cluster-authorization-provider/pom.xml | 2 +- .../nifi-cluster-protocol/pom.xml | 2 +- .../nifi-framework/nifi-cluster-web/pom.xml | 2 +- .../nifi-framework/nifi-cluster/pom.xml | 2 +- .../nifi-file-authorization-provider/pom.xml | 2 +- .../nifi-framework-core-api/pom.xml | 2 +- .../nifi-framework/nifi-framework-core/pom.xml | 2 +- .../nifi-framework/nifi-nar-utils/pom.xml | 2 +- .../nifi-framework/nifi-resources/LICENSE | 202 +++++++++++++++++++ .../nifi-framework/nifi-resources/NOTICE | 5 + .../nifi-framework/nifi-resources/pom.xml | 2 +- .../src/main/assembly/dependencies.xml | 16 ++ .../nifi-framework/nifi-runtime/pom.xml | 2 +- .../nifi-framework/nifi-security/pom.xml | 2 +- .../nifi-framework/nifi-site-to-site/pom.xml | 2 +- .../nifi-framework/nifi-user-actions/pom.xml | 2 +- .../nifi-web/nifi-custom-ui-utilities/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-jetty/pom.xml | 2 +- .../nifi-web/nifi-web-api/pom.xml | 4 +- .../nifi-web/nifi-web-docs/pom.xml | 2 +- .../nifi-web/nifi-web-error/pom.xml | 2 +- .../nifi-web-optimistic-locking/pom.xml | 2 +- .../nifi-web/nifi-web-security/pom.xml | 2 +- .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 2 +- .../nifi-framework/nifi-web/pom.xml | 10 +- .../nifi-framework/pom.xml | 2 +- .../nifi-framework-bundle/pom.xml | 34 ++-- .../nifi-hadoop-bundle/nifi-hadoop-nar/pom.xml | 2 +- .../nifi-hdfs-processors/pom.xml | 2 +- .../nifi-nar-bundles/nifi-hadoop-bundle/pom.xml | 4 +- .../nifi-hadoop-libraries-nar/pom.xml | 5 +- .../nifi-hadoop-libraries-bundle/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-jetty-bundle/pom.xml | 2 +- .../nifi-kafka-bundle/nifi-kafka-nar/pom.xml | 2 +- .../nifi-kafka-processors/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-kafka-bundle/pom.xml | 4 +- .../nifi-kite-bundle/nifi-kite-nar/pom.xml | 2 +- .../nifi-kite-processors/pom.xml | 2 +- nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml | 4 +- .../pom.xml | 2 +- .../nifi-provenance-repository-nar/pom.xml | 2 +- .../nifi-volatile-provenance-repository/pom.xml | 2 +- .../nifi-provenance-repository-bundle/pom.xml | 6 +- .../nifi-standard-nar/pom.xml | 2 +- .../nifi-standard-prioritizers/pom.xml | 2 +- .../nifi-standard-processors/pom.xml | 2 +- .../nifi-standard-reporting-tasks/pom.xml | 2 +- .../nifi-standard-bundle/pom.xml | 8 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../nifi-distributed-cache-protocol/pom.xml | 2 +- .../nifi-distributed-cache-server/pom.xml | 2 +- .../nifi-distributed-cache-services-nar/pom.xml | 2 +- .../pom.xml | 2 +- .../nifi-http-context-map-api/pom.xml | 4 +- .../nifi-http-context-map-nar/pom.xml | 2 +- .../nifi-http-context-map/pom.xml | 2 +- .../nifi-http-context-map-bundle/pom.xml | 2 +- .../nifi-load-distribution-service-api/pom.xml | 2 +- .../nifi-ssl-context-nar/pom.xml | 2 +- .../nifi-ssl-context-service/pom.xml | 2 +- .../nifi-ssl-context-bundle/pom.xml | 2 +- .../nifi-ssl-context-service-api/pom.xml | 2 +- .../nifi-standard-services-api-nar/pom.xml | 2 +- .../nifi-standard-services/pom.xml | 2 +- .../nifi-update-attribute-model/pom.xml | 2 +- .../nifi-update-attribute-nar/pom.xml | 2 +- .../nifi-update-attribute-processor/pom.xml | 2 +- .../nifi-update-attribute-ui/pom.xml | 2 +- .../nifi-update-attribute-bundle/pom.xml | 8 +- nifi/nifi-nar-bundles/pom.xml | 30 +-- nifi/pom.xml | 68 +++---- 98 files changed, 438 insertions(+), 226 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2b07b0bc/nifi/nifi-assembly/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2b07b0bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-jetty/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2b07b0bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2b07b0bc/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml ---------------------------------------------------------------------- diff --cc nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml index 5f3c7ce,c29bada..af059df --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/pom.xml @@@ -56,15 -54,9 +56,15 @@@ </dependency> <dependency> <groupId>org.apache.nifi</groupId> + <artifactId>nifi-web-content-viewer</artifactId> + <type>war</type> + <version>0.0.2-incubating-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> <artifactId>nifi-web-ui</artifactId> <type>war</type> - <version>0.0.2-incubating-SNAPSHOT</version> + <version>0.0.3-incubating-SNAPSHOT</version> </dependency> </dependencies> </dependencyManagement> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2b07b0bc/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml ---------------------------------------------------------------------- diff --cc nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 89b834f,043d80a..2484b61 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml @@@ -61,17 -61,12 +61,17 @@@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-client-dto</artifactId> - <version>0.0.2-incubating-SNAPSHOT</version> + <version>0.0.3-incubating-SNAPSHOT</version> </dependency> <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-web-content-access</artifactId> + <version>0.0.2-incubating-SNAPSHOT</version> + </dependency> + <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-security</artifactId> - <version>0.0.2-incubating-SNAPSHOT</version> + <version>0.0.3-incubating-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2b07b0bc/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2b07b0bc/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml ---------------------------------------------------------------------- diff --cc nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml index dca03c9,84f6eb5..28c144d --- a/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml +++ b/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml @@@ -45,14 -43,8 +45,14 @@@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-standard-reporting-tasks</artifactId> - <version>0.0.2-incubating-SNAPSHOT</version> + <version>0.0.3-incubating-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-standard-content-viewer</artifactId> + <type>war</type> + <version>0.0.2-incubating-SNAPSHOT</version> + </dependency> </dependencies> </dependencyManagement>
