mirror of
https://github.com/apache/nifi.git
synced 2025-02-07 18:48:51 +00:00
683b1d9952
- Refactored Flow Synchronization to make code cleaner - Updated Authorizers to forcibly inherit Users, Groups, and Access Policies if the local flow is empty. - Updated FlowFileRepositories to use SerializedRepositoryRecord instead of RepositoryRecord, so that we have the ability to read records without already knowing the Queue objects. Updated StandardFlowSynchronizer so that if the flow is not inheritable but the controller has not yet been initialized, the flow is backed up and replaced instead of NiFi failing to start - Added system tests. Updated FlowController so that if it fails to inherit flow due to flow uninheritability that it notifies the cluster of this instead of remaining in the 'CONNECTING' state. - Added additional log statements to aid in debugging NIFI-6849: Rebased against master. Updated Admin Guide to describe new cluster flow inheritance behavior NIFI-6849: Addressed review feedback NIFI-6849: Addressed review feedback: Relocated logic for bundle compatibility into the BundleCompatibilityCheck class. Fixed logic that prevented users/groups/policies from being forcibly inherited during startup This closes #3891
225 lines
8.9 KiB
XML
225 lines
8.9 KiB
XML
<?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/xsd/maven-4.0.0.xsd">
|
|
<parent>
|
|
<artifactId>nifi-system-tests</artifactId>
|
|
<groupId>org.apache.nifi</groupId>
|
|
<version>1.12.0-SNAPSHOT</version>
|
|
</parent>
|
|
<modelVersion>4.0.0</modelVersion>
|
|
|
|
<artifactId>nifi-system-test-suite</artifactId>
|
|
<packaging>jar</packaging>
|
|
|
|
<build>
|
|
<plugins>
|
|
<plugin>
|
|
<artifactId>maven-assembly-plugin</artifactId>
|
|
<configuration>
|
|
<finalName>nifi-lib</finalName>
|
|
<attach>false</attach>
|
|
</configuration>
|
|
<executions>
|
|
<execution>
|
|
<id>make shared resource</id>
|
|
<goals>
|
|
<goal>single</goal>
|
|
</goals>
|
|
<phase>generate-test-resources</phase>
|
|
<configuration>
|
|
<archiverConfig>
|
|
<defaultDirectoryMode>0775</defaultDirectoryMode>
|
|
<directoryMode>0775</directoryMode>
|
|
<fileMode>0664</fileMode>
|
|
</archiverConfig>
|
|
<descriptors>
|
|
<descriptor>src/test/assembly/dependencies.xml</descriptor>
|
|
</descriptors>
|
|
<tarLongFileMode>posix</tarLongFileMode>
|
|
<formats>
|
|
<format>dir</format>
|
|
</formats>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.apache.rat</groupId>
|
|
<artifactId>apache-rat-plugin</artifactId>
|
|
<configuration>
|
|
<excludes combine.children="append">
|
|
<exclude>src/test/resources/flows/mismatched-flows/flow1.xml.gz</exclude>
|
|
<exclude>src/test/resources/flows/mismatched-flows/flow2.xml.gz</exclude>
|
|
<exclude>src/test/resources/flows/missing-connection/with-connection.xml.gz</exclude>
|
|
<exclude>src/test/resources/flows/missing-connection/without-connection.xml.gz</exclude>
|
|
<exclude>src/test/resources/keystore.jks</exclude>
|
|
<exclude>src/test/resources/truststore.jks</exclude>
|
|
</excludes>
|
|
</configuration>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
|
|
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>org.apache.nifi</groupId>
|
|
<artifactId>nifi-client-dto</artifactId>
|
|
<version>1.12.0-SNAPSHOT</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.nifi</groupId>
|
|
<artifactId>nifi-toolkit-cli</artifactId>
|
|
<version>1.12.0-SNAPSHOT</version>
|
|
<scope>test</scope>
|
|
<exclusions>
|
|
<exclusion>
|
|
<groupId>org.slf4j</groupId>
|
|
<artifactId>slf4j-log4j12</artifactId>
|
|
</exclusion>
|
|
</exclusions>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.glassfish.jersey.inject</groupId>
|
|
<artifactId>jersey-hk2</artifactId>
|
|
<version>2.27</version>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.slf4j</groupId>
|
|
<artifactId>slf4j-simple</artifactId>
|
|
<scope>test</scope>
|
|
</dependency>
|
|
|
|
<dependency> <!-- handling this explicitly Must be in root lib -->
|
|
<groupId>javax.servlet</groupId>
|
|
<artifactId>javax.servlet-api</artifactId>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
<dependency> <!-- handling this explicitly Must be in root lib -->
|
|
<groupId>org.eclipse.jetty.toolchain</groupId>
|
|
<artifactId>jetty-schemas</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>slf4j-api</artifactId>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>ch.qos.logback</groupId>
|
|
<artifactId>logback-classic</artifactId>
|
|
<scope>compile</scope>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.nifi</groupId>
|
|
<artifactId>nifi-api</artifactId>
|
|
<version>1.12.0-SNAPSHOT</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.nifi</groupId>
|
|
<artifactId>nifi-framework-api</artifactId>
|
|
<version>1.12.0-SNAPSHOT</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.nifi</groupId>
|
|
<artifactId>nifi-runtime</artifactId>
|
|
<version>1.12.0-SNAPSHOT</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.nifi</groupId>
|
|
<artifactId>nifi-bootstrap</artifactId>
|
|
<version>1.12.0-SNAPSHOT</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.nifi</groupId>
|
|
<artifactId>nifi-jetty-bundle</artifactId>
|
|
<version>1.12.0-SNAPSHOT</version>
|
|
<type>nar</type>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.nifi</groupId>
|
|
<artifactId>nifi-framework-nar</artifactId>
|
|
<version>1.12.0-SNAPSHOT</version>
|
|
<type>nar</type>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.nifi</groupId>
|
|
<artifactId>nifi-provenance-repository-nar</artifactId>
|
|
<version>1.12.0-SNAPSHOT</version>
|
|
<type>nar</type>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.nifi</groupId>
|
|
<artifactId>nifi-standard-services-api-nar</artifactId>
|
|
<version>1.12.0-SNAPSHOT</version>
|
|
<type>nar</type>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.nifi</groupId>
|
|
<artifactId>nifi-system-test-extensions-nar</artifactId>
|
|
<version>1.12.0-SNAPSHOT</version>
|
|
<type>nar</type>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>org.apache.nifi</groupId>
|
|
<artifactId>nifi-system-test-extensions2-nar</artifactId>
|
|
<version>1.12.0-SNAPSHOT</version>
|
|
<type>nar</type>
|
|
</dependency>
|
|
|
|
<!-- dependencies for jaxb/activation/annotation for running NiFi on Java 11 -->
|
|
<!-- TODO: remove these once minimum Java version is 11 -->
|
|
<dependency>
|
|
<groupId>javax.xml.bind</groupId>
|
|
<artifactId>jaxb-api</artifactId>
|
|
<version>2.3.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.sun.xml.bind</groupId>
|
|
<artifactId>jaxb-impl</artifactId>
|
|
<version>2.3.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>com.sun.xml.bind</groupId>
|
|
<artifactId>jaxb-core</artifactId>
|
|
<version>2.3.0</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>javax.annotation</groupId>
|
|
<artifactId>javax.annotation-api</artifactId>
|
|
<version>1.3.2</version>
|
|
</dependency>
|
|
<dependency>
|
|
<groupId>javax.activation</groupId>
|
|
<artifactId>javax.activation-api</artifactId>
|
|
<version>1.2.0</version>
|
|
</dependency>
|
|
|
|
</dependencies>
|
|
|
|
</project> |