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/ecbccae7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/ecbccae7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/ecbccae7 Branch: refs/heads/NIFI-353 Commit: ecbccae7343561e25acc9383b64b8c155f2c5700 Parents: 4c44843 1cca300 Author: Matt Gilman <[email protected]> Authored: Tue Mar 17 23:20:39 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Tue Mar 17 23:20:39 2015 -0400 ---------------------------------------------------------------------- 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 | 4 +- 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 | 2 +- nifi/nifi-external/pom.xml | 2 +- .../nifi-processor-bundle-archetype/pom.xml | 2 +- nifi/nifi-maven-archetypes/pom.xml | 2 +- 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/.gitignore | 1 - .../nifi-cluster-protocol/pom.xml | 67 - .../protocol/ClusterManagerProtocolSender.java | 69 - .../cluster/protocol/ConnectionRequest.java | 44 - .../cluster/protocol/ConnectionResponse.java | 141 - .../apache/nifi/cluster/protocol/Heartbeat.java | 68 - .../nifi/cluster/protocol/NodeBulletins.java | 44 - .../nifi/cluster/protocol/NodeIdentifier.java | 172 - .../cluster/protocol/NodeProtocolSender.java | 73 - .../nifi/cluster/protocol/ProtocolContext.java | 39 - .../cluster/protocol/ProtocolException.java | 40 - .../nifi/cluster/protocol/ProtocolHandler.java | 44 - .../nifi/cluster/protocol/ProtocolListener.java | 72 - .../protocol/ProtocolMessageMarshaller.java | 38 - .../protocol/ProtocolMessageUnmarshaller.java | 38 - .../nifi/cluster/protocol/StandardDataFlow.java | 105 - .../UnknownServiceAddressException.java | 39 - .../impl/ClusterManagerProtocolSenderImpl.java | 245 -- .../ClusterManagerProtocolSenderListener.java | 118 - .../protocol/impl/ClusterServiceDiscovery.java | 181 - .../protocol/impl/ClusterServiceLocator.java | 229 -- .../impl/ClusterServicesBroadcaster.java | 182 - .../protocol/impl/CopyingInputStream.java | 77 - .../impl/MulticastProtocolListener.java | 204 - .../protocol/impl/NodeProtocolSenderImpl.java | 171 - .../impl/NodeProtocolSenderListener.java | 115 - .../protocol/impl/SocketProtocolListener.java | 205 - .../protocol/jaxb/JaxbProtocolContext.java | 148 - .../jaxb/message/AdaptedConnectionRequest.java | 40 - .../jaxb/message/AdaptedConnectionResponse.java | 109 - .../protocol/jaxb/message/AdaptedCounter.java | 56 - .../protocol/jaxb/message/AdaptedDataFlow.java | 64 - .../protocol/jaxb/message/AdaptedHeartbeat.java | 66 - .../jaxb/message/AdaptedNodeBulletins.java | 50 - .../jaxb/message/AdaptedNodeIdentifier.java | 76 - .../jaxb/message/ConnectionRequestAdapter.java | 41 - .../jaxb/message/ConnectionResponseAdapter.java | 55 - .../protocol/jaxb/message/DataFlowAdapter.java | 50 - .../protocol/jaxb/message/HeartbeatAdapter.java | 54 - .../jaxb/message/JaxbProtocolUtils.java | 42 - .../jaxb/message/NodeBulletinsAdapter.java | 48 - .../jaxb/message/NodeIdentifierAdapter.java | 51 - .../protocol/jaxb/message/ObjectFactory.java | 104 - .../message/ConnectionRequestMessage.java | 46 - .../message/ConnectionResponseMessage.java | 66 - .../ControllerStartupFailureMessage.java | 49 - .../protocol/message/DisconnectMessage.java | 55 - .../protocol/message/ExceptionMessage.java | 44 - .../protocol/message/FlowRequestMessage.java | 46 - .../protocol/message/FlowResponseMessage.java | 44 - .../protocol/message/HeartbeatMessage.java | 43 - .../message/MulticastProtocolMessage.java | 66 - .../protocol/message/NodeBulletinsMessage.java | 43 - .../cluster/protocol/message/PingMessage.java | 55 - .../message/PrimaryRoleAssignmentMessage.java | 56 - .../protocol/message/ProtocolMessage.java | 61 - .../message/ReconnectionFailureMessage.java | 45 - .../message/ReconnectionRequestMessage.java | 94 - .../message/ReconnectionResponseMessage.java | 32 - .../message/ServiceBroadcastMessage.java | 64 - .../MulticastConfigurationFactoryBean.java | 60 - .../ServerSocketConfigurationFactoryBean.java | 65 - .../spring/SocketConfigurationFactoryBean.java | 66 - .../resources/nifi-cluster-protocol-context.xml | 110 - .../ClusterManagerProtocolSenderImplTest.java | 134 - .../impl/ClusterServiceDiscoveryTest.java | 135 - .../impl/ClusterServiceLocatorTest.java | 121 - .../impl/ClusterServicesBroadcasterTest.java | 133 - .../impl/MulticastProtocolListenerTest.java | 171 - .../impl/NodeProtocolSenderImplTest.java | 203 - .../impl/testutils/DelayedProtocolHandler.java | 57 - .../testutils/ReflexiveProtocolHandler.java | 47 - .../nifi-framework/nifi-cluster-web/.gitignore | 1 - .../nifi-framework/nifi-cluster-web/pom.xml | 48 - .../nifi/cluster/context/ClusterContext.java | 59 - .../cluster/context/ClusterContextImpl.java | 69 - .../context/ClusterContextThreadLocal.java | 47 - .../ClusterAwareOptimisticLockingManager.java | 96 - .../nifi-framework/nifi-cluster/.gitignore | 1 - .../nifi-framework/nifi-cluster/pom.xml | 130 - .../cluster/client/MulticastTestClient.java | 151 - .../org/apache/nifi/cluster/event/Event.java | 122 - .../apache/nifi/cluster/event/EventManager.java | 65 - .../cluster/event/impl/EventManagerImpl.java | 143 - .../cluster/firewall/ClusterNodeFirewall.java | 35 - .../impl/FileBasedClusterNodeFirewall.java | 207 - .../nifi/cluster/flow/ClusterDataFlow.java | 45 - .../apache/nifi/cluster/flow/DaoException.java | 40 - .../apache/nifi/cluster/flow/DataFlowDao.java | 62 - .../cluster/flow/DataFlowManagementService.java | 115 - .../nifi/cluster/flow/PersistedFlowState.java | 37 - .../nifi/cluster/flow/StaleFlowException.java | 42 - .../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 600 --- .../impl/DataFlowManagementServiceImpl.java | 356 -- .../nifi/cluster/manager/ClusterManager.java | 225 -- .../cluster/manager/HttpClusterManager.java | 169 - .../cluster/manager/HttpRequestReplicator.java | 99 - .../cluster/manager/HttpResponseMapper.java | 42 - .../nifi/cluster/manager/NodeResponse.java | 329 -- .../exception/BlockedByFirewallException.java | 60 - .../manager/exception/ClusterException.java | 40 - .../ConnectingNodeMutableRequestException.java | 41 - ...DisconnectedNodeMutableRequestException.java | 41 - .../exception/IllegalClusterStateException.java | 41 - .../exception/IllegalNodeDeletionException.java | 41 - .../IllegalNodeDisconnectionException.java | 42 - .../IllegalNodeReconnectionException.java | 41 - .../IneligiblePrimaryNodeException.java | 41 - .../exception/MutableRequestException.java | 42 - .../exception/NoConnectedNodesException.java | 41 - .../exception/NoResponseFromNodesException.java | 42 - .../exception/NodeDisconnectionException.java | 41 - .../exception/NodeReconnectionException.java | 40 - .../PrimaryRoleAssignmentException.java | 41 - .../SafeModeMutableRequestException.java | 41 - .../manager/exception/UnknownNodeException.java | 41 - .../exception/UriConstructionException.java | 42 - .../manager/impl/ClusteredEventAccess.java | 135 - .../manager/impl/ClusteredReportingContext.java | 165 - .../manager/impl/HttpRequestReplicatorImpl.java | 531 --- .../manager/impl/HttpResponseMapperImpl.java | 85 - .../cluster/manager/impl/WebClusterManager.java | 3628 ------------------ .../java/org/apache/nifi/cluster/node/Node.java | 252 -- ...anagerProtocolServiceLocatorFactoryBean.java | 116 - ...FileBasedClusterNodeFirewallFactoryBean.java | 58 - .../spring/WebClusterManagerFactoryBean.java | 139 - .../reporting/ClusteredReportingTaskNode.java | 49 - .../resources/nifi-cluster-manager-context.xml | 124 - .../event/impl/EventManagerImplTest.java | 119 - .../impl/FileBasedClusterNodeFirewallTest.java | 98 - .../impl/DataFlowManagementServiceImplTest.java | 343 -- .../impl/HttpRequestReplicatorImplTest.java | 368 -- .../impl/HttpResponseMapperImplTest.java | 126 - .../manager/impl/TestWebClusterManager.java | 54 - .../cluster/manager/testutils/HttpRequest.java | 239 -- .../cluster/manager/testutils/HttpResponse.java | 93 - .../manager/testutils/HttpResponseAction.java | 60 - .../cluster/manager/testutils/HttpServer.java | 240 -- .../ClusterManagerProtocolSenderImplTest.java | 133 - .../impl/ClusterServiceLocatorTest.java | 119 - .../impl/ClusterServicesBroadcasterTest.java | 131 - .../impl/MulticastProtocolListenerTest.java | 171 - .../impl/NodeProtocolSenderImplTest.java | 201 - .../impl/SocketProtocolListenerTest.java | 132 - .../testutils/DelayedProtocolHandler.java | 57 - .../testutils/ReflexiveProtocolHandler.java | 47 - .../src/test/resources/logback-test.xml | 48 - .../apache/nifi/cluster/firewall/impl/empty.txt | 0 .../apache/nifi/cluster/firewall/impl/ips.txt | 12 - .../nifi-file-authorization-provider/pom.xml | 2 +- .../nifi-framework-cluster-protocol/.gitignore | 1 + .../nifi-framework-cluster-protocol/pom.xml | 67 + .../protocol/ClusterManagerProtocolSender.java | 69 + .../cluster/protocol/ConnectionRequest.java | 44 + .../cluster/protocol/ConnectionResponse.java | 141 + .../apache/nifi/cluster/protocol/Heartbeat.java | 68 + .../nifi/cluster/protocol/NodeBulletins.java | 44 + .../nifi/cluster/protocol/NodeIdentifier.java | 172 + .../cluster/protocol/NodeProtocolSender.java | 73 + .../nifi/cluster/protocol/ProtocolContext.java | 39 + .../cluster/protocol/ProtocolException.java | 40 + .../nifi/cluster/protocol/ProtocolHandler.java | 44 + .../nifi/cluster/protocol/ProtocolListener.java | 72 + .../protocol/ProtocolMessageMarshaller.java | 38 + .../protocol/ProtocolMessageUnmarshaller.java | 38 + .../nifi/cluster/protocol/StandardDataFlow.java | 105 + .../UnknownServiceAddressException.java | 39 + .../impl/ClusterManagerProtocolSenderImpl.java | 245 ++ .../ClusterManagerProtocolSenderListener.java | 118 + .../protocol/impl/ClusterServiceDiscovery.java | 181 + .../protocol/impl/ClusterServiceLocator.java | 229 ++ .../impl/ClusterServicesBroadcaster.java | 182 + .../protocol/impl/CopyingInputStream.java | 77 + .../impl/MulticastProtocolListener.java | 204 + .../protocol/impl/NodeProtocolSenderImpl.java | 171 + .../impl/NodeProtocolSenderListener.java | 115 + .../protocol/impl/SocketProtocolListener.java | 205 + .../protocol/jaxb/JaxbProtocolContext.java | 148 + .../jaxb/message/AdaptedConnectionRequest.java | 40 + .../jaxb/message/AdaptedConnectionResponse.java | 109 + .../protocol/jaxb/message/AdaptedCounter.java | 56 + .../protocol/jaxb/message/AdaptedDataFlow.java | 64 + .../protocol/jaxb/message/AdaptedHeartbeat.java | 66 + .../jaxb/message/AdaptedNodeBulletins.java | 50 + .../jaxb/message/AdaptedNodeIdentifier.java | 76 + .../jaxb/message/ConnectionRequestAdapter.java | 41 + .../jaxb/message/ConnectionResponseAdapter.java | 55 + .../protocol/jaxb/message/DataFlowAdapter.java | 50 + .../protocol/jaxb/message/HeartbeatAdapter.java | 54 + .../jaxb/message/JaxbProtocolUtils.java | 42 + .../jaxb/message/NodeBulletinsAdapter.java | 48 + .../jaxb/message/NodeIdentifierAdapter.java | 51 + .../protocol/jaxb/message/ObjectFactory.java | 104 + .../message/ConnectionRequestMessage.java | 46 + .../message/ConnectionResponseMessage.java | 66 + .../ControllerStartupFailureMessage.java | 49 + .../protocol/message/DisconnectMessage.java | 55 + .../protocol/message/ExceptionMessage.java | 44 + .../protocol/message/FlowRequestMessage.java | 46 + .../protocol/message/FlowResponseMessage.java | 44 + .../protocol/message/HeartbeatMessage.java | 43 + .../message/MulticastProtocolMessage.java | 66 + .../protocol/message/NodeBulletinsMessage.java | 43 + .../cluster/protocol/message/PingMessage.java | 55 + .../message/PrimaryRoleAssignmentMessage.java | 56 + .../protocol/message/ProtocolMessage.java | 61 + .../message/ReconnectionFailureMessage.java | 45 + .../message/ReconnectionRequestMessage.java | 94 + .../message/ReconnectionResponseMessage.java | 32 + .../message/ServiceBroadcastMessage.java | 64 + .../MulticastConfigurationFactoryBean.java | 60 + .../ServerSocketConfigurationFactoryBean.java | 65 + .../spring/SocketConfigurationFactoryBean.java | 66 + .../resources/nifi-cluster-protocol-context.xml | 110 + .../ClusterManagerProtocolSenderImplTest.java | 134 + .../impl/ClusterServiceDiscoveryTest.java | 135 + .../impl/ClusterServiceLocatorTest.java | 121 + .../impl/ClusterServicesBroadcasterTest.java | 133 + .../impl/MulticastProtocolListenerTest.java | 171 + .../impl/NodeProtocolSenderImplTest.java | 203 + .../impl/testutils/DelayedProtocolHandler.java | 57 + .../testutils/ReflexiveProtocolHandler.java | 47 + .../nifi-framework-cluster-web/.gitignore | 1 + .../nifi-framework-cluster-web/pom.xml | 48 + .../nifi/cluster/context/ClusterContext.java | 59 + .../cluster/context/ClusterContextImpl.java | 69 + .../context/ClusterContextThreadLocal.java | 47 + .../ClusterAwareOptimisticLockingManager.java | 96 + .../nifi-framework-cluster/.gitignore | 1 + .../nifi-framework-cluster/pom.xml | 144 + .../cluster/client/MulticastTestClient.java | 151 + .../org/apache/nifi/cluster/event/Event.java | 122 + .../apache/nifi/cluster/event/EventManager.java | 65 + .../cluster/event/impl/EventManagerImpl.java | 143 + .../cluster/firewall/ClusterNodeFirewall.java | 35 + .../impl/FileBasedClusterNodeFirewall.java | 207 + .../nifi/cluster/flow/ClusterDataFlow.java | 45 + .../apache/nifi/cluster/flow/DaoException.java | 40 + .../apache/nifi/cluster/flow/DataFlowDao.java | 62 + .../cluster/flow/DataFlowManagementService.java | 115 + .../nifi/cluster/flow/PersistedFlowState.java | 37 + .../nifi/cluster/flow/StaleFlowException.java | 42 + .../nifi/cluster/flow/impl/DataFlowDaoImpl.java | 600 +++ .../impl/DataFlowManagementServiceImpl.java | 356 ++ .../nifi/cluster/manager/ClusterManager.java | 225 ++ .../cluster/manager/HttpClusterManager.java | 169 + .../cluster/manager/HttpRequestReplicator.java | 99 + .../cluster/manager/HttpResponseMapper.java | 42 + .../nifi/cluster/manager/NodeResponse.java | 329 ++ .../exception/BlockedByFirewallException.java | 60 + .../manager/exception/ClusterException.java | 40 + .../ConnectingNodeMutableRequestException.java | 41 + ...DisconnectedNodeMutableRequestException.java | 41 + .../exception/IllegalClusterStateException.java | 41 + .../exception/IllegalNodeDeletionException.java | 41 + .../IllegalNodeDisconnectionException.java | 42 + .../IllegalNodeReconnectionException.java | 41 + .../IneligiblePrimaryNodeException.java | 41 + .../exception/MutableRequestException.java | 42 + .../exception/NoConnectedNodesException.java | 41 + .../exception/NoResponseFromNodesException.java | 42 + .../exception/NodeDisconnectionException.java | 41 + .../exception/NodeReconnectionException.java | 40 + .../PrimaryRoleAssignmentException.java | 41 + .../SafeModeMutableRequestException.java | 41 + .../manager/exception/UnknownNodeException.java | 41 + .../exception/UriConstructionException.java | 42 + .../manager/impl/ClusteredEventAccess.java | 135 + .../manager/impl/ClusteredReportingContext.java | 165 + .../manager/impl/HttpRequestReplicatorImpl.java | 531 +++ .../manager/impl/HttpResponseMapperImpl.java | 85 + .../cluster/manager/impl/WebClusterManager.java | 3628 ++++++++++++++++++ .../java/org/apache/nifi/cluster/node/Node.java | 252 ++ ...anagerProtocolServiceLocatorFactoryBean.java | 116 + ...FileBasedClusterNodeFirewallFactoryBean.java | 58 + .../spring/WebClusterManagerFactoryBean.java | 139 + .../reporting/ClusteredReportingTaskNode.java | 49 + .../resources/nifi-cluster-manager-context.xml | 124 + .../event/impl/EventManagerImplTest.java | 119 + .../impl/FileBasedClusterNodeFirewallTest.java | 98 + .../impl/DataFlowManagementServiceImplTest.java | 343 ++ .../impl/HttpRequestReplicatorImplTest.java | 368 ++ .../impl/HttpResponseMapperImplTest.java | 126 + .../manager/impl/TestWebClusterManager.java | 54 + .../cluster/manager/testutils/HttpRequest.java | 239 ++ .../cluster/manager/testutils/HttpResponse.java | 93 + .../manager/testutils/HttpResponseAction.java | 60 + .../cluster/manager/testutils/HttpServer.java | 240 ++ .../ClusterManagerProtocolSenderImplTest.java | 133 + .../impl/ClusterServiceLocatorTest.java | 119 + .../impl/ClusterServicesBroadcasterTest.java | 131 + .../impl/MulticastProtocolListenerTest.java | 171 + .../impl/NodeProtocolSenderImplTest.java | 201 + .../impl/SocketProtocolListenerTest.java | 132 + .../testutils/DelayedProtocolHandler.java | 57 + .../testutils/ReflexiveProtocolHandler.java | 47 + .../src/test/resources/logback-test.xml | 48 + .../apache/nifi/cluster/firewall/impl/empty.txt | 0 .../apache/nifi/cluster/firewall/impl/ips.txt | 12 + .../nifi-framework-core-api/pom.xml | 2 +- .../nifi-framework/nifi-framework-core/pom.xml | 21 +- .../nifi-framework/nifi-nar-utils/pom.xml | 2 +- .../nifi-framework/nifi-resources/pom.xml | 2 +- .../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 | 15 +- .../nifi-framework/nifi-web/pom.xml | 10 +- .../nifi-framework/pom.xml | 8 +- .../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 | 2 +- .../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 | 44 +- .../src/main/resources/META-INF/LICENSE | 38 - .../src/main/resources/META-INF/NOTICE | 37 +- .../nifi-kite-processors/pom.xml | 18 +- .../processors/kite/AbstractKiteProcessor.java | 8 +- .../nifi/processors/kite/ConvertCSVToAvro.java | 25 +- .../nifi/processors/kite/ConvertJSONToAvro.java | 17 +- .../nifi/processors/kite/JSONFileReader.java | 114 - .../processors/kite/StoreInKiteDataset.java | 7 +- .../data/spi/filesystem/CSVFileReaderFixed.java | 172 - .../nifi/processors/kite/TestGetSchema.java | 3 + nifi/nifi-nar-bundles/nifi-kite-bundle/pom.xml | 18 +- .../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 | 88 +- .../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 | 2 +- .../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 | 103 +- 398 files changed, 18657 insertions(+), 18859 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ecbccae7/nifi/nifi-assembly/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ecbccae7/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/ecbccae7/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/ecbccae7/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 629e117,11c3c0a..e96ee04 --- 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.3-incubating-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> <artifactId>nifi-web-ui</artifactId> <type>war</type> - <version>0.0.3-incubating-SNAPSHOT</version> + <version>0.1.0-incubating-SNAPSHOT</version> </dependency> </dependencies> </dependencyManagement> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ecbccae7/nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml ---------------------------------------------------------------------- diff --cc nifi/nifi-nar-bundles/nifi-framework-bundle/pom.xml index 799d6dc,18f889c..1bccc6d --- 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.3-incubating-SNAPSHOT</version> + <version>0.1.0-incubating-SNAPSHOT</version> </dependency> <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-web-content-access</artifactId> + <version>0.0.3-incubating-SNAPSHOT</version> + </dependency> + <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-security</artifactId> - <version>0.0.3-incubating-SNAPSHOT</version> + <version>0.1.0-incubating-SNAPSHOT</version> </dependency> <dependency> <groupId>org.apache.nifi</groupId> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ecbccae7/nifi/nifi-nar-bundles/nifi-standard-bundle/nifi-standard-nar/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/ecbccae7/nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml ---------------------------------------------------------------------- diff --cc nifi/nifi-nar-bundles/nifi-standard-bundle/pom.xml index 493e1cf,1701c85..0463592 --- 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.3-incubating-SNAPSHOT</version> + <version>0.1.0-incubating-SNAPSHOT</version> </dependency> + <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-standard-content-viewer</artifactId> + <type>war</type> + <version>0.0.3-incubating-SNAPSHOT</version> + </dependency> </dependencies> </dependencyManagement>
