You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/01/06 16:17:36 UTC
[7/7] incubator-nifi git commit: NIFI-221: included controller
service needed in nar-bundles pom
NIFI-221: included controller service needed in nar-bundles pom
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/2d0b1639
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/2d0b1639
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/2d0b1639
Branch: refs/heads/develop
Commit: 2d0b163961723e9163c3ed34a7fdab0b5a1dfcac
Parents: 0b25df4 d8b4a78
Author: Mark Payne <ma...@hotmail.com>
Authored: Tue Jan 6 10:16:00 2015 -0500
Committer: Mark Payne <ma...@hotmail.com>
Committed: Tue Jan 6 10:16:00 2015 -0500
----------------------------------------------------------------------
.../evaluation/cast/DateCastEvaluator.java | 3 +-
.../main/webapp/WEB-INF/jsp/documentation.jsp | 1 +
.../src/main/webapp/js/application.js | 2 +-
.../nifi-web-ui/src/main/webapp/css/graph.css | 5 +-
.../nifi-web-ui/src/main/webapp/css/main.css | 6 ++
.../webapp/js/nf/canvas/nf-canvas-header.js | 4 +-
.../main/webapp/js/nf/canvas/nf-canvas-utils.js | 37 +++-------
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 4 +-
.../js/nf/canvas/nf-connection-configuration.js | 4 +-
.../main/webapp/js/nf/canvas/nf-draggable.js | 12 +++-
.../src/main/webapp/js/nf/canvas/nf-port.js | 2 +-
.../js/nf/canvas/nf-processor-property-table.js | 4 +-
.../main/webapp/js/nf/canvas/nf-processor.js | 2 +-
.../nf/canvas/nf-remote-process-group-ports.js | 12 ++--
.../js/nf/canvas/nf-remote-process-group.js | 4 +-
.../src/main/webapp/js/nf/nf-common.js | 2 +-
.../main/webapp/js/nf/nf-processor-details.js | 4 +-
.../webapp/js/nf/summary/nf-summary-table.js | 16 ++---
nar-bundles/framework-bundle/pom.xml | 30 ++++----
nar-bundles/hadoop-bundle/pom.xml | 2 +-
nar-bundles/monitor-threshold-bundle/pom.xml | 4 +-
.../pom.xml | 2 +-
nar-bundles/pom.xml | 30 ++++----
nar-bundles/standard-bundle/pom.xml | 10 +--
.../nifi/processors/standard/ListenHTTP.java | 11 +++
.../standard/servlets/ListenHTTPServlet.java | 14 +++-
.../index.html | 6 ++
nar-bundles/update-attribute-bundle/pom.xml | 6 +-
.../pom.xml | 2 +-
nifi-docs/pom.xml | 2 +-
nifi-docs/src/main/asciidoc/overview.adoc | 74 ++++++++++----------
pom.xml | 62 ++++++++--------
32 files changed, 199 insertions(+), 180 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2d0b1639/nar-bundles/pom.xml
----------------------------------------------------------------------
diff --cc nar-bundles/pom.xml
index 7c79a48,38e69e0..d21a3bd
--- a/nar-bundles/pom.xml
+++ b/nar-bundles/pom.xml
@@@ -86,18 -85,8 +86,18 @@@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>ssl-context-service</artifactId>
- <version>${project.version}</version>
+ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>http-context-map-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>http-context-map</artifactId>
- <version>${project.version}</version>
- </dependency>
++ <version>0.0.1-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>volatile-provenance-repository</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/2d0b1639/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 68e718a,e4b2707..dc751a1
--- a/pom.xml
+++ b/pom.xml
@@@ -768,14 -768,8 +768,14 @@@
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
+ <artifactId>kafka-nar</artifactId>
+ <version>${project.version}</version>
+ <type>nar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
<artifactId>nifi-properties</artifactId>
- <version>${project.version}</version>
+ <version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>