mirror of https://github.com/apache/nifi.git
NIFI-13651 Moved framework-related modules under framework-bundle
- Removed references to nifi-property-utils under nifi-extension-bundles This closes #9169 Signed-off-by: David Handermann <exceptionfactory@apache.org>
This commit is contained in:
Joseph Witt
exceptionfactory
parent
f7bca176e5
commit
e4ec0cb20d
|
|
@ -24,7 +24,7 @@ on:
|
|||
- 'nifi-api/**'
|
||||
- 'nifi-framework-api/**'
|
||||
- 'nifi-framework-bundle/**'
|
||||
- 'nifi-extension-bundles/nifi-py4j-bundle/**'
|
||||
- 'nifi-extension-bundles/nifi-py4j-extension-bundle/**'
|
||||
- 'nifi-stateless/**'
|
||||
pull_request:
|
||||
paths:
|
||||
|
|
@ -34,7 +34,7 @@ on:
|
|||
- 'nifi-api/**'
|
||||
- 'nifi-framework-api/**'
|
||||
- 'nifi-framework-bundle/**'
|
||||
- 'nifi-extension-bundles/nifi-py4j-bundle/**'
|
||||
- 'nifi-extension-bundles/nifi-py4j-extension-bundle/**'
|
||||
- 'nifi-stateless/**'
|
||||
|
||||
env:
|
||||
|
|
|
|||
|
|
@ -64,11 +64,6 @@ language governing permissions and limitations under the License. -->
|
|||
<groupId>org.elasticsearch.client</groupId>
|
||||
<artifactId>elasticsearch-rest-client</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.nifi</groupId>
|
||||
<artifactId>nifi-property-utils</artifactId>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.nifi</groupId>
|
||||
<artifactId>nifi-mock</artifactId>
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@ import org.apache.hadoop.hdfs.inotify.EventBatch;
|
|||
import org.apache.nifi.components.state.Scope;
|
||||
import org.apache.nifi.processors.hadoop.inotify.util.EventTestUtils;
|
||||
import org.apache.nifi.util.MockFlowFile;
|
||||
import org.apache.nifi.util.NiFiProperties;
|
||||
import org.apache.nifi.util.TestRunner;
|
||||
import org.apache.nifi.util.TestRunners;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
|
|
@ -43,13 +42,11 @@ import static org.mockito.Mockito.verify;
|
|||
import static org.mockito.Mockito.when;
|
||||
|
||||
public class TestGetHDFSEvents {
|
||||
NiFiProperties mockNiFiProperties;
|
||||
DFSInotifyEventInputStream inotifyEventInputStream;
|
||||
HdfsAdmin hdfsAdmin;
|
||||
|
||||
@BeforeEach
|
||||
public void setup() {
|
||||
mockNiFiProperties = mock(NiFiProperties.class);
|
||||
inotifyEventInputStream = mock(DFSInotifyEventInputStream.class);
|
||||
hdfsAdmin = mock(HdfsAdmin.class);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -63,12 +63,6 @@
|
|||
<version>2.0.0-SNAPSHOT</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.nifi</groupId>
|
||||
<artifactId>nifi-property-utils</artifactId>
|
||||
<version>2.0.0-SNAPSHOT</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.nifi</groupId>
|
||||
<artifactId>nifi-record</artifactId>
|
||||
|
|
|
|||
|
|
@ -86,11 +86,5 @@
|
|||
<version>2.0.0-SNAPSHOT</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<!-- Included for nifi-utils StringUtils -->
|
||||
<dependency>
|
||||
<groupId>org.apache.nifi</groupId>
|
||||
<artifactId>nifi-property-utils</artifactId>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -37,11 +37,6 @@
|
|||
<artifactId>nifi-utils</artifactId>
|
||||
<version>2.0.0-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.nifi</groupId>
|
||||
<artifactId>nifi-property-utils</artifactId>
|
||||
<version>2.0.0-SNAPSHOT</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.nifi</groupId>
|
||||
<artifactId>nifi-record</artifactId>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
-->
|
||||
<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-py4j-bundle</artifactId>
|
||||
<artifactId>nifi-py4j-extension-bundle</artifactId>
|
||||
<groupId>org.apache.nifi</groupId>
|
||||
<version>2.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
-->
|
||||
<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-py4j-bundle</artifactId>
|
||||
<artifactId>nifi-py4j-extension-bundle</artifactId>
|
||||
<groupId>org.apache.nifi</groupId>
|
||||
<version>2.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
Before Width: | Height: | Size: 800 KiB After Width: | Height: | Size: 800 KiB |
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
<parent>
|
||||
<groupId>org.apache.nifi</groupId>
|
||||
<artifactId>nifi-py4j-bundle</artifactId>
|
||||
<artifactId>nifi-py4j-extension-bundle</artifactId>
|
||||
<version>2.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
|
|
@ -15,13 +15,11 @@
|
|||
-->
|
||||
<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-py4j-bundle</artifactId>
|
||||
<artifactId>nifi-py4j-extension-bundle</artifactId>
|
||||
<groupId>org.apache.nifi</groupId>
|
||||
<version>2.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>nifi-python-test-extensions</artifactId>
|
||||
|
||||
|
||||
</project>
|
||||
|
|
@ -22,16 +22,14 @@
|
|||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<artifactId>nifi-py4j-bundle</artifactId>
|
||||
<artifactId>nifi-py4j-extension-bundle</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
|
||||
<modules>
|
||||
<module>nifi-python-framework-api</module>
|
||||
<module>nifi-py4j-bridge</module>
|
||||
<module>nifi-python-framework</module>
|
||||
<module>nifi-python-extension-api</module>
|
||||
<module>nifi-py4j-nar</module>
|
||||
<module>nifi-python-test-extensions</module>
|
||||
<module>nifi-py4j-integration-tests</module>
|
||||
</modules>
|
||||
</project>
|
||||
|
||||
|
|
@ -27,7 +27,6 @@
|
|||
<module>nifi-standard-shared-bundle</module>
|
||||
<module>nifi-hadoop-bundle</module>
|
||||
<module>nifi-hadoop-libraries-bundle</module>
|
||||
<module>nifi-provenance-repository-bundle</module>
|
||||
<module>nifi-standard-bundle</module>
|
||||
<module>nifi-standard-services</module>
|
||||
<module>nifi-standard-services-api-bom</module>
|
||||
|
|
@ -44,9 +43,6 @@
|
|||
<module>nifi-media-bundle</module>
|
||||
<module>nifi-avro-bundle</module>
|
||||
<module>nifi-azure-bundle</module>
|
||||
<module>nifi-ldap-iaa-providers-bundle</module>
|
||||
<module>nifi-kerberos-iaa-providers-bundle</module>
|
||||
<module>nifi-single-user-iaa-providers-bundle</module>
|
||||
<module>nifi-scripting-bundle</module>
|
||||
<module>nifi-elasticsearch-bundle</module>
|
||||
<module>nifi-amqp-bundle</module>
|
||||
|
|
@ -69,6 +65,7 @@
|
|||
<module>nifi-poi-bundle</module>
|
||||
<module>nifi-cdc</module>
|
||||
<module>nifi-parquet-bundle</module>
|
||||
<module>nifi-py4j-extension-bundle</module>
|
||||
<module>nifi-extension-utils</module>
|
||||
<module>nifi-redis-bundle</module>
|
||||
<module>nifi-network-bundle</module>
|
||||
|
|
@ -92,12 +89,10 @@
|
|||
<module>nifi-jslt-bundle</module>
|
||||
<module>nifi-iotdb-bundle</module>
|
||||
<module>nifi-cipher-bundle</module>
|
||||
<module>nifi-py4j-bundle</module>
|
||||
<module>nifi-compress-bundle</module>
|
||||
<module>nifi-opentelemetry-bundle</module>
|
||||
<module>nifi-apicurio-bundle</module>
|
||||
<module>nifi-jolt-bundle</module>
|
||||
<module>nifi-questdb-bundle</module>
|
||||
<module>nifi-protobuf-bundle</module>
|
||||
<module>nifi-github-bundle</module>
|
||||
</modules>
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@
|
|||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>org.apache.nifi</groupId>
|
||||
<artifactId>nifi-framework</artifactId>
|
||||
<artifactId>nifi-framework-extensions</artifactId>
|
||||
<version>2.0.0-SNAPSHOT</version>
|
||||
</parent>
|
||||
<artifactId>nifi-framework-kubernetes-bundle</artifactId>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue