You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2014/12/15 11:14:57 UTC
[12/12] incubator-nifi git commit: NIFI-169 well it finally all
builds. There is a classpath issue still to sort out which impacts startup
NIFI-169 well it finally all builds. There is a classpath issue still to sort out which impacts startup
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/19d4a150
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/19d4a150
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/19d4a150
Branch: refs/heads/NIFI-169
Commit: 19d4a150a875e0862d458e03ffb413797f2bf81b
Parents: 9ccbf8b
Author: joewitt <jo...@apache.org>
Authored: Mon Dec 15 05:14:32 2014 -0500
Committer: joewitt <jo...@apache.org>
Committed: Mon Dec 15 05:14:32 2014 -0500
----------------------------------------------------------------------
assemblies/nifi/pom.xml | 490 ----------
.../nifi/src/main/assembly/dependencies.xml | 135 ---
assembly/pom.xml | 446 +++++++++
assembly/src/main/assembly/dependencies.xml | 135 +++
commons/core-flowfile-attributes/pom.xml | 5 +-
commons/data-provenance-utils/pom.xml | 4 +-
commons/flowfile-packager/pom.xml | 4 +-
.../apache/nifi/util/FlowFilePackagerV1.java | 4 +-
commons/naive-search-ring-buffer/pom.xml | 2 +-
commons/nifi-expression-language/pom.xml | 5 +-
commons/nifi-file-utils/pom.xml | 4 +-
commons/nifi-logging-utils/pom.xml | 5 +-
commons/nifi-parent/pom.xml | 217 -----
commons/nifi-properties/pom.xml | 6 +-
commons/nifi-security-utils/pom.xml | 4 +-
commons/nifi-socket-utils/pom.xml | 9 +-
commons/nifi-stream-utils/pom.xml | 16 +-
commons/nifi-utils/pom.xml | 3 +-
commons/nifi-web-utils/pom.xml | 12 +-
commons/pom.xml | 50 +
commons/processor-utilities/pom.xml | 6 +-
commons/remote-communications-utils/pom.xml | 2 +-
commons/search-utils/pom.xml | 4 +-
commons/wali/pom.xml | 9 +-
extensions/file-authorization-provider/pom.xml | 90 --
.../FileAuthorizationProvider.java | 568 -----------
....apache.nifi.authorization.AuthorityProvider | 15 -
.../src/main/xsd/users.xsd | 64 --
.../FileAuthorizationProviderTest.java | 127 ---
misc/nar-maven-plugin/pom.xml | 100 --
.../src/main/java/nifi/NarMojo.java | 610 ------------
.../resources/META-INF/plexus/components.xml | 52 -
misc/pom.xml | 100 ++
misc/src/main/java/nifi/NarMojo.java | 610 ++++++++++++
.../resources/META-INF/plexus/components.xml | 52 +
.../distributed-cache-client-service/pom.xml | 67 --
.../distributed/cache/client/CommsSession.java | 46 -
.../DistributedMapCacheClientService.java | 301 ------
.../DistributedSetCacheClientService.java | 212 ----
.../cache/client/SSLCommsSession.java | 106 --
.../cache/client/StandardCommsSession.java | 124 ---
...org.apache.nifi.controller.ControllerService | 16 -
.../index.html | 78 --
.../index.html | 0
.../distributed-cache-protocol/pom.xml | 39 -
.../cache/protocol/ProtocolHandshake.java | 119 ---
.../protocol/exception/HandshakeException.java | 27 -
.../distributed-cache-server/pom.xml | 81 --
.../cache/server/AbstractCacheServer.java | 199 ----
.../distributed/cache/server/CacheRecord.java | 57 --
.../distributed/cache/server/CacheServer.java | 26 -
.../cache/server/DistributedCacheServer.java | 107 --
.../cache/server/DistributedSetCacheServer.java | 68 --
.../cache/server/EvictionPolicy.java | 73 --
.../cache/server/SetCacheServer.java | 104 --
.../server/map/DistributedMapCacheServer.java | 71 --
.../distributed/cache/server/map/MapCache.java | 29 -
.../cache/server/map/MapCacheRecord.java | 58 --
.../cache/server/map/MapCacheServer.java | 145 ---
.../cache/server/map/MapPutResult.java | 59 --
.../cache/server/map/PersistentMapCache.java | 210 ----
.../cache/server/map/SimpleMapCache.java | 165 ----
.../cache/server/set/PersistentSetCache.java | 194 ----
.../distributed/cache/server/set/SetCache.java | 29 -
.../cache/server/set/SetCacheRecord.java | 55 --
.../cache/server/set/SetCacheResult.java | 43 -
.../cache/server/set/SimpleSetCache.java | 117 ---
...org.apache.nifi.controller.ControllerService | 16 -
.../index.html | 82 --
.../cache/server/TestServerAndClient.java | 530 ----------
.../src/test/resources/localhost-ks.jks | Bin 1298 -> 0 bytes
.../src/test/resources/localhost-ts.jks | Bin 891 -> 0 bytes
.../distributed-cache-services-nar/pom.xml | 49 -
.../distributed-cache-services-bundle/pom.xml | 83 --
.../framework-bundle/framework/cluster/pom.xml | 1 -
.../framework-bundle/framework/core/pom.xml | 3 +-
.../file-authorization-provider/pom.xml | 81 ++
.../FileAuthorizationProvider.java | 568 +++++++++++
....apache.nifi.authorization.AuthorityProvider | 15 +
.../src/main/xsd/users.xsd | 64 ++
.../FileAuthorizationProviderTest.java | 127 +++
nar-bundles/framework-bundle/framework/pom.xml | 1 +
.../framework/resources/pom.xml | 3 +
.../framework-bundle/framework/runtime/pom.xml | 4 +
.../framework/site-to-site/pom.xml | 6 +-
.../framework/web/nifi-jetty/pom.xml | 22 +
.../framework/web/nifi-web-api/pom.xml | 8 +-
.../framework-bundle/framework/web/pom.xml | 11 -
nar-bundles/framework-bundle/nar/pom.xml | 47 -
nar-bundles/framework-bundle/pom.xml | 378 +-------
.../hadoop-bundle/hdfs-processors/pom.xml | 8 -
nar-bundles/hadoop-bundle/nar/pom.xml | 2 +-
nar-bundles/hadoop-bundle/pom.xml | 98 +-
nar-bundles/hadoop-libraries-bundle/nar/pom.xml | 7 -
nar-bundles/hadoop-libraries-bundle/pom.xml | 26 +-
nar-bundles/jetty-bundle/pom.xml | 2 +-
.../monitor-threshold-bundle/nar/pom.xml | 3 +-
nar-bundles/monitor-threshold-bundle/pom.xml | 72 +-
nar-bundles/nar-container-common/pom.xml | 121 ---
.../nar/pom.xml | 60 +-
.../pom.xml | 46 +-
nar-bundles/pom.xml | 120 +++
nar-bundles/ssl-context-bundle/nar/pom.xml | 39 -
nar-bundles/ssl-context-bundle/pom.xml | 49 -
.../ssl-context-service/pom.xml | 51 -
.../nifi/ssl/StandardSSLContextService.java | 354 -------
...org.apache.nifi.controller.ControllerService | 15 -
.../index.html | 63 --
.../apache/nifi/ssl/SSLContextServiceTest.java | 197 ----
.../java/org/apache/nifi/ssl/TestProcessor.java | 47 -
.../src/test/resources/localhost-ks.jks | Bin 1298 -> 0 bytes
.../src/test/resources/localhost-ts.jks | Bin 891 -> 0 bytes
.../standard-bundle/jms-processors/pom.xml | 4 -
nar-bundles/standard-bundle/nar/pom.xml | 6 +-
nar-bundles/standard-bundle/pom.xml | 62 +-
.../standard-ganglia-reporter/pom.xml | 1 -
.../standard-bundle/standard-processors/pom.xml | 32 +-
.../processors/standard/DetectDuplicate.java | 2 +-
.../processors/standard/DistributeLoad.java | 2 +-
.../standard/EvaluateRegularExpression.java | 2 +-
.../standard/ExecuteStreamCommand.java | 2 +-
.../nifi/processors/standard/HashAttribute.java | 2 +-
.../nifi/processors/standard/InvokeHTTP.java | 4 +-
.../nifi/processors/standard/ListenUDP.java | 2 +-
.../nifi/processors/standard/LogAttribute.java | 2 +-
.../standard/ReplaceTextWithMapping.java | 2 +-
.../nifi/processors/standard/SplitXml.java | 2 +-
.../standard/servlets/ListenHTTPServlet.java | 2 +-
.../standard/util/UDPStreamConsumer.java | 6 +-
.../standard/TestDetectDuplicate.java | 2 +-
.../standard-reporting-tasks/pom.xml | 7 -
.../pom.xml | 36 -
.../distributed/cache/client/Deserializer.java | 41 -
.../cache/client/DistributedMapCacheClient.java | 114 ---
.../cache/client/DistributedSetCacheClient.java | 74 --
.../distributed/cache/client/Serializer.java | 40 -
.../exception/DeserializationException.java | 33 -
.../exception/SerializationException.java | 33 -
.../load-distribution-service-api/pom.xml | 36 -
.../nifi/loading/LoadDistributionListener.java | 24 -
.../nifi/loading/LoadDistributionService.java | 33 -
.../standard-services-api-bundle/pom.xml | 74 --
.../ssl-context-service-api/pom.xml | 36 -
.../org/apache/nifi/ssl/SSLContextService.java | 55 --
.../standard-services-api-nar/pom.xml | 44 -
.../pom.xml | 36 +
.../distributed/cache/client/Deserializer.java | 41 +
.../cache/client/DistributedMapCacheClient.java | 114 +++
.../cache/client/DistributedSetCacheClient.java | 74 ++
.../distributed/cache/client/Serializer.java | 40 +
.../exception/DeserializationException.java | 33 +
.../exception/SerializationException.java | 33 +
.../distributed-cache-client-service/pom.xml | 60 ++
.../distributed/cache/client/CommsSession.java | 46 +
.../DistributedMapCacheClientService.java | 301 ++++++
.../DistributedSetCacheClientService.java | 212 ++++
.../cache/client/SSLCommsSession.java | 106 ++
.../cache/client/StandardCommsSession.java | 124 +++
...org.apache.nifi.controller.ControllerService | 16 +
.../index.html | 78 ++
.../index.html | 0
.../distributed-cache-protocol/pom.xml | 39 +
.../cache/protocol/ProtocolHandshake.java | 119 +++
.../protocol/exception/HandshakeException.java | 27 +
.../distributed-cache-server/pom.xml | 78 ++
.../cache/server/AbstractCacheServer.java | 199 ++++
.../distributed/cache/server/CacheRecord.java | 57 ++
.../distributed/cache/server/CacheServer.java | 26 +
.../cache/server/DistributedCacheServer.java | 107 ++
.../cache/server/DistributedSetCacheServer.java | 68 ++
.../cache/server/EvictionPolicy.java | 73 ++
.../cache/server/SetCacheServer.java | 104 ++
.../server/map/DistributedMapCacheServer.java | 71 ++
.../distributed/cache/server/map/MapCache.java | 29 +
.../cache/server/map/MapCacheRecord.java | 58 ++
.../cache/server/map/MapCacheServer.java | 145 +++
.../cache/server/map/MapPutResult.java | 59 ++
.../cache/server/map/PersistentMapCache.java | 210 ++++
.../cache/server/map/SimpleMapCache.java | 165 ++++
.../cache/server/set/PersistentSetCache.java | 194 ++++
.../distributed/cache/server/set/SetCache.java | 29 +
.../cache/server/set/SetCacheRecord.java | 55 ++
.../cache/server/set/SetCacheResult.java | 43 +
.../cache/server/set/SimpleSetCache.java | 117 +++
...org.apache.nifi.controller.ControllerService | 16 +
.../index.html | 82 ++
.../cache/server/TestServerAndClient.java | 530 ++++++++++
.../src/test/resources/localhost-ks.jks | Bin 0 -> 1298 bytes
.../src/test/resources/localhost-ts.jks | Bin 0 -> 891 bytes
.../distributed-cache-services-nar/pom.xml | 47 +
.../distributed-cache-services-bundle/pom.xml | 35 +
.../load-distribution-service-api/pom.xml | 37 +
.../nifi/loading/LoadDistributionListener.java | 24 +
.../nifi/loading/LoadDistributionService.java | 33 +
nar-bundles/standard-services/pom.xml | 39 +
.../ssl-context-bundle/nar/pom.xml | 39 +
.../ssl-context-bundle/pom.xml | 34 +
.../ssl-context-service/pom.xml | 52 +
.../nifi/ssl/StandardSSLContextService.java | 354 +++++++
...org.apache.nifi.controller.ControllerService | 15 +
.../index.html | 63 ++
.../apache/nifi/ssl/SSLContextServiceTest.java | 197 ++++
.../java/org/apache/nifi/ssl/TestProcessor.java | 47 +
.../src/test/resources/localhost-ks.jks | Bin 0 -> 1298 bytes
.../src/test/resources/localhost-ts.jks | Bin 0 -> 891 bytes
.../ssl-context-service-api/pom.xml | 36 +
.../org/apache/nifi/ssl/SSLContextService.java | 55 ++
.../standard-services-api-nar/pom.xml | 45 +
nar-bundles/update-attribute-bundle/nar/pom.xml | 37 +-
nar-bundles/update-attribute-bundle/pom.xml | 29 +-
.../update-attribute-bundle/processor/pom.xml | 1 -
nar-bundles/update-attribute-bundle/ui/pom.xml | 10 +-
.../update/attributes/api/RuleResource.java | 2 +-
.../nar/pom.xml | 4 +-
.../pom.xml | 16 +-
.../volatile-provenance-repository/pom.xml | 2 +-
nar-maven-plugin/pom.xml | 76 ++
.../src/main/java/nifi/NarMojo.java | 610 ++++++++++++
.../resources/META-INF/plexus/components.xml | 52 +
nifi-api/pom.xml | 3 +-
nifi-bootstrap/pom.xml | 22 +-
nifi-mock/pom.xml | 6 -
.../apache/nifi/util/MockProcessSession.java | 2 +-
pom.xml | 966 +++++++++++++++++++
224 files changed, 9465 insertions(+), 8825 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/19d4a150/assemblies/nifi/pom.xml
----------------------------------------------------------------------
diff --git a/assemblies/nifi/pom.xml b/assemblies/nifi/pom.xml
deleted file mode 100644
index 556b8fe..0000000
--- a/assemblies/nifi/pom.xml
+++ /dev/null
@@ -1,490 +0,0 @@
-<?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-parent</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </parent>
-
- <artifactId>nifi</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>NiFi Release</name>
- <description>This is the assembly for the Main Standard Release of NiFi</description>
-
- <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>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/dependencies.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.3.2</version>
- <executions>
- <execution>
- <goals>
- <goal>exec</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <executable>${project.build.directory}/${project.artifactId}-${project.version}-${nifi.assembly.id}.dir/${nifi.executable}</executable>
- </configuration>
- </plugin>
- </plugins>
- <resources>
- <resource>
- <directory>${basedir}/src/main/resources</directory>
- </resource>
- <resource>
- <directory>${project.build.directory}/generated-resources</directory>
- <filtering>true</filtering>
- </resource>
- </resources>
- </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>
- <version>${org.slf4j.version}</version>
- <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>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-runtime</artifactId>
- <version>${framework.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-bootstrap</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-resources</artifactId>
- <version>${framework.version}</version>
- <classifier>resources</classifier>
- <scope>provided</scope> <!-- Provided - we don't want the zip in the libs -->
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-framework-nar</artifactId>
- <version>${framework.version}</version>
- <type>nar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>volatile-provenance-repository-nar</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>nar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>persistent-provenance-repository-nar</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>nar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>standard-services-api-nar</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>nar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>ssl-context-service-nar</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>nar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>distributed-cache-services-nar</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>nar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-standard-nar</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>nar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>nifi-jetty-bundle</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>nar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>update-attribute-nar</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>nar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>monitor-threshold-nar</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>nar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>hadoop-libraries-nar</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>nar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>hadoop-nar</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>nar</type>
- </dependency>
- <!-- <dependency>
- <groupId>org.apache.nifi</groupId>
- <artifactId>execute-script-nar</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- <type>nar</type>
- </dependency>-->
- </dependencies>
-
- <properties>
- <framework.version>0.0.1-SNAPSHOT</framework.version>
-
- <!--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.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.flow.configuration.file>./conf/flow.xml.gz</nifi.flow.configuration.file>
- <nifi.flow.configuration.archive.dir>./conf/archive/</nifi.flow.configuration.archive.dir>
- <nifi.reporting.task.configuration.file>./conf/reporting-tasks.xml</nifi.reporting.task.configuration.file>
- <nifi.controller.service.configuration.file>./conf/controller-services.xml</nifi.controller.service.configuration.file>
- <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.storage.directory>./flowfile_repository/swap</nifi.swap.storage.directory>
- <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.restore.directory />
- <nifi.ui.banner.text></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.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>
-
- <!-- 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>
-
- <!-- 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.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 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 to execute nifi using Maven. It is assumed that the assembly has a
- format of type 'dir' so that the executable can be referenced in a defined location.
- -->
- <nifi.assembly.id>bin</nifi.assembly.id>
- <nifi.executable>${project.artifactId}-${project.version}/bin/${project.artifactId}</nifi.executable>
-
- </properties>
- <profiles>
- <profile>
- <id>standard-rpm</id>
- <activation>
- <activeByDefault>false</activeByDefault>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rpm-maven-plugin</artifactId>
- <version>2.0.1</version>
- <executions>
- <execution>
- <goals>
- <goal>rpm</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <name>${project.artifactId}</name>
- <projversion>${project.version}</projversion>
- <summary>NiFi data flow framework</summary>
- <description>
- Nifi is a simple event processing framework largely
- based on the Flow-Based Programming concepts.
- </description>
- <copyright>NONE</copyright>
- <url>http://nifi.apache.org</url>
- <group>Utilities</group>
- <requires>
- <require>jdk</require>
- </requires>
- <prefix>/opt/${project.artifactId}</prefix>
- <defineStatements>
- <defineStatement>_use_internal_dependency_generator 0</defineStatement>
- </defineStatements>
- <defaultDirmode>750</defaultDirmode>
- <defaultFilemode>640</defaultFilemode>
- <defaultUsername>dataflow</defaultUsername>
- <defaultGroupname>dataflow</defaultGroupname>
- <mappings>
- <mapping>
- <directory>/opt/${project.artifactId}/${project.artifactId}-${project.version}</directory>
- </mapping>
- <mapping>
- <directory>/opt/${project.artifactId}/${project.artifactId}-${project.version}/bin</directory>
- <filemode>750</filemode>
- <sources>
- <source>
- <location>${project.build.directory}/generated-resources/bin/nifi</location>
- <destination>${project.artifactId}</destination>
- <filter>true</filter>
- </source>
- <source>
- <location>${project.build.directory}/generated-resources/bin/wrapper-linux-x86-32</location>
- </source>
- <source>
- <location>${project.build.directory}/generated-resources/bin/wrapper-linux-x86-64</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/${project.artifactId}/${project.artifactId}-${project.version}/conf</directory>
- <configuration>true</configuration>
- <sources>
- <source>
- <location>${project.build.directory}/generated-resources/conf</location>
- <excludes>
- <exclude>nifi.properties</exclude>
- </excludes>
- <filter>true</filter>
- </source>
- <source>
- <location>${project.build.directory}/generated-resources/conf/nifi.properties</location>
- <destination>${project.artifactId}.properties</destination>
- <filter>true</filter>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/${project.artifactId}/${project.artifactId}-${project.version}/lib</directory>
- <dependency />
- <sources>
- <source>
- <location>${project.build.directory}/generated-resources/lib</location>
- <excludes>
- <exclude>**/*-aix*</exclude>
- <exclude>**/*-freebsd*</exclude>
- <exclude>**/*-hpux*</exclude>
- <exclude>**/*-linux-ia*</exclude>
- <exclude>**/*-linux-ppc*</exclude>
- <exclude>**/*-macosx*</exclude>
- <exclude>**/*-solaris*</exclude>
- <exclude>**/*-windows*</exclude>
- </excludes>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/${project.artifactId}/${project.artifactId}-${project.version}/docs</directory>
- <sources>
- <source>
- <location>${project.build.directory}/generated-resources/docs</location>
- </source>
- </sources>
- </mapping>
- <mapping>
- <directory>/opt/${project.artifactId}/${project.artifactId}-${project.version}/logs</directory>
- <sources>
- <source>
- <location>${project.build.directory}/generated-resources/logs</location>
- </source>
- </sources>
- </mapping>
- </mappings>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/19d4a150/assemblies/nifi/src/main/assembly/dependencies.xml
----------------------------------------------------------------------
diff --git a/assemblies/nifi/src/main/assembly/dependencies.xml b/assemblies/nifi/src/main/assembly/dependencies.xml
deleted file mode 100644
index 97f3d4e..0000000
--- a/assemblies/nifi/src/main/assembly/dependencies.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0"?>
-<!--
- 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.
--->
-<assembly>
- <id>bin</id>
- <formats>
- <format>dir</format>
- <format>tar.gz</format>
- </formats>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
-
- <dependencySets>
- <dependencySet>
- <scope>runtime</scope>
- <outputDirectory>lib</outputDirectory>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- <excludes>
- <exclude>nifi-bootstrap</exclude>
- </excludes>
- </dependencySet>
-
- <dependencySet>
- <scope>runtime</scope>
- <outputDirectory>lib/bootstrap</outputDirectory>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- <includes>
- <include>nifi-bootstrap</include>
- </includes>
- </dependencySet>
- </dependencySets>
-
- <fileSets>
- <fileSet>
- <directory>${project.build.directory}/generated-resources/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <directoryMode>0750</directoryMode>
- <fileMode>0750</fileMode>
- <filtered>false</filtered>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/generated-resources/conf</directory>
- <outputDirectory>conf</outputDirectory>
- <excludes>
- <exclude>nifi.properties</exclude>
- </excludes>
- <directoryMode>0750</directoryMode>
- <fileMode>0640</fileMode>
- <filtered>true</filtered>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/generated-resources/lib</directory>
- <outputDirectory>lib</outputDirectory>
- <directoryMode>0750</directoryMode>
- <fileMode>0640</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/generated-resources/logs</directory>
- <outputDirectory>logs</outputDirectory>
- <directoryMode>0750</directoryMode>
- <fileMode>0640</fileMode>
- </fileSet>
- <fileSet>
- <directory>${project.build.directory}/generated-resources/docs</directory>
- <outputDirectory>docs</outputDirectory>
- <directoryMode>0750</directoryMode>
- <fileMode>0640</fileMode>
- <filtered>false</filtered>
- </fileSet>
- </fileSets>
-
- <files>
- <file>
- <source>${project.build.directory}/generated-resources/conf/nifi.properties</source>
- <outputDirectory>conf</outputDirectory>
- <destName>${project.artifactId}.properties</destName>
- <fileMode>0640</fileMode>
- <filtered>true</filtered>
- </file>
- <file>
- <source>${project.build.directory}/generated-resources/bin/nifi.sh</source>
- <outputDirectory>bin</outputDirectory>
- <destName>nifi.sh</destName>
- <fileMode>0750</fileMode>
- <filtered>true</filtered>
- </file>
- <file>
- <source>${project.build.directory}/generated-resources/docs/README.md</source>
- <outputDirectory>docs</outputDirectory>
- <destName>README.md</destName>
- <fileMode>0640</fileMode>
- <filtered>true</filtered>
- </file>
- <file>
- <source>${project.build.directory}/generated-resources/DISCLAIMER</source>
- <outputDirectory>./</outputDirectory>
- <destName>DISCLAIMER</destName>
- <fileMode>0640</fileMode>
- <filtered>true</filtered>
- </file>
- <file>
- <source>${project.build.directory}/generated-resources/DISCLAIMER</source>
- <outputDirectory>./</outputDirectory>
- <destName>DISCLAIMER</destName>
- <fileMode>0640</fileMode>
- <filtered>true</filtered>
- </file>
- <file>
- <source>${project.build.directory}/generated-resources/LICENSE</source>
- <outputDirectory>./</outputDirectory>
- <destName>LICENSE</destName>
- <fileMode>0640</fileMode>
- <filtered>true</filtered>
- </file>
- <file>
- <source>${project.build.directory}/generated-resources/NOTICE</source>
- <outputDirectory>./</outputDirectory>
- <destName>NOTICE</destName>
- <fileMode>0640</fileMode>
- <filtered>true</filtered>
- </file>
- </files>
-</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/19d4a150/assembly/pom.xml
----------------------------------------------------------------------
diff --git a/assembly/pom.xml b/assembly/pom.xml
new file mode 100644
index 0000000..17cf29b
--- /dev/null
+++ b/assembly/pom.xml
@@ -0,0 +1,446 @@
+<?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-parent</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>nifi</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>NiFi Release</name>
+ <description>This is the assembly Apache NiFi (incubating)</description>
+ <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>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/dependencies.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <executable>${project.build.directory}/${project.artifactId}-${project.version}-${nifi.assembly.id}.dir/${nifi.executable}</executable>
+ </configuration>
+ </plugin>
+ </plugins>
+ <resources>
+ <resource>
+ <directory>${basedir}/src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>${project.build.directory}/generated-resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </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>provided</scope> <!-- Provided - we don't want the zip in the libs -->
+ <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>volatile-provenance-repository-nar</artifactId>
+ <type>nar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>persistent-provenance-repository-nar</artifactId>
+ <type>nar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>standard-services-api-nar</artifactId>
+ <type>nar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>ssl-context-service-nar</artifactId>
+ <type>nar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>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>update-attribute-nar</artifactId>
+ <type>nar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>monitor-threshold-nar</artifactId>
+ <type>nar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>hadoop-libraries-nar</artifactId>
+ <type>nar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.nifi</groupId>
+ <artifactId>hadoop-nar</artifactId>
+ <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>
+
+ <!-- nifi.properties: core properties -->
+ <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.flow.configuration.file>./conf/flow.xml.gz</nifi.flow.configuration.file>
+ <nifi.flow.configuration.archive.dir>./conf/archive/</nifi.flow.configuration.archive.dir>
+ <nifi.reporting.task.configuration.file>./conf/reporting-tasks.xml</nifi.reporting.task.configuration.file>
+ <nifi.controller.service.configuration.file>./conf/controller-services.xml</nifi.controller.service.configuration.file>
+ <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.storage.directory>./flowfile_repository/swap</nifi.swap.storage.directory>
+ <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.restore.directory />
+ <nifi.ui.banner.text></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.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>
+
+ <!-- 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>
+
+ <!-- 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.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 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 to execute nifi using Maven. It is assumed that the assembly has a
+ format of type 'dir' so that the executable can be referenced in a defined location.
+ -->
+ <nifi.assembly.id>bin</nifi.assembly.id>
+ <nifi.executable>${project.artifactId}-${project.version}/bin/${project.artifactId}</nifi.executable>
+ </properties>
+ <profiles>
+ <profile>
+ <id>standard-rpm</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rpm-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>rpm</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <name>${project.artifactId}</name>
+ <projversion>${project.version}</projversion>
+ <summary>Apache NiFi (incubating)</summary>
+ <description>
+ Apache Nifi (incubating) is dataflow system
+ based on the Flow-Based Programming concepts.
+ </description>
+ <copyright>NONE</copyright>
+ <url>http://nifi.apache.org</url>
+ <group>Utilities</group>
+ <requires>
+ <require>jdk</require>
+ </requires>
+ <prefix>/opt/${project.artifactId}</prefix>
+ <defineStatements>
+ <defineStatement>_use_internal_dependency_generator 0</defineStatement>
+ </defineStatements>
+ <defaultDirmode>750</defaultDirmode>
+ <defaultFilemode>640</defaultFilemode>
+ <defaultUsername>nifi</defaultUsername>
+ <defaultGroupname>nifi</defaultGroupname>
+ <mappings>
+ <mapping>
+ <directory>/opt/${project.artifactId}/${project.artifactId}-${project.version}</directory>
+ </mapping>
+ <mapping>
+ <directory>/opt/${project.artifactId}/${project.artifactId}-${project.version}/bin</directory>
+ <filemode>750</filemode>
+ <sources>
+ <source>
+ <location>${project.build.directory}/generated-resources/bin/nifi</location>
+ <destination>${project.artifactId}</destination>
+ <filter>true</filter>
+ </source>
+ <source>
+ <location>${project.build.directory}/generated-resources/bin/wrapper-linux-x86-32</location>
+ </source>
+ <source>
+ <location>${project.build.directory}/generated-resources/bin/wrapper-linux-x86-64</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/${project.artifactId}/${project.artifactId}-${project.version}/conf</directory>
+ <configuration>true</configuration>
+ <sources>
+ <source>
+ <location>${project.build.directory}/generated-resources/conf</location>
+ <excludes>
+ <exclude>nifi.properties</exclude>
+ </excludes>
+ <filter>true</filter>
+ </source>
+ <source>
+ <location>${project.build.directory}/generated-resources/conf/nifi.properties</location>
+ <destination>${project.artifactId}.properties</destination>
+ <filter>true</filter>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/${project.artifactId}/${project.artifactId}-${project.version}/lib</directory>
+ <dependency />
+ <sources>
+ <source>
+ <location>${project.build.directory}/generated-resources/lib</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/${project.artifactId}/${project.artifactId}-${project.version}/docs</directory>
+ <sources>
+ <source>
+ <location>${project.build.directory}/generated-resources/docs</location>
+ </source>
+ </sources>
+ </mapping>
+ <mapping>
+ <directory>/opt/${project.artifactId}/${project.artifactId}-${project.version}/logs</directory>
+ <sources>
+ <source>
+ <location>${project.build.directory}/generated-resources/logs</location>
+ </source>
+ </sources>
+ </mapping>
+ </mappings>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/19d4a150/assembly/src/main/assembly/dependencies.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/assembly/dependencies.xml b/assembly/src/main/assembly/dependencies.xml
new file mode 100644
index 0000000..97f3d4e
--- /dev/null
+++ b/assembly/src/main/assembly/dependencies.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+-->
+<assembly>
+ <id>bin</id>
+ <formats>
+ <format>dir</format>
+ <format>tar.gz</format>
+ </formats>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <baseDirectory>${project.artifactId}-${project.version}</baseDirectory>
+
+ <dependencySets>
+ <dependencySet>
+ <scope>runtime</scope>
+ <outputDirectory>lib</outputDirectory>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <excludes>
+ <exclude>nifi-bootstrap</exclude>
+ </excludes>
+ </dependencySet>
+
+ <dependencySet>
+ <scope>runtime</scope>
+ <outputDirectory>lib/bootstrap</outputDirectory>
+ <useTransitiveFiltering>true</useTransitiveFiltering>
+ <includes>
+ <include>nifi-bootstrap</include>
+ </includes>
+ </dependencySet>
+ </dependencySets>
+
+ <fileSets>
+ <fileSet>
+ <directory>${project.build.directory}/generated-resources/bin</directory>
+ <outputDirectory>bin</outputDirectory>
+ <directoryMode>0750</directoryMode>
+ <fileMode>0750</fileMode>
+ <filtered>false</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/generated-resources/conf</directory>
+ <outputDirectory>conf</outputDirectory>
+ <excludes>
+ <exclude>nifi.properties</exclude>
+ </excludes>
+ <directoryMode>0750</directoryMode>
+ <fileMode>0640</fileMode>
+ <filtered>true</filtered>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/generated-resources/lib</directory>
+ <outputDirectory>lib</outputDirectory>
+ <directoryMode>0750</directoryMode>
+ <fileMode>0640</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/generated-resources/logs</directory>
+ <outputDirectory>logs</outputDirectory>
+ <directoryMode>0750</directoryMode>
+ <fileMode>0640</fileMode>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/generated-resources/docs</directory>
+ <outputDirectory>docs</outputDirectory>
+ <directoryMode>0750</directoryMode>
+ <fileMode>0640</fileMode>
+ <filtered>false</filtered>
+ </fileSet>
+ </fileSets>
+
+ <files>
+ <file>
+ <source>${project.build.directory}/generated-resources/conf/nifi.properties</source>
+ <outputDirectory>conf</outputDirectory>
+ <destName>${project.artifactId}.properties</destName>
+ <fileMode>0640</fileMode>
+ <filtered>true</filtered>
+ </file>
+ <file>
+ <source>${project.build.directory}/generated-resources/bin/nifi.sh</source>
+ <outputDirectory>bin</outputDirectory>
+ <destName>nifi.sh</destName>
+ <fileMode>0750</fileMode>
+ <filtered>true</filtered>
+ </file>
+ <file>
+ <source>${project.build.directory}/generated-resources/docs/README.md</source>
+ <outputDirectory>docs</outputDirectory>
+ <destName>README.md</destName>
+ <fileMode>0640</fileMode>
+ <filtered>true</filtered>
+ </file>
+ <file>
+ <source>${project.build.directory}/generated-resources/DISCLAIMER</source>
+ <outputDirectory>./</outputDirectory>
+ <destName>DISCLAIMER</destName>
+ <fileMode>0640</fileMode>
+ <filtered>true</filtered>
+ </file>
+ <file>
+ <source>${project.build.directory}/generated-resources/DISCLAIMER</source>
+ <outputDirectory>./</outputDirectory>
+ <destName>DISCLAIMER</destName>
+ <fileMode>0640</fileMode>
+ <filtered>true</filtered>
+ </file>
+ <file>
+ <source>${project.build.directory}/generated-resources/LICENSE</source>
+ <outputDirectory>./</outputDirectory>
+ <destName>LICENSE</destName>
+ <fileMode>0640</fileMode>
+ <filtered>true</filtered>
+ </file>
+ <file>
+ <source>${project.build.directory}/generated-resources/NOTICE</source>
+ <outputDirectory>./</outputDirectory>
+ <destName>NOTICE</destName>
+ <fileMode>0640</fileMode>
+ <filtered>true</filtered>
+ </file>
+ </files>
+</assembly>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/19d4a150/commons/core-flowfile-attributes/pom.xml
----------------------------------------------------------------------
diff --git a/commons/core-flowfile-attributes/pom.xml b/commons/core-flowfile-attributes/pom.xml
index d611134..5a82ffa 100644
--- a/commons/core-flowfile-attributes/pom.xml
+++ b/commons/core-flowfile-attributes/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
- <artifactId>nifi-parent</artifactId>
+ <artifactId>nifi-commons-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -26,7 +26,4 @@
<packaging>jar</packaging>
<name>NiFi: Core FlowFile Attributes</name>
-
- <dependencies>
- </dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/19d4a150/commons/data-provenance-utils/pom.xml
----------------------------------------------------------------------
diff --git a/commons/data-provenance-utils/pom.xml b/commons/data-provenance-utils/pom.xml
index 0f33c06..162d4f3 100644
--- a/commons/data-provenance-utils/pom.xml
+++ b/commons/data-provenance-utils/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
- <artifactId>nifi-parent</artifactId>
+ <artifactId>nifi-commons-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -31,12 +31,10 @@
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>[0.0.1-SNAPSHOT,1.0.0-SNAPSHOT)</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-core-flowfile-attributes</artifactId>
- <version>0.0.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/19d4a150/commons/flowfile-packager/pom.xml
----------------------------------------------------------------------
diff --git a/commons/flowfile-packager/pom.xml b/commons/flowfile-packager/pom.xml
index f4001fe..9cf4ba8 100644
--- a/commons/flowfile-packager/pom.xml
+++ b/commons/flowfile-packager/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
- <artifactId>nifi-parent</artifactId>
+ <artifactId>nifi-commons-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -31,12 +31,10 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
- <version>1.9</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.3.2</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/19d4a150/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java
----------------------------------------------------------------------
diff --git a/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java b/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java
index 2437279..07baab1 100644
--- a/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java
+++ b/commons/flowfile-packager/src/main/java/org/apache/nifi/util/FlowFilePackagerV1.java
@@ -58,8 +58,8 @@ public class FlowFilePackagerV1 implements FlowFilePackager {
sb.append("<?xml version=\"1.0\" encoding=\"UTF-8\"?><!DOCTYPE properties\n SYSTEM \"http://java.sun.com/dtd/properties.dtd\">\n");
sb.append("<properties>");
for (final Map.Entry<String, String> entry : attributes.entrySet()) {
- final String escapedKey = StringEscapeUtils.escapeXml(entry.getKey());
- final String escapedValue = StringEscapeUtils.escapeXml(entry.getValue());
+ final String escapedKey = StringEscapeUtils.escapeXml11(entry.getKey());
+ final String escapedValue = StringEscapeUtils.escapeXml11(entry.getValue());
sb.append("\n <entry key=\"").append(escapedKey).append("\">").append(escapedValue).append("</entry>");
}
sb.append("</properties>");
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/19d4a150/commons/naive-search-ring-buffer/pom.xml
----------------------------------------------------------------------
diff --git a/commons/naive-search-ring-buffer/pom.xml b/commons/naive-search-ring-buffer/pom.xml
index e84be0f..c9628f0 100644
--- a/commons/naive-search-ring-buffer/pom.xml
+++ b/commons/naive-search-ring-buffer/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
- <artifactId>nifi-parent</artifactId>
+ <artifactId>nifi-commons-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/19d4a150/commons/nifi-expression-language/pom.xml
----------------------------------------------------------------------
diff --git a/commons/nifi-expression-language/pom.xml b/commons/nifi-expression-language/pom.xml
index dfb1ea5..196c048 100644
--- a/commons/nifi-expression-language/pom.xml
+++ b/commons/nifi-expression-language/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>org.apache.nifi</groupId>
- <artifactId>nifi-parent</artifactId>
+ <artifactId>nifi-commons-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -32,7 +32,6 @@
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr3-maven-plugin</artifactId>
- <version>3.5.2</version>
<executions>
<execution>
<goals>
@@ -48,12 +47,10 @@
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr-runtime</artifactId>
- <version>3.5.2</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
<artifactId>nifi-api</artifactId>
- <version>[0.0.1-SNAPSHOT, 1.0.0-SNAPSHOT)</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/19d4a150/commons/nifi-file-utils/pom.xml
----------------------------------------------------------------------
diff --git a/commons/nifi-file-utils/pom.xml b/commons/nifi-file-utils/pom.xml
index e3cf792..2af4d63 100644
--- a/commons/nifi-file-utils/pom.xml
+++ b/commons/nifi-file-utils/pom.xml
@@ -14,9 +14,10 @@
limitations under the License.
-->
<modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.apache.nifi</groupId>
- <artifactId>nifi-parent</artifactId>
+ <artifactId>nifi-commons-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -29,7 +30,6 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.10</version>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/19d4a150/commons/nifi-logging-utils/pom.xml
----------------------------------------------------------------------
diff --git a/commons/nifi-logging-utils/pom.xml b/commons/nifi-logging-utils/pom.xml
index ce5064b..a6c3f44 100644
--- a/commons/nifi-logging-utils/pom.xml
+++ b/commons/nifi-logging-utils/pom.xml
@@ -15,9 +15,10 @@
-->
<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-parent</artifactId>
+ <artifactId>nifi-commons-parent</artifactId>
<version>0.0.1-SNAPSHOT</version>
</parent>
@@ -26,7 +27,7 @@
<name>NiFi Logging Utils</name>
<description>Utilities for logging</description>
- <dependencies>
+ <dependencies>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>