This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push: new 48e8457a8a NIFI-13442 Removed nifi-poi-utils and consolidated nifi-poi-services 48e8457a8a is described below commit 48e8457a8ab295d17a9fee306bffb41525c22e74 Author: dan-s1 <dsti...@gmail.com> AuthorDate: Tue Jun 25 15:55:28 2024 +0000 NIFI-13442 Removed nifi-poi-utils and consolidated nifi-poi-services This closes #9002 Signed-off-by: David Handermann <exceptionfact...@apache.org> --- .../nifi-poi-bundle/nifi-poi-services/pom.xml | 5 ----- .../java/org/apache/nifi/excel/ProtectionType.java | 0 .../nifi-poi-bundle/nifi-poi-utils/pom.xml | 26 ---------------------- nifi-extension-bundles/nifi-poi-bundle/pom.xml | 1 - 4 files changed, 32 deletions(-) diff --git a/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/pom.xml b/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/pom.xml index 5fe26e6863..6d7741cea8 100644 --- a/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/pom.xml +++ b/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/pom.xml @@ -82,10 +82,5 @@ <artifactId>nifi-avro-record-utils</artifactId> <version>2.0.0-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-poi-utils</artifactId> - <version>2.0.0-SNAPSHOT</version> - </dependency> </dependencies> </project> \ No newline at end of file diff --git a/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-utils/src/main/java/org/apache/nifi/excel/ProtectionType.java b/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ProtectionType.java similarity index 100% rename from nifi-extension-bundles/nifi-poi-bundle/nifi-poi-utils/src/main/java/org/apache/nifi/excel/ProtectionType.java rename to nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ProtectionType.java diff --git a/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-utils/pom.xml b/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-utils/pom.xml deleted file mode 100644 index e4120939b2..0000000000 --- a/nifi-extension-bundles/nifi-poi-bundle/nifi-poi-utils/pom.xml +++ /dev/null @@ -1,26 +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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>org.apache.nifi</groupId> - <artifactId>nifi-poi-bundle</artifactId> - <version>2.0.0-SNAPSHOT</version> - </parent> - <artifactId>nifi-poi-utils</artifactId> -</project> \ No newline at end of file diff --git a/nifi-extension-bundles/nifi-poi-bundle/pom.xml b/nifi-extension-bundles/nifi-poi-bundle/pom.xml index a8f57577e8..93bd06d239 100644 --- a/nifi-extension-bundles/nifi-poi-bundle/pom.xml +++ b/nifi-extension-bundles/nifi-poi-bundle/pom.xml @@ -29,7 +29,6 @@ <modules> <module>nifi-poi-nar</module> <module>nifi-poi-services</module> - <module>nifi-poi-utils</module> </modules> <dependencyManagement> <dependencies>