Merge remote-tracking branch 'upstream/develop' into nifi-solr-bundle

Conflicts:
        nifi/nifi-assembly/pom.xml
        nifi/nifi-nar-bundles/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/751d601a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/751d601a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/751d601a

Branch: refs/heads/develop
Commit: 751d601a92605c7fa323c58dd247e68d3dff4738
Parents: a58891a 8270791
Author: bbende <[email protected]>
Authored: Mon Apr 13 20:03:30 2015 -0400
Committer: bbende <[email protected]>
Committed: Mon Apr 13 20:03:30 2015 -0400

----------------------------------------------------------------------
 nifi/nifi-assembly/NOTICE                       |  65 ++
 nifi/nifi-assembly/pom.xml                      | 901 ++++++++++---------
 .../nifi-hl7-query-language/.gitignore          |   3 +
 .../nifi-hl7-query-language/pom.xml             | 125 +++
 .../apache/nifi/hl7/query/antlr/HL7QueryLexer.g | 173 ++++
 .../nifi/hl7/query/antlr/HL7QueryParser.g       | 108 +++
 .../org/apache/nifi/hl7/hapi/EmptyField.java    |  37 +
 .../org/apache/nifi/hl7/hapi/HapiField.java     |  83 ++
 .../org/apache/nifi/hl7/hapi/HapiMessage.java   |  94 ++
 .../org/apache/nifi/hl7/hapi/HapiSegment.java   |  69 ++
 .../apache/nifi/hl7/hapi/SingleValueField.java  |  42 +
 .../java/org/apache/nifi/hl7/io/HL7Reader.java  |  27 +
 .../hl7/io/exception/InvalidHL7Exception.java   |  40 +
 .../org/apache/nifi/hl7/model/HL7Component.java |  24 +
 .../org/apache/nifi/hl7/model/HL7Field.java     |  21 +
 .../org/apache/nifi/hl7/model/HL7Message.java   |  27 +
 .../org/apache/nifi/hl7/model/HL7Segment.java   |  27 +
 .../org/apache/nifi/hl7/query/Declaration.java  |  29 +
 .../org/apache/nifi/hl7/query/HL7Query.java     | 412 +++++++++
 .../org/apache/nifi/hl7/query/QueryResult.java  |  29 +
 .../org/apache/nifi/hl7/query/ResultHit.java    |  25 +
 .../org/apache/nifi/hl7/query/Selection.java    |  37 +
 .../hl7/query/evaluator/BooleanEvaluator.java   |  24 +
 .../nifi/hl7/query/evaluator/Evaluator.java     |  27 +
 .../hl7/query/evaluator/IntegerEvaluator.java   |  26 +
 .../hl7/query/evaluator/StringEvaluator.java    |  25 +
 .../comparison/AbstractComparisonEvaluator.java | 106 +++
 .../comparison/AbstractNumericComparison.java   |  67 ++
 .../evaluator/comparison/EqualsEvaluator.java   |  32 +
 .../comparison/GreaterThanEvaluator.java        |  34 +
 .../comparison/GreaterThanOrEqualEvaluator.java |  34 +
 .../evaluator/comparison/IsNullEvaluator.java   |  69 ++
 .../evaluator/comparison/LessThanEvaluator.java |  31 +
 .../comparison/LessThanOrEqualEvaluator.java    |  31 +
 .../comparison/NotEqualsEvaluator.java          |  32 +
 .../evaluator/comparison/NotEvaluator.java      |  36 +
 .../evaluator/comparison/NotNullEvaluator.java  |  65 ++
 .../literal/IntegerLiteralEvaluator.java        |  36 +
 .../literal/StringLiteralEvaluator.java         |  35 +
 .../hl7/query/evaluator/logic/AndEvaluator.java |  43 +
 .../hl7/query/evaluator/logic/OrEvaluator.java  |  43 +
 .../message/DeclaredReferenceEvaluator.java     |  42 +
 .../query/evaluator/message/DotEvaluator.java   |  88 ++
 .../query/evaluator/message/FieldEvaluator.java |  67 ++
 .../evaluator/message/MessageEvaluator.java     |  34 +
 .../evaluator/message/SegmentEvaluator.java     |  51 ++
 .../exception/HL7QueryParsingException.java     |  37 +
 .../nifi/hl7/query/result/MissedResult.java     |  56 ++
 .../hl7/query/result/StandardQueryResult.java   |  69 ++
 .../hl7/query/result/StandardResultHit.java     |  41 +
 .../org/apache/nifi/hl7/query/TestHL7Query.java | 310 +++++++
 .../src/test/resources/hyperglycemia            |   5 +
 .../src/test/resources/hypoglycemia             |   5 +
 .../client/socket/EndpointConnectionPool.java   |  57 +-
 .../nifi/remote/client/socket/SocketClient.java |   3 +-
 .../protocol/socket/SocketClientProtocol.java   |   8 +-
 .../socket/SocketClientTransaction.java         |  25 +-
 .../java/org/apache/nifi/util/EscapeUtils.java  |  42 +
 nifi/nifi-commons/pom.xml                       |   1 +
 .../nifi-aws-bundle/nifi-aws-nar/pom.xml        |  36 +
 .../nifi-aws-bundle/nifi-aws-processors/pom.xml |  58 ++
 .../processors/aws/AbstractAWSProcessor.java    | 195 ++++
 .../processors/aws/s3/AbstractS3Processor.java  | 171 ++++
 .../nifi/processors/aws/s3/FetchS3Object.java   | 157 ++++
 .../nifi/processors/aws/s3/PutS3Object.java     | 181 ++++
 .../aws/sns/AbstractSNSProcessor.java           |  60 ++
 .../apache/nifi/processors/aws/sns/PutSNS.java  | 155 ++++
 .../aws/sqs/AbstractSQSProcessor.java           |  51 ++
 .../nifi/processors/aws/sqs/DeleteSQS.java      |  95 ++
 .../apache/nifi/processors/aws/sqs/GetSQS.java  | 204 +++++
 .../apache/nifi/processors/aws/sqs/PutSQS.java  | 147 +++
 .../org.apache.nifi.processor.Processor         |  20 +
 .../processors/aws/s3/TestFetchS3Object.java    |  44 +
 .../nifi/processors/aws/s3/TestPutS3Object.java |  87 ++
 .../nifi/processors/aws/sns/TestPutSNS.java     |  34 +
 .../nifi/processors/aws/sqs/TestGetSQS.java     |  32 +
 .../nifi/processors/aws/sqs/TestPutSQS.java     |  35 +
 .../src/test/resources/hello.txt                |   1 +
 nifi/nifi-nar-bundles/nifi-aws-bundle/pom.xml   |  43 +
 .../nifi-framework/nifi-documentation/pom.xml   |   8 -
 .../html/HtmlDocumentationWriter.java           |  15 +-
 .../html/HtmlProcessorDocumentationWriter.java  |  16 +-
 .../html/HtmlDocumentationWriterTest.java       |   8 +
 .../repository/StandardRepositoryRecord.java    |  15 +-
 .../tasks/ContinuallyRunConnectableTask.java    |   2 +-
 .../nifi/remote/StandardRemoteGroupPort.java    |   6 +-
 .../nifi/web/StandardNiFiContentAccess.java     |  10 +-
 .../config/AdministrationExceptionMapper.java   |   6 +-
 .../web/api/config/ClusterExceptionMapper.java  |   6 +-
 .../web/api/config/NotFoundExceptionMapper.java |  48 +
 .../nifi/web/api/config/ThrowableMapper.java    |   3 +-
 .../src/main/resources/nifi-web-api-context.xml |   1 +
 .../nifi/web/ContentViewerController.java       |  18 +-
 .../src/main/webapp/WEB-INF/jsp/header.jsp      |  20 +-
 .../src/main/webapp/WEB-INF/jsp/hexview.jsp     |   2 +-
 .../src/main/webapp/css/main.css                |   2 +-
 .../src/main/webapp/js/hexview/hexview.js       |   4 +-
 .../nifi-web/nifi-web-docs/pom.xml              |   6 +
 .../main/webapp/WEB-INF/jsp/documentation.jsp   |   2 +-
 .../src/main/webapp/js/application.js           |   7 +-
 .../nifi-framework/nifi-web/nifi-web-ui/pom.xml |   6 +
 .../main/webapp/WEB-INF/pages/message-page.jsp  |   6 +-
 .../propertytable/jquery.propertytable.js       |  96 +-
 .../main/webapp/js/nf/canvas/nf-canvas-utils.js |   7 +-
 .../src/main/webapp/js/nf/canvas/nf-canvas.js   |   8 +-
 .../nifi-geo-bundle/nifi-geo-nar/pom.xml        |  33 +
 .../nifi-geo-processors/.gitignore              |   1 +
 .../nifi-geo-bundle/nifi-geo-processors/pom.xml |  43 +
 .../org/apache/nifi/processors/GeoEnrichIP.java | 208 +++++
 .../nifi/processors/maxmind/DatabaseReader.java | 286 ++++++
 .../org.apache.nifi.processor.Processor         |  16 +
 nifi/nifi-nar-bundles/nifi-geo-bundle/pom.xml   |  42 +
 .../nifi-hl7-bundle/nifi-hl7-nar/pom.xml        |  36 +
 .../nifi-hl7-processors/.gitignore              |   1 +
 .../nifi-hl7-bundle/nifi-hl7-processors/pom.xml | 120 +++
 .../processors/hl7/ExtractHL7Attributes.java    | 247 +++++
 .../apache/nifi/processors/hl7/RouteHL7.java    | 217 +++++
 .../org.apache.nifi.processor.Processor         |  16 +
 .../hl7/TestExtractHL7Attributes.java           |  48 +
 .../src/test/resources/hypoglycemia.hl7         |   5 +
 nifi/nifi-nar-bundles/nifi-hl7-bundle/pom.xml   |  33 +
 .../nifi-language-translation-nar/pom.xml       |  36 +
 .../nifi-yandex-processors/.gitignore           |   1 +
 .../nifi-yandex-processors/pom.xml              |  63 ++
 .../nifi/processors/yandex/YandexTranslate.java | 333 +++++++
 .../processors/yandex/model/Translation.java    |  52 ++
 .../nifi/processors/yandex/util/Languages.java  |  86 ++
 .../yandex/util/ObjectMapperResolver.java       |  48 +
 .../org.apache.nifi.processor.Processor         |  16 +
 .../processors/yandex/TestYandexTranslate.java  | 226 +++++
 .../nifi-language-translation-bundle/pom.xml    |  48 +
 .../nifi-social-media-nar/pom.xml               |  36 +
 .../nifi-twitter-processors/.gitignore          |   1 +
 .../nifi-twitter-processors/pom.xml             |  60 ++
 .../nifi/processors/twitter/GetTwitter.java     | 360 ++++++++
 .../org.apache.nifi.processor.Processor         |  16 +
 .../nifi-social-media-bundle/pom.xml            |  33 +
 .../nifi-standard-content-viewer/pom.xml        |   5 +
 .../src/main/webapp/WEB-INF/jsp/codemirror.jsp  |   7 +-
 .../nifi-update-attribute-ui/pom.xml            |   5 +
 .../src/main/webapp/WEB-INF/jsp/worksheet.jsp   |   8 +-
 .../src/main/webapp/js/application.js           |  13 +-
 nifi/nifi-nar-bundles/pom.xml                   |   8 +-
 nifi/pom.xml                                    |  24 +
 144 files changed, 8532 insertions(+), 574 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/751d601a/nifi/nifi-assembly/pom.xml
----------------------------------------------------------------------
diff --cc nifi/nifi-assembly/pom.xml
index 0c24673,13ffba8..260614c
--- a/nifi/nifi-assembly/pom.xml
+++ b/nifi/nifi-assembly/pom.xml
@@@ -1,462 -1,484 +1,489 @@@
  <?xml version="1.0" encoding="UTF-8"?>
- <!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
- <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
-     <modelVersion>4.0.0</modelVersion>
-     <parent>
-         <groupId>org.apache.nifi</groupId>
-         <artifactId>nifi</artifactId>
-         <version>0.1.0-incubating-SNAPSHOT</version>
-     </parent>
-     <artifactId>nifi-assembly</artifactId>
-     <packaging>pom</packaging>
-     <description>This is the assembly Apache NiFi (incubating)</description>
-     <build>
-         <plugins>
-             <plugin>
-                 <artifactId>maven-assembly-plugin</artifactId>
-                 <configuration>
-                     <finalName>nifi-${project.version}</finalName>
-                     <attach>false</attach>
-                 </configuration>
-                 <executions>
-                     <execution>
-                         <id>make shared resource</id>
-                         <goals>
-                             <goal>single</goal>
-                         </goals>
-                         <phase>package</phase>
-                         <configuration>
-                             <descriptors>
-                                 
<descriptor>src/main/assembly/dependencies.xml</descriptor>
-                             </descriptors>
-                             <tarLongFileMode>posix</tarLongFileMode>
-                         </configuration>
-                     </execution>
-                 </executions>
-             </plugin>
-         </plugins>
-     </build>
-     <dependencies>
-         <dependency>
-             <groupId>ch.qos.logback</groupId>
-             <artifactId>logback-classic</artifactId>
-             <scope>compile</scope>
-         </dependency>
-         <dependency>
-             <groupId>org.slf4j</groupId>
-             <artifactId>jcl-over-slf4j</artifactId>
-             <scope>compile</scope>
-         </dependency>
-         <dependency>
-             <groupId>org.slf4j</groupId>
-             <artifactId>jul-to-slf4j</artifactId>
-             <scope>compile</scope>
-         </dependency>
-         <dependency>
-             <groupId>org.slf4j</groupId>
-             <artifactId>log4j-over-slf4j</artifactId>
-             <scope>compile</scope>
-         </dependency>
-         <dependency>
-             <groupId>org.slf4j</groupId>
-             <artifactId>slf4j-api</artifactId>
-             <scope>compile</scope>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-api</artifactId>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-runtime</artifactId>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-bootstrap</artifactId>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-resources</artifactId>
-             <classifier>resources</classifier>
-             <scope>runtime</scope>
-             <type>zip</type>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-docs</artifactId>
-             <classifier>resources</classifier>
-             <scope>runtime</scope>
-             <type>zip</type>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-framework-nar</artifactId>
-             <type>nar</type>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-provenance-repository-nar</artifactId>
-             <type>nar</type>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-standard-services-api-nar</artifactId>
-             <type>nar</type>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-ssl-context-service-nar</artifactId>
-             <type>nar</type>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-distributed-cache-services-nar</artifactId>
-             <type>nar</type>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-standard-nar</artifactId>
-             <type>nar</type>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-jetty-bundle</artifactId>
-             <type>nar</type>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-update-attribute-nar</artifactId>
-             <type>nar</type>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-hadoop-libraries-nar</artifactId>
-             <type>nar</type>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-hadoop-nar</artifactId>
-             <type>nar</type>
-         </dependency>
-         <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-kafka-nar</artifactId>
-             <type>nar</type>
-         </dependency>
 -<!-- Licensed to the Apache Software Foundation (ASF) under one or more 
contributor 
 -      license agreements. See the NOTICE file distributed with this work for 
additional 
 -      information regarding copyright ownership. The ASF licenses this file 
to 
 -      You under the Apache License, Version 2.0 (the "License"); you may not 
use 
 -      this file except in compliance with the License. You may obtain a copy 
of 
 -      the License at http://www.apache.org/licenses/LICENSE-2.0 Unless 
required 
 -      by applicable law or agreed to in writing, software distributed under 
the 
 -      License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
CONDITIONS 
 -      OF ANY KIND, either express or implied. See the License for the 
specific 
++<!-- Licensed to the Apache Software Foundation (ASF) under one or more 
contributor
++      license agreements. See the NOTICE file distributed with this work for 
additional
++      information regarding copyright ownership. The ASF licenses this file to
++      You under the Apache License, Version 2.0 (the "License"); you may not 
use
++      this file except in compliance with the License. You may obtain a copy 
of
++      the License at http://www.apache.org/licenses/LICENSE-2.0 Unless 
required
++      by applicable law or agreed to in writing, software distributed under 
the
++      License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
CONDITIONS
++      OF ANY KIND, either express or implied. See the License for the specific
+       language governing permissions and limitations under the License. -->
+ <project xmlns="http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/maven-v4_0_0.xsd";>
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.apache.nifi</groupId>
+               <artifactId>nifi</artifactId>
+               <version>0.1.0-incubating-SNAPSHOT</version>
+       </parent>
+       <artifactId>nifi-assembly</artifactId>
+       <packaging>pom</packaging>
+       <description>This is the assembly Apache NiFi (incubating)</description>
+       <build>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <configuration>
+                                       
<finalName>nifi-${project.version}</finalName>
+                                       <attach>false</attach>
+                               </configuration>
+                               <executions>
+                                       <execution>
+                                               <id>make shared resource</id>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                               <phase>package</phase>
+                                               <configuration>
+                                                       <descriptors>
+                                                               
<descriptor>src/main/assembly/dependencies.xml</descriptor>
+                                                       </descriptors>
+                                                       
<tarLongFileMode>posix</tarLongFileMode>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
                <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-http-context-map-nar</artifactId>
-             <type>nar</type>
-         </dependency>
+                       <groupId>ch.qos.logback</groupId>
+                       <artifactId>logback-classic</artifactId>
+                       <scope>compile</scope>
+               </dependency>
                <dependency>
-             <groupId>org.apache.nifi</groupId>
-             <artifactId>nifi-kite-nar</artifactId>
-             <type>nar</type>
-         </dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>jcl-over-slf4j</artifactId>
+                       <scope>compile</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>jul-to-slf4j</artifactId>
+                       <scope>compile</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>log4j-over-slf4j</artifactId>
+                       <scope>compile</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.slf4j</groupId>
+                       <artifactId>slf4j-api</artifactId>
+                       <scope>compile</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-api</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-runtime</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-bootstrap</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-resources</artifactId>
+                       <classifier>resources</classifier>
+                       <scope>runtime</scope>
+                       <type>zip</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-docs</artifactId>
+                       <classifier>resources</classifier>
+                       <scope>runtime</scope>
+                       <type>zip</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-framework-nar</artifactId>
+                       <type>nar</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-provenance-repository-nar</artifactId>
+                       <type>nar</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-standard-services-api-nar</artifactId>
+                       <type>nar</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-ssl-context-service-nar</artifactId>
+                       <type>nar</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       
<artifactId>nifi-distributed-cache-services-nar</artifactId>
+                       <type>nar</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-standard-nar</artifactId>
+                       <type>nar</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-jetty-bundle</artifactId>
+                       <type>nar</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-update-attribute-nar</artifactId>
+                       <type>nar</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-hadoop-libraries-nar</artifactId>
+                       <type>nar</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-hadoop-nar</artifactId>
+                       <type>nar</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-kafka-nar</artifactId>
+                       <type>nar</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-http-context-map-nar</artifactId>
+                       <type>nar</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-kite-nar</artifactId>
+                       <type>nar</type>
+               </dependency>
 +        <dependency>
 +            <groupId>org.apache.nifi</groupId>
 +            <artifactId>nifi-solr-nar</artifactId>
 +            <type>nar</type>
 +        </dependency>
-     </dependencies>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-social-media-nar</artifactId>
+                       <version>0.1.0-incubating-SNAPSHOT</version>
+                       <type>nar</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-hl7-nar</artifactId>
+                       <version>0.1.0-incubating-SNAPSHOT</version>
+                       <type>nar</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-language-translation-nar</artifactId>
+                       <version>0.1.0-incubating-SNAPSHOT</version>
+                       <type>nar</type>
+               </dependency>
+               <dependency>
+                       <groupId>org.apache.nifi</groupId>
+                       <artifactId>nifi-geo-nar</artifactId>
+                       <version>0.1.0-incubating-SNAPSHOT</version>
+                       <type>nar</type>
+               </dependency>
+       </dependencies>
  
-     <properties>
-         <!--Wrapper Properties-->
-         
<nifi.wrapper.jvm.heap.initial.mb>256</nifi.wrapper.jvm.heap.initial.mb>
-         <nifi.wrapper.jvm.heap.max.mb>512</nifi.wrapper.jvm.heap.max.mb>
-         <nifi.initial.permgen.size.mb>128</nifi.initial.permgen.size.mb>
-         <nifi.max.permgen.size.mb>128</nifi.max.permgen.size.mb>
-         <nifi.wrapper.logfile.maxsize>10m</nifi.wrapper.logfile.maxsize>
-         <nifi.wrapper.logfile.maxfiles>10</nifi.wrapper.logfile.maxfiles>
+       <properties>
+               <!--Wrapper Properties -->
+               
<nifi.wrapper.jvm.heap.initial.mb>256</nifi.wrapper.jvm.heap.initial.mb>
+               <nifi.wrapper.jvm.heap.max.mb>512</nifi.wrapper.jvm.heap.max.mb>
+               <nifi.initial.permgen.size.mb>128</nifi.initial.permgen.size.mb>
+               <nifi.max.permgen.size.mb>128</nifi.max.permgen.size.mb>
+               <nifi.wrapper.logfile.maxsize>10m</nifi.wrapper.logfile.maxsize>
+               
<nifi.wrapper.logfile.maxfiles>10</nifi.wrapper.logfile.maxfiles>
  
-         <!-- nifi.properties: core properties -->
-         <nifi.version>${project.version}</nifi.version>
-         
<nifi.flowcontroller.autoResumeState>true</nifi.flowcontroller.autoResumeState>
-         <nifi.flowcontroller.graceful.shutdown.period>10 
sec</nifi.flowcontroller.graceful.shutdown.period>
-         <nifi.flowservice.writedelay.interval>500 
ms</nifi.flowservice.writedelay.interval>
-         <nifi.administrative.yield.duration>30 
sec</nifi.administrative.yield.duration>
-         <nifi.bored.yield.duration>10 millis</nifi.bored.yield.duration>
+               <!-- nifi.properties: core properties -->
+               <nifi.version>${project.version}</nifi.version>
+               
<nifi.flowcontroller.autoResumeState>true</nifi.flowcontroller.autoResumeState>
+               <nifi.flowcontroller.graceful.shutdown.period>10 
sec</nifi.flowcontroller.graceful.shutdown.period>
+               <nifi.flowservice.writedelay.interval>500 
ms</nifi.flowservice.writedelay.interval>
+               <nifi.administrative.yield.duration>30 
sec</nifi.administrative.yield.duration>
+               <nifi.bored.yield.duration>10 millis</nifi.bored.yield.duration>
  
-         
<nifi.flow.configuration.file>./conf/flow.xml.gz</nifi.flow.configuration.file>
-         
<nifi.flow.configuration.archive.dir>./conf/archive/</nifi.flow.configuration.archive.dir>
-         
<nifi.authority.provider.configuration.file>./conf/authority-providers.xml</nifi.authority.provider.configuration.file>
-         <nifi.templates.directory>./conf/templates</nifi.templates.directory>
-         
<nifi.database.directory>./database_repository</nifi.database.directory>
+               
<nifi.flow.configuration.file>./conf/flow.xml.gz</nifi.flow.configuration.file>
+               
<nifi.flow.configuration.archive.dir>./conf/archive/</nifi.flow.configuration.archive.dir>
+               
<nifi.authority.provider.configuration.file>./conf/authority-providers.xml</nifi.authority.provider.configuration.file>
+               
<nifi.templates.directory>./conf/templates</nifi.templates.directory>
+               
<nifi.database.directory>./database_repository</nifi.database.directory>
  
-         
<nifi.flowfile.repository.implementation>org.apache.nifi.controller.repository.WriteAheadFlowFileRepository</nifi.flowfile.repository.implementation>
-         
<nifi.flowfile.repository.directory>./flowfile_repository</nifi.flowfile.repository.directory>
-         
<nifi.flowfile.repository.partitions>256</nifi.flowfile.repository.partitions>
-         <nifi.flowfile.repository.checkpoint.interval>2 
mins</nifi.flowfile.repository.checkpoint.interval>
-         
<nifi.flowfile.repository.always.sync>false</nifi.flowfile.repository.always.sync>
-         
<nifi.swap.manager.implementation>org.apache.nifi.controller.FileSystemSwapManager</nifi.swap.manager.implementation>
-         <nifi.queue.swap.threshold>20000</nifi.queue.swap.threshold>
-         <nifi.swap.in.period>5 sec</nifi.swap.in.period>
-         <nifi.swap.in.threads>1</nifi.swap.in.threads>
-         <nifi.swap.out.period>5 sec</nifi.swap.out.period>
-         <nifi.swap.out.threads>4</nifi.swap.out.threads>
+               
<nifi.flowfile.repository.implementation>org.apache.nifi.controller.repository.WriteAheadFlowFileRepository</nifi.flowfile.repository.implementation>
+               
<nifi.flowfile.repository.directory>./flowfile_repository</nifi.flowfile.repository.directory>
+               
<nifi.flowfile.repository.partitions>256</nifi.flowfile.repository.partitions>
+               <nifi.flowfile.repository.checkpoint.interval>2 
mins</nifi.flowfile.repository.checkpoint.interval>
+               
<nifi.flowfile.repository.always.sync>false</nifi.flowfile.repository.always.sync>
+               
<nifi.swap.manager.implementation>org.apache.nifi.controller.FileSystemSwapManager</nifi.swap.manager.implementation>
+               <nifi.queue.swap.threshold>20000</nifi.queue.swap.threshold>
+               <nifi.swap.in.period>5 sec</nifi.swap.in.period>
+               <nifi.swap.in.threads>1</nifi.swap.in.threads>
+               <nifi.swap.out.period>5 sec</nifi.swap.out.period>
+               <nifi.swap.out.threads>4</nifi.swap.out.threads>
  
-         
<nifi.content.repository.implementation>org.apache.nifi.controller.repository.FileSystemRepository</nifi.content.repository.implementation>
-         <nifi.content.claim.max.appendable.size>10 
MB</nifi.content.claim.max.appendable.size>
-         
<nifi.content.claim.max.flow.files>100</nifi.content.claim.max.flow.files>
-         
<nifi.content.repository.directory.default>./content_repository</nifi.content.repository.directory.default>
-         <nifi.content.repository.archive.max.retention.period />
-         <nifi.content.repository.archive.max.usage.percentage />
-         
<nifi.content.repository.archive.enabled>false</nifi.content.repository.archive.enabled>
-         
<nifi.content.repository.always.sync>false</nifi.content.repository.always.sync>
-         <nifi.content.viewer.url />
+               
<nifi.content.repository.implementation>org.apache.nifi.controller.repository.FileSystemRepository</nifi.content.repository.implementation>
+               <nifi.content.claim.max.appendable.size>10 
MB</nifi.content.claim.max.appendable.size>
+               
<nifi.content.claim.max.flow.files>100</nifi.content.claim.max.flow.files>
+               
<nifi.content.repository.directory.default>./content_repository</nifi.content.repository.directory.default>
+               <nifi.content.repository.archive.max.retention.period />
+               <nifi.content.repository.archive.max.usage.percentage />
+               
<nifi.content.repository.archive.enabled>false</nifi.content.repository.archive.enabled>
+               
<nifi.content.repository.always.sync>false</nifi.content.repository.always.sync>
+               <nifi.content.viewer.url />
  
-         <nifi.restore.directory />
-         <nifi.ui.banner.text />
-         <nifi.ui.autorefresh.interval>30 sec</nifi.ui.autorefresh.interval>
-         <nifi.nar.library.directory>./lib</nifi.nar.library.directory>
-         <nifi.nar.working.directory>./work/nar/</nifi.nar.working.directory>
-         
<nifi.documentation.working.directory>./work/docs/components</nifi.documentation.working.directory>
+               <nifi.restore.directory />
+               <nifi.ui.banner.text />
+               <nifi.ui.autorefresh.interval>30 
sec</nifi.ui.autorefresh.interval>
+               <nifi.nar.library.directory>./lib</nifi.nar.library.directory>
+               
<nifi.nar.working.directory>./work/nar/</nifi.nar.working.directory>
+               
<nifi.documentation.working.directory>./work/docs/components</nifi.documentation.working.directory>
  
-         
<nifi.sensitive.props.algorithm>PBEWITHMD5AND256BITAES-CBC-OPENSSL</nifi.sensitive.props.algorithm>
-         <nifi.sensitive.props.provider>BC</nifi.sensitive.props.provider>
-         
<nifi.h2.url.append>;LOCK_TIMEOUT=25000;WRITE_DELAY=0;AUTO_SERVER=FALSE</nifi.h2.url.append>
+               
<nifi.sensitive.props.algorithm>PBEWITHMD5AND256BITAES-CBC-OPENSSL</nifi.sensitive.props.algorithm>
+               
<nifi.sensitive.props.provider>BC</nifi.sensitive.props.provider>
+               
<nifi.h2.url.append>;LOCK_TIMEOUT=25000;WRITE_DELAY=0;AUTO_SERVER=FALSE</nifi.h2.url.append>
  
-         <nifi.remote.input.socket.port>9990</nifi.remote.input.socket.port>
+               
<nifi.remote.input.socket.port>9990</nifi.remote.input.socket.port>
  
-         <!-- persistent provenance repository properties -->
-         
<nifi.provenance.repository.implementation>org.apache.nifi.provenance.PersistentProvenanceRepository</nifi.provenance.repository.implementation>
-         
<nifi.provenance.repository.directory.default>./provenance_repository</nifi.provenance.repository.directory.default>
-         <nifi.provenance.repository.max.storage.time>24 
hours</nifi.provenance.repository.max.storage.time>
-         <nifi.provenance.repository.max.storage.size>1 
GB</nifi.provenance.repository.max.storage.size>
-         <nifi.provenance.repository.rollover.time>5 
mins</nifi.provenance.repository.rollover.time>
-         <nifi.provenance.repository.rollover.size>100 
MB</nifi.provenance.repository.rollover.size>
-         
<nifi.provenance.repository.query.threads>2</nifi.provenance.repository.query.threads>
-         
<nifi.provenance.repository.compress.on.rollover>true</nifi.provenance.repository.compress.on.rollover>
-         <nifi.provenance.repository.indexed.fields>EventType, FlowFileUUID, 
Filename, ProcessorID</nifi.provenance.repository.indexed.fields>
-         <nifi.provenance.repository.indexed.attributes />
-         <nifi.provenance.repository.index.shard.size>500 
MB</nifi.provenance.repository.index.shard.size>
-         
<nifi.provenance.repository.always.sync>false</nifi.provenance.repository.always.sync>
-         
<nifi.provenance.repository.journal.count>16</nifi.provenance.repository.journal.count>
+               <!-- persistent provenance repository properties -->
+               
<nifi.provenance.repository.implementation>org.apache.nifi.provenance.PersistentProvenanceRepository</nifi.provenance.repository.implementation>
+               
<nifi.provenance.repository.directory.default>./provenance_repository</nifi.provenance.repository.directory.default>
+               <nifi.provenance.repository.max.storage.time>24 
hours</nifi.provenance.repository.max.storage.time>
+               <nifi.provenance.repository.max.storage.size>1 
GB</nifi.provenance.repository.max.storage.size>
+               <nifi.provenance.repository.rollover.time>5 
mins</nifi.provenance.repository.rollover.time>
+               <nifi.provenance.repository.rollover.size>100 
MB</nifi.provenance.repository.rollover.size>
+               
<nifi.provenance.repository.query.threads>2</nifi.provenance.repository.query.threads>
+               
<nifi.provenance.repository.compress.on.rollover>true</nifi.provenance.repository.compress.on.rollover>
+               <nifi.provenance.repository.indexed.fields>EventType, 
FlowFileUUID,
+                       Filename, 
ProcessorID</nifi.provenance.repository.indexed.fields>
+               <nifi.provenance.repository.indexed.attributes />
+               <nifi.provenance.repository.index.shard.size>500 
MB</nifi.provenance.repository.index.shard.size>
+               
<nifi.provenance.repository.always.sync>false</nifi.provenance.repository.always.sync>
+               
<nifi.provenance.repository.journal.count>16</nifi.provenance.repository.journal.count>
  
-         <!-- volatile provenance repository properties -->
-         
<nifi.provenance.repository.buffer.size>100000</nifi.provenance.repository.buffer.size>
+               <!-- volatile provenance repository properties -->
+               
<nifi.provenance.repository.buffer.size>100000</nifi.provenance.repository.buffer.size>
  
-         <!-- Component status repository properties -->
-         
<nifi.components.status.repository.implementation>org.apache.nifi.controller.status.history.VolatileComponentStatusRepository</nifi.components.status.repository.implementation>
-         
<nifi.components.status.repository.buffer.size>288</nifi.components.status.repository.buffer.size>
-         <nifi.components.status.snapshot.frequency>5 
mins</nifi.components.status.snapshot.frequency>
+               <!-- Component status repository properties -->
+               
<nifi.components.status.repository.implementation>org.apache.nifi.controller.status.history.VolatileComponentStatusRepository</nifi.components.status.repository.implementation>
+               
<nifi.components.status.repository.buffer.size>288</nifi.components.status.repository.buffer.size>
+               <nifi.components.status.snapshot.frequency>5 
mins</nifi.components.status.snapshot.frequency>
  
-         <!-- nifi.properties: web properties -->
-         <nifi.web.war.directory>./lib</nifi.web.war.directory>
-         <nifi.web.http.host />
-         <nifi.web.http.port>8080</nifi.web.http.port>
-         <nifi.web.https.host />
-         <nifi.web.https.port />
-         <nifi.jetty.work.dir>./work/jetty</nifi.jetty.work.dir>
-         <nifi.web.jetty.threads>200</nifi.web.jetty.threads>
+               <!-- nifi.properties: web properties -->
+               <nifi.web.war.directory>./lib</nifi.web.war.directory>
+               <nifi.web.http.host />
+               <nifi.web.http.port>8080</nifi.web.http.port>
+               <nifi.web.https.host />
+               <nifi.web.https.port />
+               <nifi.jetty.work.dir>./work/jetty</nifi.jetty.work.dir>
+               <nifi.web.jetty.threads>200</nifi.web.jetty.threads>
  
-         <!-- nifi.properties: security properties -->
-         <nifi.security.keystore />
-         <nifi.security.keystoreType />
-         <nifi.security.keystorePasswd />
-         <nifi.security.keyPasswd />
-         <nifi.security.truststore />
-         <nifi.security.truststoreType />
-         <nifi.security.truststorePasswd />
-         <nifi.security.needClientAuth />
-         
<nifi.security.authorizedUsers.file>./conf/authorized-users.xml</nifi.security.authorizedUsers.file>
-         <nifi.security.user.credential.cache.duration>24 
hours</nifi.security.user.credential.cache.duration>
-         
<nifi.security.user.authority.provider>file-provider</nifi.security.user.authority.provider>
-         <nifi.security.x509.principal.extractor />
-         <nifi.security.support.new.account.requests />
-         <nifi.security.ocsp.responder.url />
-         <nifi.security.ocsp.responder.certificate />
+               <!-- nifi.properties: security properties -->
+               <nifi.security.keystore />
+               <nifi.security.keystoreType />
+               <nifi.security.keystorePasswd />
+               <nifi.security.keyPasswd />
+               <nifi.security.truststore />
+               <nifi.security.truststoreType />
+               <nifi.security.truststorePasswd />
+               <nifi.security.needClientAuth />
+               
<nifi.security.authorizedUsers.file>./conf/authorized-users.xml</nifi.security.authorizedUsers.file>
+               <nifi.security.user.credential.cache.duration>24 
hours</nifi.security.user.credential.cache.duration>
+               
<nifi.security.user.authority.provider>file-provider</nifi.security.user.authority.provider>
+               <nifi.security.x509.principal.extractor />
+               <nifi.security.support.new.account.requests />
+               <nifi.security.ocsp.responder.url />
+               <nifi.security.ocsp.responder.certificate />
  
-         <!-- nifi.properties: cluster common properties (cluster manager and 
nodes must have same values) -->
-         <nifi.cluster.protocol.heartbeat.interval>5 
sec</nifi.cluster.protocol.heartbeat.interval>
-         
<nifi.cluster.protocol.is.secure>false</nifi.cluster.protocol.is.secure>
-         <nifi.cluster.protocol.socket.timeout>30 
sec</nifi.cluster.protocol.socket.timeout>
-         <nifi.cluster.protocol.connection.handshake.timeout>45 
sec</nifi.cluster.protocol.connection.handshake.timeout>
-         
<nifi.cluster.protocol.use.multicast>false</nifi.cluster.protocol.use.multicast>
-         <nifi.cluster.protocol.multicast.address />
-         <nifi.cluster.protocol.multicast.port />
-         <nifi.cluster.protocol.multicast.service.broadcast.delay>500 
ms</nifi.cluster.protocol.multicast.service.broadcast.delay>
-         
<nifi.cluster.protocol.multicast.service.locator.attempts>3</nifi.cluster.protocol.multicast.service.locator.attempts>
-         <nifi.cluster.protocol.multicast.service.locator.attempts.delay>1 
sec</nifi.cluster.protocol.multicast.service.locator.attempts.delay>
 -              <!-- nifi.properties: cluster common properties (cluster 
manager and nodes 
++              <!-- nifi.properties: cluster common properties (cluster 
manager and nodes
+                       must have same values) -->
+               <nifi.cluster.protocol.heartbeat.interval>5 
sec</nifi.cluster.protocol.heartbeat.interval>
+               
<nifi.cluster.protocol.is.secure>false</nifi.cluster.protocol.is.secure>
+               <nifi.cluster.protocol.socket.timeout>30 
sec</nifi.cluster.protocol.socket.timeout>
+               <nifi.cluster.protocol.connection.handshake.timeout>45 
sec</nifi.cluster.protocol.connection.handshake.timeout>
+               
<nifi.cluster.protocol.use.multicast>false</nifi.cluster.protocol.use.multicast>
+               <nifi.cluster.protocol.multicast.address />
+               <nifi.cluster.protocol.multicast.port />
+               <nifi.cluster.protocol.multicast.service.broadcast.delay>500 
ms</nifi.cluster.protocol.multicast.service.broadcast.delay>
+               
<nifi.cluster.protocol.multicast.service.locator.attempts>3</nifi.cluster.protocol.multicast.service.locator.attempts>
+               
<nifi.cluster.protocol.multicast.service.locator.attempts.delay>1 
sec</nifi.cluster.protocol.multicast.service.locator.attempts.delay>
  
-         <!-- nifi.properties: cluster node properties (only configure for 
cluster nodes) -->
-         <nifi.cluster.is.node>false</nifi.cluster.is.node>
-         <nifi.cluster.node.address />
-         <nifi.cluster.node.protocol.port />
-         
<nifi.cluster.node.protocol.threads>2</nifi.cluster.node.protocol.threads>
-         <nifi.cluster.node.unicast.manager.address />
-         <nifi.cluster.node.unicast.manager.protocol.port />
 -              <!-- nifi.properties: cluster node properties (only configure 
for cluster 
++              <!-- nifi.properties: cluster node properties (only configure 
for cluster
+                       nodes) -->
+               <nifi.cluster.is.node>false</nifi.cluster.is.node>
+               <nifi.cluster.node.address />
+               <nifi.cluster.node.protocol.port />
+               
<nifi.cluster.node.protocol.threads>2</nifi.cluster.node.protocol.threads>
+               <nifi.cluster.node.unicast.manager.address />
+               <nifi.cluster.node.unicast.manager.protocol.port />
  
-         <!-- nifi.properties: cluster manager properties (only configure for 
cluster manager) -->
-         <nifi.cluster.is.manager>false</nifi.cluster.is.manager>
-         <nifi.cluster.manager.address />
-         <nifi.cluster.manager.protocol.port />
-         <nifi.cluster.manager.node.firewall.file />
-         
<nifi.cluster.manager.node.event.history.size>10</nifi.cluster.manager.node.event.history.size>
-         <nifi.cluster.manager.node.api.connection.timeout>30 
sec</nifi.cluster.manager.node.api.connection.timeout>
-         <nifi.cluster.manager.node.api.read.timeout>30 
sec</nifi.cluster.manager.node.api.read.timeout>
-         
<nifi.cluster.manager.node.api.request.threads>10</nifi.cluster.manager.node.api.request.threads>
-         <nifi.cluster.manager.flow.retrieval.delay>5 
sec</nifi.cluster.manager.flow.retrieval.delay>
-         
<nifi.cluster.manager.protocol.threads>10</nifi.cluster.manager.protocol.threads>
-         <nifi.cluster.manager.safemode.duration>0 
sec</nifi.cluster.manager.safemode.duration>
-     </properties>
-     <profiles>
-         <profile>
-             <id>rpm</id>
-             <activation>
-                 <activeByDefault>false</activeByDefault>
-             </activation>
-             <build>
-                 <plugins>
-                     <plugin>
-                         <artifactId>maven-dependency-plugin</artifactId>
-                         <executions>
-                             <execution>
-                                 <id>unpack-shared-resources</id>
-                                 <goals>
-                                     <goal>unpack-dependencies</goal>
-                                 </goals>
-                                 <phase>generate-resources</phase>
-                                 <configuration>
-                                     
<outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
-                                     
<includeArtifactIds>nifi-resources</includeArtifactIds>
-                                     
<includeGroupIds>org.apache.nifi</includeGroupIds>
-                                     
<excludeTransitive>false</excludeTransitive>
-                                 </configuration>
-                             </execution>
-                             <execution>
-                                 <id>unpack-docs</id>
-                                 <goals>
-                                     <goal>unpack-dependencies</goal>
-                                 </goals>
-                                 <phase>generate-resources</phase>
-                                 <configuration>
-                                     
<outputDirectory>${project.build.directory}/generated-docs</outputDirectory>
-                                     
<includeArtifactIds>nifi-docs</includeArtifactIds>
-                                     
<includeGroupIds>org.apache.nifi</includeGroupIds>
-                                     
<excludeTransitive>false</excludeTransitive>
-                                 </configuration>
-                             </execution>
-                         </executions>
-                     </plugin>
-                     <plugin>
-                         <groupId>org.codehaus.mojo</groupId>
-                         <artifactId>rpm-maven-plugin</artifactId>
-                         <configuration>
-                             <summary>Apache NiFi (incubating)</summary>
-                             <description>Apache Nifi (incubating) is dataflow 
system based on the Flow-Based Programming concepts.</description>
-                             <license>Apache License, Version 2.0 and others 
(see included LICENSE file)</license>
-                             <url>http://nifi.incubator.apache.org</url>
-                             <group>Utilities</group>
-                             <prefix>/opt/nifi</prefix>
-                             <defineStatements>
-                                 
<defineStatement>_use_internal_dependency_generator 0</defineStatement>
-                             </defineStatements>
-                             <defaultDirmode>750</defaultDirmode>
-                             <defaultFilemode>640</defaultFilemode>
-                             <defaultUsername>root</defaultUsername>
-                             <defaultGroupname>root</defaultGroupname>
-                         </configuration>
-                         <executions>
-                             <execution>
-                                 <id>build-bin-rpm</id>
-                                 <goals>
-                                     <goal>attached-rpm</goal>
-                                 </goals>
-                                 <configuration>
-                                     <classifier>bin</classifier>
-                                     <provides>
-                                         <provide>nifi</provide>
-                                     </provides>
-                                     <mappings>
-                                         <mapping>
-                                             
<directory>/opt/nifi/nifi-${project.version}</directory>
-                                         </mapping>
-                                         <mapping>
-                                             
<directory>/opt/nifi/nifi-${project.version}</directory>
-                                             <sources>
-                                                 <source>
-                                                     
<location>./LICENSE</location>
-                                                 </source>
-                                                 <source>
-                                                     
<location>./NOTICE</location>
-                                                 </source>
-                                                 <source>
-                                                     
<location>../DISCLAIMER</location>
-                                                 </source>
-                                                 <source>
-                                                     
<location>./README.md</location>
-                                                     
<destination>README</destination>
-                                                 </source>
-                                             </sources>
-                                         </mapping>
-                                         <mapping>
-                                             
<directory>/opt/nifi/nifi-${project.version}/bin</directory>
-                                             <filemode>750</filemode>
-                                             <sources>
-                                                 <source>
-                                                     
<location>${project.build.directory}/generated-resources/bin/nifi.sh</location>
-                                                     
<destination>nifi.sh</destination>
-                                                     <filter>true</filter>
-                                                 </source>
-                                             </sources>
-                                         </mapping>
-                                         <mapping>
-                                             
<directory>/opt/nifi/nifi-${project.version}/conf</directory>
-                                             
<configuration>true</configuration>
-                                             <sources>
-                                                 <source>
-                                                     
<location>${project.build.directory}/generated-resources/conf</location>
-                                                     <filter>true</filter>
-                                                 </source>
-                                             </sources>
-                                         </mapping>
-                                         <mapping>
-                                             
<directory>/opt/nifi/nifi-${project.version}/lib</directory>
-                                             <dependency>
-                                                 <excludes>
-                                                     
<exclude>org.apache.nifi:nifi-bootstrap</exclude>
-                                                     
<exclude>org.apache.nifi:nifi-resources</exclude>
-                                                     
<exclude>org.apache.nifi:nifi-docs</exclude>
-                                                 </excludes>
-                                             </dependency>
-                                         </mapping>
-                                         <mapping>
-                                             
<directory>/opt/nifi/nifi-${project.version}/lib/bootstrap</directory>
-                                             <dependency>
-                                                 <includes>
-                                                     
<include>org.apache.nifi:nifi-bootstrap</include>
-                                                 </includes>
-                                             </dependency>
-                                         </mapping>
-                                         <mapping>
-                                             
<directory>/opt/nifi/nifi-${project.version}/docs</directory>
-                                             <sources>
-                                                 <source>
-                                                     
<location>${project.build.directory}/generated-docs</location>
-                                                 </source>
-                                             </sources>
-                                         </mapping>
-                                     </mappings>
-                                 </configuration>
-                             </execution>
-                         </executions>
-                     </plugin>
-                 </plugins>
-             </build>
-         </profile>
-     </profiles>
 -              <!-- nifi.properties: cluster manager properties (only 
configure for cluster 
++              <!-- nifi.properties: cluster manager properties (only 
configure for cluster
+                       manager) -->
+               <nifi.cluster.is.manager>false</nifi.cluster.is.manager>
+               <nifi.cluster.manager.address />
+               <nifi.cluster.manager.protocol.port />
+               <nifi.cluster.manager.node.firewall.file />
+               
<nifi.cluster.manager.node.event.history.size>10</nifi.cluster.manager.node.event.history.size>
+               <nifi.cluster.manager.node.api.connection.timeout>30 
sec</nifi.cluster.manager.node.api.connection.timeout>
+               <nifi.cluster.manager.node.api.read.timeout>30 
sec</nifi.cluster.manager.node.api.read.timeout>
+               
<nifi.cluster.manager.node.api.request.threads>10</nifi.cluster.manager.node.api.request.threads>
+               <nifi.cluster.manager.flow.retrieval.delay>5 
sec</nifi.cluster.manager.flow.retrieval.delay>
+               
<nifi.cluster.manager.protocol.threads>10</nifi.cluster.manager.protocol.threads>
+               <nifi.cluster.manager.safemode.duration>0 
sec</nifi.cluster.manager.safemode.duration>
+       </properties>
+       <profiles>
+               <profile>
+                       <id>rpm</id>
+                       <activation>
+                               <activeByDefault>false</activeByDefault>
+                       </activation>
+                       <build>
+                               <plugins>
+                                       <plugin>
+                                               
<artifactId>maven-dependency-plugin</artifactId>
+                                               <executions>
+                                                       <execution>
+                                                               
<id>unpack-shared-resources</id>
+                                                               <goals>
+                                                                       
<goal>unpack-dependencies</goal>
+                                                               </goals>
+                                                               
<phase>generate-resources</phase>
+                                                               <configuration>
+                                                                       
<outputDirectory>${project.build.directory}/generated-resources</outputDirectory>
+                                                                       
<includeArtifactIds>nifi-resources</includeArtifactIds>
+                                                                       
<includeGroupIds>org.apache.nifi</includeGroupIds>
+                                                                       
<excludeTransitive>false</excludeTransitive>
+                                                               </configuration>
+                                                       </execution>
+                                                       <execution>
+                                                               
<id>unpack-docs</id>
+                                                               <goals>
+                                                                       
<goal>unpack-dependencies</goal>
+                                                               </goals>
+                                                               
<phase>generate-resources</phase>
+                                                               <configuration>
+                                                                       
<outputDirectory>${project.build.directory}/generated-docs</outputDirectory>
+                                                                       
<includeArtifactIds>nifi-docs</includeArtifactIds>
+                                                                       
<includeGroupIds>org.apache.nifi</includeGroupIds>
+                                                                       
<excludeTransitive>false</excludeTransitive>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                                       <plugin>
+                                               
<groupId>org.codehaus.mojo</groupId>
+                                               
<artifactId>rpm-maven-plugin</artifactId>
+                                               <configuration>
+                                                       <summary>Apache NiFi 
(incubating)</summary>
+                                                       <description>Apache 
Nifi (incubating) is dataflow system based on
+                                                               the Flow-Based 
Programming concepts.</description>
+                                                       <license>Apache 
License, Version 2.0 and others (see included
+                                                               LICENSE 
file)</license>
+                                                       
<url>http://nifi.incubator.apache.org</url>
+                                                       <group>Utilities</group>
+                                                       
<prefix>/opt/nifi</prefix>
+                                                       <defineStatements>
+                                                               
<defineStatement>_use_internal_dependency_generator 0</defineStatement>
+                                                       </defineStatements>
+                                                       
<defaultDirmode>750</defaultDirmode>
+                                                       
<defaultFilemode>640</defaultFilemode>
+                                                       
<defaultUsername>root</defaultUsername>
+                                                       
<defaultGroupname>root</defaultGroupname>
+                                               </configuration>
+                                               <executions>
+                                                       <execution>
+                                                               
<id>build-bin-rpm</id>
+                                                               <goals>
+                                                                       
<goal>attached-rpm</goal>
+                                                               </goals>
+                                                               <configuration>
+                                                                       
<classifier>bin</classifier>
+                                                                       
<provides>
+                                                                               
<provide>nifi</provide>
+                                                                       
</provides>
+                                                                       
<mappings>
+                                                                               
<mapping>
+                                                                               
        <directory>/opt/nifi/nifi-${project.version}</directory>
+                                                                               
</mapping>
+                                                                               
<mapping>
+                                                                               
        <directory>/opt/nifi/nifi-${project.version}</directory>
+                                                                               
        <sources>
+                                                                               
                <source>
+                                                                               
                        <location>./LICENSE</location>
+                                                                               
                </source>
+                                                                               
                <source>
+                                                                               
                        <location>./NOTICE</location>
+                                                                               
                </source>
+                                                                               
                <source>
+                                                                               
                        <location>../DISCLAIMER</location>
+                                                                               
                </source>
+                                                                               
                <source>
+                                                                               
                        <location>./README.md</location>
+                                                                               
                        <destination>README</destination>
+                                                                               
                </source>
+                                                                               
        </sources>
+                                                                               
</mapping>
+                                                                               
<mapping>
+                                                                               
        <directory>/opt/nifi/nifi-${project.version}/bin</directory>
+                                                                               
        <filemode>750</filemode>
+                                                                               
        <sources>
+                                                                               
                <source>
+                                                                               
                        
<location>${project.build.directory}/generated-resources/bin/nifi.sh</location>
+                                                                               
                        <destination>nifi.sh</destination>
+                                                                               
                        <filter>true</filter>
+                                                                               
                </source>
+                                                                               
        </sources>
+                                                                               
</mapping>
+                                                                               
<mapping>
+                                                                               
        <directory>/opt/nifi/nifi-${project.version}/conf</directory>
+                                                                               
        <configuration>true</configuration>
+                                                                               
        <sources>
+                                                                               
                <source>
+                                                                               
                        
<location>${project.build.directory}/generated-resources/conf</location>
+                                                                               
                        <filter>true</filter>
+                                                                               
                </source>
+                                                                               
        </sources>
+                                                                               
</mapping>
+                                                                               
<mapping>
+                                                                               
        <directory>/opt/nifi/nifi-${project.version}/lib</directory>
+                                                                               
        <dependency>
+                                                                               
                <excludes>
+                                                                               
                        <exclude>org.apache.nifi:nifi-bootstrap</exclude>
+                                                                               
                        <exclude>org.apache.nifi:nifi-resources</exclude>
+                                                                               
                        <exclude>org.apache.nifi:nifi-docs</exclude>
+                                                                               
                </excludes>
+                                                                               
        </dependency>
+                                                                               
</mapping>
+                                                                               
<mapping>
+                                                                               
        <directory>/opt/nifi/nifi-${project.version}/lib/bootstrap</directory>
+                                                                               
        <dependency>
+                                                                               
                <includes>
+                                                                               
                        <include>org.apache.nifi:nifi-bootstrap</include>
+                                                                               
                </includes>
+                                                                               
        </dependency>
+                                                                               
</mapping>
+                                                                               
<mapping>
+                                                                               
        <directory>/opt/nifi/nifi-${project.version}/docs</directory>
+                                                                               
        <sources>
+                                                                               
                <source>
+                                                                               
                        
<location>${project.build.directory}/generated-docs</location>
+                                                                               
                </source>
+                                                                               
        </sources>
+                                                                               
</mapping>
+                                                                       
</mappings>
+                                                               </configuration>
+                                                       </execution>
+                                               </executions>
+                                       </plugin>
+                               </plugins>
+                       </build>
+               </profile>
+       </profiles>
  </project>

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/751d601a/nifi/nifi-nar-bundles/pom.xml
----------------------------------------------------------------------
diff --cc nifi/nifi-nar-bundles/pom.xml
index 8acf9b9,7d80826..674bb92
--- a/nifi/nifi-nar-bundles/pom.xml
+++ b/nifi/nifi-nar-bundles/pom.xml
@@@ -35,7 -34,11 +34,12 @@@
          <module>nifi-update-attribute-bundle</module>
          <module>nifi-kafka-bundle</module>
                <module>nifi-kite-bundle</module>
 +        <module>nifi-solr-bundle</module>
+               <module>nifi-aws-bundle</module>
+               <module>nifi-social-media-bundle</module>
+               <module>nifi-geo-bundle</module>
+               <module>nifi-hl7-bundle</module>
+               <module>nifi-language-translation-bundle</module>
      </modules>
      <dependencyManagement>
          <dependencies>

http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/751d601a/nifi/pom.xml
----------------------------------------------------------------------

Reply via email to