diff --git a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java b/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java index b6d758cbec..2a182403d9 100644 --- a/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java +++ b/commons/nifi-expression-language/src/main/java/org/apache/nifi/attribute/expression/language/evaluation/cast/DateCastEvaluator.java @@ -72,7 +72,8 @@ public class DateCastEvaluator extends DateEvaluator { final Date date = sdf.parse(value); return new DateQueryResult(date); } catch (final ParseException pe) { - throw new AttributeExpressionLanguageException("Could not parse input as date", pe); + final String details = "Format: '" + DATE_TO_STRING_FORMAT + "' Value: '" + value + "'"; + throw new AttributeExpressionLanguageException("Could not parse date using " + details, pe); } } else if (NUMBER_PATTERN.matcher(value).matches()) { return new DateQueryResult(new Date(Long.valueOf(value))); diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp index 9b2d6df9d8..d2397de73d 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/WEB-INF/jsp/documentation.jsp @@ -44,6 +44,7 @@ diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js index 6983f01ea0..3efdbcce07 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-docs/src/main/webapp/js/application.js @@ -259,7 +259,7 @@ $(document).ready(function () { }); // listen for on the rest api and user guide and developer guide and admin guide and overview - $('a.rest-api, a.user-guide, a.developer-guide, a.admin-guide, a.overview').on('click', function() { + $('a.rest-api, a.user-guide, a.developer-guide, a.admin-guide, a.overview, a.expression-language-guide').on('click', function() { selectComponent($(this).text()); }); diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/graph.css b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/graph.css index fb03260137..041476b5e3 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/graph.css +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/graph.css @@ -30,13 +30,10 @@ } .tooltip { + padding: 10px; display: none; position: absolute; - padding: 10px; z-index: 1000; - border: 3px solid #959FA9; - background-color: #F9F9F9; - color: #454545; } /* svg styles */ diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css index e5c402a8f5..3afdc12b83 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css @@ -111,6 +111,12 @@ div.context-menu-item-text { font-weight: bold !important; } +div.nifi-tooltip { + border: 1px solid #454545; + background-color: #FFFFA3; + color: #454545; +} + .ellipsis { white-space: nowrap; overflow: hidden; diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js index edd2000e57..03715e8d40 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js @@ -97,9 +97,9 @@ nf.CanvasHeader = (function () { }); // setup the tooltip for the refresh icon - $('#refresh-required-icon').qtip($.extend(nf.CanvasUtils.config.systemTooltipConfig, { + $('#refresh-required-icon').qtip($.extend({ content: 'This flow has been modified by another user. Please refresh.' - })); + }, nf.CanvasUtils.config.systemTooltipConfig)); // setup the refresh link actions $('#refresh-required-link').click(function () { diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js index 00142c5a5a..40116ca663 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js @@ -50,30 +50,9 @@ nf.CanvasUtils = (function () { return { config: { - cellTooltipConfig: { - style: { - classes: 'ui-tooltip-tipped ui-tooltip-shadow' - }, - show: { - solo: true, - effect: false - }, - hide: { - effect: false - }, - position: { - target: 'mouse', - viewport: $(window), - adjust: { - x: 8, - y: 8, - method: 'flipinvert flipinvert' - } - } - }, systemTooltipConfig: { style: { - classes: 'ui-tooltip-tipped ui-tooltip-shadow' + classes: 'nifi-tooltip' }, show: { solo: true, @@ -444,7 +423,7 @@ nf.CanvasUtils = (function () { .attr('id', function () { return 'bulletin-tip-' + d.component.id; }) - .attr('class', 'tooltip') + .attr('class', 'tooltip nifi-tooltip') .html(function () { // format the bulletins var bulletins = nf.Common.getFormattedBulletins(d.status.bulletins); @@ -476,12 +455,12 @@ nf.CanvasUtils = (function () { target.on('mouseenter', function () { tip.style('top', (d3.event.pageY + 15) + 'px').style('left', (d3.event.pageX + 15) + 'px').style('display', 'block'); }) - .on('mousemove', function () { - tip.style('top', (d3.event.pageY + 15) + 'px').style('left', (d3.event.pageX + 15) + 'px'); - }) - .on('mouseleave', function () { - tip.style('display', 'none'); - }); + .on('mousemove', function () { + tip.style('top', (d3.event.pageY + 15) + 'px').style('left', (d3.event.pageX + 15) + 'px'); + }) + .on('mouseleave', function () { + tip.style('display', 'none'); + }); }, /** diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js index c4798beadc..eb16ad90cd 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js @@ -695,9 +695,9 @@ nf.Canvas = (function () { bulletinIcon.qtip('option', 'content.text', newBulletins); } else { // no bulletins before, show icon and tips - bulletinIcon.addClass('has-bulletins').qtip($.extend(nf.CanvasUtils.config.systemTooltipConfig, { + bulletinIcon.addClass('has-bulletins').qtip($.extend({ content: newBulletins - })); + }, nf.CanvasUtils.config.systemTooltipConfig)); } // show the icon diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js index ef387d66b2..fd70aa160f 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js @@ -1164,9 +1164,9 @@ nf.ConnectionConfiguration = (function () { // add the description if applicable if (nf.Common.isDefinedAndNotNull(prioritizerType.description)) { - $('').appendTo(prioritizer).qtip($.extend(nf.Common.config.tooltipConfig, { + $('').appendTo(prioritizer).qtip($.extend({ content: nf.Common.escapeHtml(prioritizerType.description) - })); + }, nf.Common.config.tooltipConfig)); } }, diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js index 2eb3f1b3b8..1858e60862 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-draggable.js @@ -87,7 +87,7 @@ nf.Draggable = (function () { var updateConnectionPosition = function(d) { // only update if necessary if (d.component.bends.length === 0) { - return; + return null; } // calculate the new bend points @@ -149,7 +149,10 @@ nf.Draggable = (function () { // go through each selected connection d3.selectAll('g.connection.selected').each(function (d) { - updates.set(d.component.id, updateConnectionPosition(d)); + var connectionUpdate = updateConnectionPosition(d); + if (connectionUpdate !== null) { + updates.set(d.component.id, connectionUpdate); + } }); // go through each selected component @@ -158,7 +161,10 @@ nf.Draggable = (function () { var connections = nf.Connection.getComponentConnections(d.component.id); $.each(connections, function(_, connection) { if (!updates.has(connection.id) && nf.CanvasUtils.getConnectionSourceComponentId(connection) === nf.CanvasUtils.getConnectionDestinationComponentId(connection)) { - updates.set(connection.id, updateConnectionPosition(nf.Connection.get(connection.id))); + var connectionUpdate = updateConnectionPosition(nf.Connection.get(connection.id)); + if (connectionUpdate !== null) { + updates.set(connection.id, connectionUpdate); + } } }); diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js index 4eb365399d..ed584b8566 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js @@ -304,7 +304,7 @@ nf.Port = (function () { .attr('id', function () { return 'run-status-tip-' + d.component.id; }) - .attr('class', 'tooltip') + .attr('class', 'tooltip nifi-tooltip') .html(function () { var list = nf.Common.formatUnorderedList(d.component.validationErrors); if (list === null || list.length === 0) { diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js index 3ffc17bde4..12a652c950 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js @@ -302,9 +302,9 @@ nf.ProcessorPropertyTable = (function () { var tooltip = nf.Common.formatPropertyTooltip(propertyDescriptor, propertyHistory); if (nf.Common.isDefinedAndNotNull(tooltip)) { - infoIcon.qtip($.extend(nf.Common.config.tooltipConfig, { + infoIcon.qtip($.extend({ content: tooltip - })); + }, nf.Common.config.tooltipConfig)); } } }); diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js index 11bc106de8..be6ff1b215 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js @@ -437,7 +437,7 @@ nf.Processor = (function () { .attr('id', function () { return 'run-status-tip-' + d.component.id; }) - .attr('class', 'tooltip') + .attr('class', 'tooltip nifi-tooltip') .html(function () { var list = nf.Common.formatUnorderedList(d.component.validationErrors); if (list === null || list.length === 0) { diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js index 7cce907ab5..caadfea188 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js @@ -231,9 +231,9 @@ nf.RemoteProcessGroupPorts = (function () { editRemotePort.show(); } } else if (port.exists === false) { - $('
').appendTo(portContainerEditContainer).qtip($.extend(nf.Common.config.tooltipConfig, { + $('
').appendTo(portContainerEditContainer).qtip($.extend({ content: 'This port has been removed.' - })); + }, nf.Common.config.tooltipConfig)); } // only allow modifications to transmission when the swtich is defined @@ -364,13 +364,13 @@ nf.RemoteProcessGroupPorts = (function () { // add this ports concurrent tasks $('
' + - '
' + + '
' + 'Concurrent tasks' + 'Info' + - '
' + - '
').append(concurrentTasks).appendTo(concurrentTasksContainer).find('img.concurrent-tasks-info').qtip($.extend(nf.Common.config.tooltipConfig, { + '
' + + '
').append(concurrentTasks).appendTo(concurrentTasksContainer).find('img.concurrent-tasks-info').qtip($.extend({ content: 'The number of tasks that should be concurrently scheduled for this port.' - })); + }, nf.Common.config.tooltipConfig)); var compressionContainer = $('
').appendTo(portContainerDetailsContainer); diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js index 9c6da4c327..e55f5bbf48 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js @@ -568,7 +568,7 @@ nf.RemoteProcessGroup = (function () { .attr('id', function () { return 'authorization-issues-' + d.component.id; }) - .attr('class', 'tooltip') + .attr('class', 'tooltip nifi-tooltip') .html(function () { var list = nf.Common.formatUnorderedList(d.status.authorizationIssues); if (list === null || list.length === 0) { @@ -605,7 +605,7 @@ nf.RemoteProcessGroup = (function () { .attr('id', function () { return 'transmission-secure-' + d.component.id; }) - .attr('class', 'tooltip') + .attr('class', 'tooltip nifi-tooltip') .text(function () { if (d.component.targetSecure === true) { return 'Site-to-Site is secure.'; diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js index 6bf7e08e59..24dcf24596 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js @@ -57,7 +57,7 @@ nf.Common = { config: { tooltipConfig: { style: { - classes: 'ui-tooltip-tipped ui-tooltip-shadow' + classes: 'nifi-tooltip' }, show: { solo: true, diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js index da7c6e95a3..ee7c0c5865 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js @@ -381,9 +381,9 @@ nf.ProcessorDetails = (function () { var tooltip = nf.Common.formatPropertyTooltip(propertyDescriptor, propertyHistory); if (nf.Common.isDefinedAndNotNull(tooltip)) { - infoIcon.qtip($.extend(nf.Common.config.tooltipConfig, { + infoIcon.qtip($.extend({ content: tooltip - })); + }, nf.Common.config.tooltipConfig)); } } }); diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js index f3150b0341..85826ffe28 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js @@ -424,7 +424,7 @@ nf.SummaryTable = (function () { // show the tooltip if (nf.Common.isDefinedAndNotNull(tooltip)) { - bulletinIcon.qtip($.extend(nf.Common.config.tooltipConfig, { + bulletinIcon.qtip($.extend({ content: tooltip, position: { target: 'mouse', @@ -435,7 +435,7 @@ nf.SummaryTable = (function () { method: 'flipinvert flipinvert' } } - })); + }, nf.Common.config.tooltipConfig)); } } }); @@ -817,7 +817,7 @@ nf.SummaryTable = (function () { // show the tooltip if (nf.Common.isDefinedAndNotNull(tooltip)) { - bulletinIcon.qtip($.extend(nf.Common.config.tooltipConfig, { + bulletinIcon.qtip($.extend({ content: tooltip, position: { target: 'mouse', @@ -828,7 +828,7 @@ nf.SummaryTable = (function () { method: 'flipinvert flipinvert' } } - })); + }, nf.Common.config.tooltipConfig)); } } }); @@ -1010,7 +1010,7 @@ nf.SummaryTable = (function () { // show the tooltip if (nf.Common.isDefinedAndNotNull(tooltip)) { - bulletinIcon.qtip($.extend(nf.Common.config.tooltipConfig, { + bulletinIcon.qtip($.extend({ content: tooltip, position: { target: 'mouse', @@ -1021,7 +1021,7 @@ nf.SummaryTable = (function () { method: 'flipinvert flipinvert' } } - })); + }, nf.Common.config.tooltipConfig)); } } }); @@ -1243,7 +1243,7 @@ nf.SummaryTable = (function () { // show the tooltip if (nf.Common.isDefinedAndNotNull(tooltip)) { - bulletinIcon.qtip($.extend(nf.Common.config.tooltipConfig, { + bulletinIcon.qtip($.extend({ content: tooltip, position: { target: 'mouse', @@ -1254,7 +1254,7 @@ nf.SummaryTable = (function () { method: 'flipinvert flipinvert' } } - })); + }, nf.Common.config.tooltipConfig)); } } }); diff --git a/nar-bundles/framework-bundle/pom.xml b/nar-bundles/framework-bundle/pom.xml index daa5256870..f4f499ea1e 100644 --- a/nar-bundles/framework-bundle/pom.xml +++ b/nar-bundles/framework-bundle/pom.xml @@ -37,77 +37,77 @@ org.apache.nifi framework-cluster-protocol - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi framework-cluster-web - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi file-authorization-provider - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi cluster-authorization-provider - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi framework-cluster - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-runtime - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi client-dto - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-security - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi core-api - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi site-to-site - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi framework-core - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-user-actions - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-administration - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-jetty - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi web-optimistic-locking - ${project.version} + 0.0.1-SNAPSHOT diff --git a/nar-bundles/hadoop-bundle/pom.xml b/nar-bundles/hadoop-bundle/pom.xml index 1a6a160f28..89a12e9470 100644 --- a/nar-bundles/hadoop-bundle/pom.xml +++ b/nar-bundles/hadoop-bundle/pom.xml @@ -38,7 +38,7 @@ org.apache.nifi hdfs-processors - ${project.version} + 0.0.1-SNAPSHOT diff --git a/nar-bundles/monitor-threshold-bundle/pom.xml b/nar-bundles/monitor-threshold-bundle/pom.xml index 6cb3af282a..a19153c275 100644 --- a/nar-bundles/monitor-threshold-bundle/pom.xml +++ b/nar-bundles/monitor-threshold-bundle/pom.xml @@ -38,13 +38,13 @@ org.apache.nifi monitor-threshold-processor - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi monitor-threshold-ui war - ${project.version} + 0.0.1-SNAPSHOT diff --git a/nar-bundles/persistent-provenance-repository-bundle/pom.xml b/nar-bundles/persistent-provenance-repository-bundle/pom.xml index 7dc3f3463e..92dfc3b7d4 100644 --- a/nar-bundles/persistent-provenance-repository-bundle/pom.xml +++ b/nar-bundles/persistent-provenance-repository-bundle/pom.xml @@ -35,7 +35,7 @@ org.apache.nifi persistent-provenance-repository - ${project.version} + 0.0.1-SNAPSHOT diff --git a/nar-bundles/pom.xml b/nar-bundles/pom.xml index 7c79a4836f..d21a3bd415 100644 --- a/nar-bundles/pom.xml +++ b/nar-bundles/pom.xml @@ -47,46 +47,46 @@ org.apache.nifi load-distribution-service - ${project.version} + 0.0.1-SNAPSHOT test org.apache.nifi distributed-cache-client-service - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi distributed-cache-client-service-api - ${project.version} + 0.0.1-SNAPSHOT provided org.apache.nifi ssl-context-service-api - ${project.version} + 0.0.1-SNAPSHOT provided org.apache.nifi load-distribution-service-api - ${project.version} + 0.0.1-SNAPSHOT provided org.apache.nifi distributed-cache-protocol - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi distributed-cache-server - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi ssl-context-service - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi @@ -96,37 +96,37 @@ org.apache.nifi http-context-map - ${project.version} - + 0.0.1-SNAPSHOT + org.apache.nifi volatile-provenance-repository - ${project.version} + 0.0.1-SNAPSHOT test org.apache.nifi nifi-api - ${project.version} + 0.0.1-SNAPSHOT provided org.apache.nifi nifi-runtime - ${project.version} + 0.0.1-SNAPSHOT provided org.apache.nifi nifi-nar - ${project.version} + 0.0.1-SNAPSHOT provided org.apache.nifi nifi-properties - ${project.version} + 0.0.1-SNAPSHOT provided diff --git a/nar-bundles/standard-bundle/pom.xml b/nar-bundles/standard-bundle/pom.xml index 9903666ddc..306fd3d05f 100644 --- a/nar-bundles/standard-bundle/pom.xml +++ b/nar-bundles/standard-bundle/pom.xml @@ -42,27 +42,27 @@ org.apache.nifi standard-processors - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi standard-prioritizers - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi standard-reporting-tasks - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi standard-ganglia-reporter - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi jms-processors - ${project.version} + 0.0.1-SNAPSHOT diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java index 5e7ce56e03..2b0b437140 100644 --- a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java +++ b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/ListenHTTP.java @@ -106,12 +106,19 @@ public class ListenHTTP extends AbstractSessionFactoryProcessor { .required(false) .identifiesControllerService(SSLContextService.class) .build(); + public static final PropertyDescriptor HEADERS_AS_ATTRIBUTES_REGEX = new PropertyDescriptor.Builder() + .name("HTTP Headers to receive as Attributes (Regex)") + .description("Specifies the Regular Expression that determines the names of HTTP Headers that should be passed along as FlowFile attributes") + .addValidator(StandardValidators.REGULAR_EXPRESSION_VALIDATOR) + .required(false) + .build(); public static final String URI = "/contentListener"; public static final String CONTEXT_ATTRIBUTE_PROCESSOR = "processor"; public static final String CONTEXT_ATTRIBUTE_LOGGER = "logger"; public static final String CONTEXT_ATTRIBUTE_SESSION_FACTORY_HOLDER = "sessionFactoryHolder"; public static final String CONTEXT_ATTRIBUTE_AUTHORITY_PATTERN = "authorityPattern"; + public static final String CONTEXT_ATTRIBUTE_HEADER_PATTERN = "headerPattern"; public static final String CONTEXT_ATTRIBUTE_FLOWFILE_MAP = "flowFileMap"; public static final String CONTEXT_ATTRIBUTE_STREAM_THROTTLER = "streamThrottler"; @@ -131,6 +138,7 @@ public class ListenHTTP extends AbstractSessionFactoryProcessor { descriptors.add(SSL_CONTEXT_SERVICE); descriptors.add(AUTHORIZED_DN_PATTERN); descriptors.add(MAX_UNCONFIRMED_TIME); + descriptors.add(HEADERS_AS_ATTRIBUTES_REGEX); this.properties = Collections.unmodifiableList(descriptors); } @@ -236,6 +244,9 @@ public class ListenHTTP extends AbstractSessionFactoryProcessor { contextHandler.setAttribute(CONTEXT_ATTRIBUTE_AUTHORITY_PATTERN, Pattern.compile(context.getProperty(AUTHORIZED_DN_PATTERN).getValue())); contextHandler.setAttribute(CONTEXT_ATTRIBUTE_STREAM_THROTTLER, streamThrottler); + if (context.getProperty(HEADERS_AS_ATTRIBUTES_REGEX).isSet()) { + contextHandler.setAttribute(CONTEXT_ATTRIBUTE_HEADER_PATTERN, Pattern.compile(context.getProperty(HEADERS_AS_ATTRIBUTES_REGEX).getValue())); + } server.start(); this.server = server; diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java index fb52b80734..cae61f0ff3 100644 --- a/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java +++ b/nar-bundles/standard-bundle/standard-processors/src/main/java/org/apache/nifi/processors/standard/servlets/ListenHTTPServlet.java @@ -20,6 +20,7 @@ import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; import java.security.cert.X509Certificate; +import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -56,7 +57,6 @@ import org.apache.nifi.util.FlowFileUnpackager; import org.apache.nifi.util.FlowFileUnpackagerV1; import org.apache.nifi.util.FlowFileUnpackagerV2; import org.apache.nifi.util.FlowFileUnpackagerV3; - import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; @@ -88,6 +88,7 @@ public class ListenHTTPServlet extends HttpServlet { private ProcessorLog logger; private AtomicReference sessionFactoryHolder; private Pattern authorizedPattern; + private Pattern headerPattern; private ConcurrentMap flowFileMap; private StreamThrottler streamThrottler; @@ -103,6 +104,7 @@ public class ListenHTTPServlet extends HttpServlet { this.logger = (ProcessorLog) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_LOGGER); this.sessionFactoryHolder = (AtomicReference) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_SESSION_FACTORY_HOLDER); this.authorizedPattern = (Pattern) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_AUTHORITY_PATTERN); + this.headerPattern = (Pattern) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_HEADER_PATTERN); this.flowFileMap = (ConcurrentMap) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_FLOWFILE_MAP); this.streamThrottler = (StreamThrottler) context.getAttribute(ListenHTTP.CONTEXT_ATTRIBUTE_STREAM_THROTTLER); } @@ -242,6 +244,16 @@ public class ListenHTTPServlet extends HttpServlet { if (StringUtils.isNotBlank(nameVal)) { attributes.put(CoreAttributes.FILENAME.key(), nameVal); } + + // put arbitrary headers on flow file + for(Enumeration headerEnum = request.getHeaderNames(); + headerEnum.hasMoreElements(); ) { + String headerName = headerEnum.nextElement(); + if (headerPattern != null && headerPattern.matcher(headerName).matches()) { + String headerValue = request.getHeader(headerName); + attributes.put(headerName, headerValue); + } + } String sourceSystemFlowFileIdentifier = attributes.get(CoreAttributes.UUID.key()); if (sourceSystemFlowFileIdentifier != null) { diff --git a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ListenHTTP/index.html b/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ListenHTTP/index.html index 3e79ee16e3..49e85cc825 100644 --- a/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ListenHTTP/index.html +++ b/nar-bundles/standard-bundle/standard-processors/src/main/resources/docs/org.apache.nifi.processors.standard.ListenHTTP/index.html @@ -57,6 +57,12 @@
  • Default value: .*
  • Supports expression language: false
    • +
  • HTTP Headers to receive as Attributes (Regex) +
      +
    • Specifies the Regular Expression that determines the names of HTTP Headers that should be passed along as FlowFile attributes
      • +
    • Default value: no default
      • +
    • Supports expression language: false
      • +
  • Max Unconfirmed FlowFile Time
    • The maximum amount of time to wait for a FlowFile to be confirmed before it is removed from the cache.
      • diff --git a/nar-bundles/update-attribute-bundle/pom.xml b/nar-bundles/update-attribute-bundle/pom.xml index 18d16da47a..28484001fd 100644 --- a/nar-bundles/update-attribute-bundle/pom.xml +++ b/nar-bundles/update-attribute-bundle/pom.xml @@ -38,18 +38,18 @@ org.apache.nifi update-attribute-model - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi update-attribute-processor - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi update-attribute-ui war - ${project.version} + 0.0.1-SNAPSHOT diff --git a/nar-bundles/volatile-provenance-repository-bundle/pom.xml b/nar-bundles/volatile-provenance-repository-bundle/pom.xml index 34b1fa1b7b..5d8c5ba1f4 100644 --- a/nar-bundles/volatile-provenance-repository-bundle/pom.xml +++ b/nar-bundles/volatile-provenance-repository-bundle/pom.xml @@ -36,7 +36,7 @@ org.apache.nifi volatile-provenance-repository - ${project.version} + 0.0.1-SNAPSHOT diff --git a/nifi-docs/pom.xml b/nifi-docs/pom.xml index 8785ea1051..5884f14ab3 100644 --- a/nifi-docs/pom.xml +++ b/nifi-docs/pom.xml @@ -54,7 +54,7 @@ ./images font true - ${project.version} + 0.0.1-SNAPSHOT true - diff --git a/nifi-docs/src/main/asciidoc/overview.adoc b/nifi-docs/src/main/asciidoc/overview.adoc index 3e32bc55b5..158dbc5461 100644 --- a/nifi-docs/src/main/asciidoc/overview.adoc +++ b/nifi-docs/src/main/asciidoc/overview.adoc @@ -22,9 +22,9 @@ Apache NiFi Team What is Apache NiFi? -------------------- Put simply NiFi was built to automate the flow of data between systems. While -the term 'dataflow' is used in a variety of contexts we'll use it here +the term 'dataflow' is used in a variety of contexts, we'll use it here to mean the automated and managed flow of information between systems. This -problem space has been around ever since enterprises had more than one system +problem space has been around ever since enterprises had more than one system, where some of the systems created data and some of the systems consumed data. The problems and solution patterns that emerged have been discussed and articulated extensively. A comprehensive and readily consumed form is found in @@ -45,7 +45,7 @@ What is noise one day becomes signal the next:: Priorities of an organization change - rapidly. Enabling new flows and changing existing ones must be fast. Systems evolve at different rates:: -The protocols and formats used by a given system can change anytime and often irrespective of the systems around them. Dataflow exists to connect what is essentially a massively distributed system of components loosely or not-at-all designed to work together. +The protocols and formats used by a given system can change anytime and often irrespective of the systems around them. Dataflow exists to connect what is essentially a massively distributed system of components that are loosely or not-at-all designed to work together. Compliance and security:: Laws, regulations, and policies change. Business to business agreements change. System to system and system to user interactions must be secure, trusted, accountable. @@ -60,7 +60,7 @@ success of a given enterprise. These include things like; Service Oriented Architecture <>, the rise of the API <><>, Internet of Things <>, and Big Data <>. In addition, the level of rigor necessary for compliance, privacy, and security is constantly on the rise. Even still with -all of these new concepts coming about the patterns and needs of dataflow is +all of these new concepts coming about, the patterns and needs of dataflow are still largely the same. The primary differences then are the scope of complexity, the rate of change necessary to adapt, and that at scale the edge case becomes common occurrence. NiFi is built to help tackle these @@ -78,21 +78,21 @@ the main NiFi concepts and how they map to FBP: | NiFi Term | FBP Term| Description | FlowFile | Information Packet | -A FlowFile represents the objects moving through the system and for each one NiFi -keeps track of a Map of key/value pair attribute strings and its associated +A FlowFile represents each object moving through the system and for each one, NiFi +keeps track of a map of key/value pair attribute strings and its associated content of zero or more bytes. | FlowFile Processor | Black Box | -Processors are what actually performs work. In <> terms a processor is -doing some combination of data Routing, Transformation, or mediation between -systems. Processors have access to attributes of a given flow file and its +Processors actually perform the work. In <> terms a processor is +doing some combination of data Routing, Transformation, or Mediation between +systems. Processors have access to attributes of a given FlowFile and its content stream. Processors can operate on zero or more FlowFiles in a given unit of work and either commit that work or rollback. | Connection | Bounded Buffer | Connections provide the actual linkage between processors. These act as queues and allow various processes to interact at differing rates. These queues then -can be prioritized dynamically and can have upper bounds on load which enables +can be prioritized dynamically and can have upper bounds on load which enable back pressure. | Flow Controller | Scheduler | @@ -103,7 +103,7 @@ between processors. | Process Group | subnet | A Process Group is a specific set of processes and their connections which can -receive data via input ports and which can send data out via output ports. In +receive data via input ports and send data out via output ports. In this manner process groups allow creation of entirely new components simply by composition of other components. @@ -153,10 +153,10 @@ image::nifi-arch-cluster.png["NiFi Cluster Architecture Diagram"] A NiFi cluster is comprised of one or more 'NiFi Nodes' (Node) controlled by a single NiFi Cluster Manager (NCM). The design of clustering is a simple master/slave model where the NCM is the master and the Nodes are the slaves. -The NCM's reason for existence is to keep track of which Nodes are in the flow, +The NCM's reason for existence is to keep track of which Nodes are in the cluster, their status, and to replicate requests to modify or observe the flow. Fundamentally then the NCM keeps the state of the cluster consistent. -While the model is that of master and slave if the master dies the Nodes are all +While the model is that of master and slave, if the master dies the Nodes are all instructed to continue operating as they were to ensure the data flow remains live. The absence of the NCM simply means new nodes cannot come on-line and flow changes cannot occur until the NCM is restored. @@ -164,7 +164,7 @@ cannot occur until the NCM is restored. Performance Expections and Characteristics of NiFi -------------------------------------------------- NiFi is designed to fully leverage the capabilities of the underlying host system -its is operating on. This maximization of resources is particularly strong with +it is operating on. This maximization of resources is particularly strong with regard to CPU and disk. Many more details will be provided on best practices and configuration tips in the Administration Guide. @@ -173,22 +173,22 @@ The throughput or latency one can expect to see will vary greatly on how the system is configured. Given that there are pluggable approaches to most of the major NiFi subsystems the performance will depend on the implementation. But, for something concrete and broadly -applicable lets consider the out of the box default implementations that are used. +applicable, let's consider the out-of-the-box default implementations that are used. These are all persistent with guaranteed delivery and do so using local disk. So -being conservative assume roughly 50 MB/s read/write rate on modest disks or RAID volumes -within a typical server. NiFi for a large class of data flows then should be able to -efficiently reach one hundred or more MB/s of throughput. That is because linear growth -is expected for each physical parition and content repository added to NiFi. This will +being conservative, assume roughly 50 MB/s read/write rate on modest disks or RAID volumes +within a typical server. NiFi for a large class of dataflows then should be able to +efficiently reach 100 or more MB/s of throughput. That is because linear growth +is expected for each physical partition and content repository added to NiFi. This will bottleneck at some point on the FlowFile repository and provenance repository. We plan to provide a benchmarking/performance test template to include in the build which will allow users to easily test their system and to identify where bottlenecks are and at which point they might become a factor. It -should also make it easy for system administrators to make changes and to verity the impact. +should also make it easy for system administrators to make changes and to verify the impact. For CPU:: -The FlowController acts as the engine dictating when a given processor will be +The Flow Controller acts as the engine dictating when a particular processor will be given a thread to execute. Processors should be written to return the thread -as soon as they're done executing their task. The FlowController can be given a +as soon as they're done executing their task. The Flow Controller can be given a configuration value indicating how many threads there should be for the various thread pools it maintains. The ideal number of threads to use will depend on the resources of the host system in terms of numbers of cores, whether that system is @@ -205,7 +205,7 @@ how well the application will run over time. High Level Overview of Key NiFi Features ---------------------------------------- Guaranteed Delivery:: -A core philosophy of NiFi has been that even at very high scale guaranteed delivery +A core philosophy of NiFi has been that even at very high scale, guaranteed delivery is a must. This is achieved through effective use of a purpose-built persistent write-ahead log and content repository. Together they are designed in such a way as to allow for very high transaction rates, effective load-spreading, copy-on-write, @@ -218,12 +218,12 @@ as it reaches a specified age (its value has perished). Prioritized Queuing:: NiFi allows the setting of one or more prioritization schemes for how data is -retrieved from a queue. The default is oldest first but there are times when +retrieved from a queue. The default is oldest first, but there are times when data should be pulled newest first, largest first, or some other custom scheme. -Flow Specific QoS (latency v throughput, loss tolerance, etc..):: +Flow Specific QoS (latency v throughput, loss tolerance, etc.):: There are points of a dataflow where the data is absolutely critical and it is -loss intolerant. There are times when it must be processed and delivered within +loss intolerant. There are also times when it must be processed and delivered within seconds to be of any value. NiFi enables the fine-grained flow specific configuration of these concerns. @@ -237,21 +237,21 @@ Recovery / Recording a rolling buffer of fine-grained history:: NiFi's content repository is designed to act as a rolling buffer of history. Data is removed only as it ages off the content repository or as space is needed. This combined with the data provenance capability makes for an incredibly useful basis -to enable click-to-content, download of content, replay, and all at a specific -point in and objects lifecycle which can even span generations. +to enable click-to-content, download of content, and replay, all at a specific +point in an object's lifecycle which can even span generations. Visual Command and Control:: Dataflows can become quite complex. Being able to visualize those flows and express -them visually can help greatly to reduce that complexity and to identify areas which +them visually can help greatly to reduce that complexity and to identify areas that need to be simplified. NiFi enables not only the visual establishment of dataflows but it does so in real-time. Rather than being 'design and deploy' it is much more like -molding clay. If you make a change to the dataflow that change is taking effect. Changes +molding clay. If you make a change to the dataflow that change immediately takes effect. Changes are fine-grained and isolated to the affected components. You don't need to stop an entire flow or set of flows just to make some specific modification. Flow Templates:: Dataflows tend to be highly pattern oriented and while there are often many different -ways to solve a problem it helps greatly to be able to share those best practices. Templates +ways to solve a problem, it helps greatly to be able to share those best practices. Templates allow subject matter experts to build and publish their flow designs and for others to benefit and collaborate on them. @@ -263,8 +263,8 @@ Security:: either side of the sender/recipient equation. User to system;; NiFi enables 2-Way SSL authentication and provides pluggable authorization so that it can properly control - a users access and at particular levels (read-only, dataflow manager, admin). If a user enters a - sensitive property like a password into the flow it is immediately encrypted server side and never again exposed + a user's access and at particular levels (read-only, dataflow manager, admin). If a user enters a + sensitive property like a password into the flow, it is immediately encrypted server side and never again exposed on the client side even in its encrypted form. Designed for Extension:: @@ -275,12 +275,12 @@ Designed for Extension:: For any component based system one problem that can quickly occur is dependency nightmares. NiFi addresses this by providing a custom class loader model ensuring that each extension bundle is exposed to a very limited set of dependencies. As a result extensions can be built with little concern for whether they might conflict with another extension. The concept of these extension bundles is called 'NiFi Archives' and will be discussed in greater detail - in the developers guide. + in the developer's guide. Clustering (scale-out):: NiFi is designed to scale-out through the use of clustering many nodes together as described above. If a single node is provisioned and configured to handle hundreds of MB/s then a modest cluster could be configured to handle GB/s. This then brings about interesting challenges of load balancing - and fail-over between NiFi and the systems from which it gets data. Use of asynchronous queuing based protocols like messaging services, Kafka, etc.. can - help. Use of NiFi's 'site-to-site' feature is also very effective as it is a protocol that allows NiFi and a client (could be another NiFi cluster) to talk to eachother, share information + and fail-over between NiFi and the systems from which it gets data. Use of asynchronous queuing based protocols like messaging services, Kafka, etc., can + help. Use of NiFi's 'site-to-site' feature is also very effective as it is a protocol that allows NiFi and a client (could be another NiFi cluster) to talk to each other, share information about loading, and to exchange data on specific authorized ports. # References @@ -292,4 +292,4 @@ Clustering (scale-out):: - [[[iot]]] Wikipedia. Internet of Things [online]. Retrieved: 27 Dec 2014, from: http://en.wikipedia.org/wiki/Internet_of_Things - [[[bigdata]]] Wikipedia. Big Data [online]. Retrieved: 27 Dec 2014, from: http://en.wikipedia.org/wiki/Big_data - [[[fbp]]] Wikipedia. Flow Based Programming [online]. Retrieved: 28 Dec 2014, from: http://en.wikipedia.org/wiki/Flow-based_programming#Concepts -- [[[seda]]] Matt Welsh. Harvard. SEDA: An Architecture for Highly Concurrent Server Applications [online]. Retrieved: 28 Dec 2014, from: http://www.eecs.harvard.edu/~mdw/proj/seda/ \ No newline at end of file +- [[[seda]]] Matt Welsh. Harvard. SEDA: An Architecture for Highly Concurrent Server Applications [online]. Retrieved: 28 Dec 2014, from: http://www.eecs.harvard.edu/~mdw/proj/seda/ diff --git a/pom.xml b/pom.xml index 68e718a0fd..dc751a1f4a 100644 --- a/pom.xml +++ b/pom.xml @@ -631,57 +631,57 @@ org.apache.nifi nifi-api - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-utils - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-web-utils - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-expression-language - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi custom-ui-utilities - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi flowfile-packager - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-socket-utils - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi data-provenance-utils - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-runtime - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-bootstrap - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-resources - ${project.version} + 0.0.1-SNAPSHOT resources provided zip @@ -689,7 +689,7 @@ org.apache.nifi nifi-docs - ${project.version} + 0.0.1-SNAPSHOT resources provided zip @@ -697,73 +697,73 @@ org.apache.nifi nifi-framework-nar - ${project.version} + 0.0.1-SNAPSHOT nar org.apache.nifi volatile-provenance-repository-nar - ${project.version} + 0.0.1-SNAPSHOT nar org.apache.nifi persistent-provenance-repository-nar - ${project.version} + 0.0.1-SNAPSHOT nar org.apache.nifi standard-services-api-nar - ${project.version} + 0.0.1-SNAPSHOT nar org.apache.nifi ssl-context-service-nar - ${project.version} + 0.0.1-SNAPSHOT nar org.apache.nifi distributed-cache-services-nar - ${project.version} + 0.0.1-SNAPSHOT nar org.apache.nifi nifi-standard-nar - ${project.version} + 0.0.1-SNAPSHOT nar org.apache.nifi nifi-jetty-bundle - ${project.version} + 0.0.1-SNAPSHOT nar org.apache.nifi update-attribute-nar - ${project.version} + 0.0.1-SNAPSHOT nar org.apache.nifi monitor-threshold-nar - ${project.version} + 0.0.1-SNAPSHOT nar org.apache.nifi hadoop-libraries-nar - ${project.version} + 0.0.1-SNAPSHOT nar org.apache.nifi hadoop-nar - ${project.version} + 0.0.1-SNAPSHOT nar @@ -775,38 +775,38 @@ org.apache.nifi nifi-properties - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-security-utils - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-logging-utils - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-nar - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-processor-utils - ${project.version} + 0.0.1-SNAPSHOT org.apache.nifi nifi-mock - ${project.version} + 0.0.1-SNAPSHOT test org.apache.nifi wali - ${project.version} + 0.0.1-SNAPSHOT