Repository: nifi-minifi Updated Branches: refs/heads/master b028f5a00 -> cbb2bdd8e
http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/cbb2bdd8/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.yml index 46be605..a62ab4a 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ProcessGroupsAndRemoteProcessGroups.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -MiNiFi Config Version: 2 +MiNiFi Config Version: 3 Flow Controller: name: ProcessGroupsAndRemoteProcessGroups comment: '' @@ -101,6 +101,7 @@ Processors: Properties: Delete Attributes Expression: top: top +Controller Services: [] Process Groups: - id: 207888b1-0158-1000-0000-000000000000 name: middle @@ -118,6 +119,7 @@ Process Groups: Properties: Delete Attributes Expression: middle: middle + Controller Services: [] Process Groups: - id: 20794cd4-0158-1000-0000-000000000000 name: bottom @@ -135,6 +137,7 @@ Process Groups: Properties: Delete Attributes Expression: bottom: bottom + Controller Services: [] Process Groups: [] Input Ports: - id: 207a5f50-0158-1000-0000-000000000000 http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/cbb2bdd8/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ReplaceTextExpressionLanguageCSVReformatting.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ReplaceTextExpressionLanguageCSVReformatting.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ReplaceTextExpressionLanguageCSVReformatting.yml index cc89aa6..ec14cff 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ReplaceTextExpressionLanguageCSVReformatting.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/ReplaceTextExpressionLanguageCSVReformatting.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -MiNiFi Config Version: 2 +MiNiFi Config Version: 3 Flow Controller: name: ReplaceTextExpressionLanguageCSVReformatting comment: '' @@ -123,6 +123,7 @@ Processors: 2006,10-01-2004,10may2004 2007,15-05-2006,10jun2005 2009,8-8-2008,10aug2008 +Controller Services: [] Process Groups: [] Input Ports: [] Output Ports: [] http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/cbb2bdd8/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.yml index c70a018..9c4155a 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/SimpleTailFileToRPG.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -MiNiFi Config Version: 2 +MiNiFi Config Version: 3 Flow Controller: name: Simple TailFile To RPG comment: '' @@ -77,6 +77,7 @@ Processors: tailfile-maximum-age: 24 hours tailfile-recursive-lookup: 'false' tailfile-rolling-strategy: Fixed name +Controller Services: [] Process Groups: [] Input Ports: [] Output Ports: [] http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/cbb2bdd8/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFramework.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFramework.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFramework.yml index b510f97..8bf6ef9 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFramework.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFramework.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -MiNiFi Config Version: 2 +MiNiFi Config Version: 3 Flow Controller: name: StressTestFramework comment: '' @@ -98,6 +98,7 @@ Processors: Delete Attributes Expression: property 1: value 1 property 2: value 2 ${nextInt()} +Controller Services: [] Process Groups: [] Input Ports: [] Output Ports: [] http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/cbb2bdd8/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.yml index 95e8f52..1106a85 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/StressTestFrameworkFunnel.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -MiNiFi Config Version: 2 +MiNiFi Config Version: 3 Flow Controller: name: StressTestFramework comment: '' @@ -143,6 +143,7 @@ Processors: Delete Attributes Expression: property 1: value 1 property 2: value 2 ${nextInt()} +Controller Services: [] Process Groups: [] Input Ports: [] Output Ports: [] http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/cbb2bdd8/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/config.yml ---------------------------------------------------------------------- diff --git a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/config.yml b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/config.yml index c1685af..8886205 100644 --- a/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/config.yml +++ b/minifi-toolkit/minifi-toolkit-configuration/src/test/resources/config.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -MiNiFi Config Version: 2 +MiNiFi Config Version: 3 Flow Controller: name: MiNiFi Flow comment: '' http://git-wip-us.apache.org/repos/asf/nifi-minifi/blob/cbb2bdd8/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 5707a9d..446d8ea 100644 --- a/pom.xml +++ b/pom.xml @@ -206,12 +206,6 @@ limitations under the License. </dependency> <dependency> <groupId>org.apache.nifi.minifi</groupId> - <artifactId>minifi-standard-services-api-nar</artifactId> - <version>0.2.0-SNAPSHOT</version> - <type>nar</type> - </dependency> - <dependency> - <groupId>org.apache.nifi.minifi</groupId> <artifactId>minifi-update-attribute-nar</artifactId> <version>0.2.0-SNAPSHOT</version> <type>nar</type> @@ -546,6 +540,11 @@ limitations under the License. <version>${org.apache.nifi.version}</version> </dependency> <dependency> + <groupId>org.apache.nifi</groupId> + <artifactId>nifi-site-to-site-reporting-task</artifactId> + <version>${org.apache.nifi.version}</version> + </dependency> + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> <version>2.5</version> @@ -561,19 +560,19 @@ limitations under the License. <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-jdk15on</artifactId> - <version>1.54</version> + <version>1.55</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpg-jdk15on</artifactId> - <version>1.54</version> + <version>1.55</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpkix-jdk15on</artifactId> - <version>1.54</version> + <version>1.55</version> <scope>provided</scope> </dependency> <dependency>
