NIFI-12451 This closes apache#8104. Removed Bootstrap Notification Se…

…rvices - Refactored Security Property handling and bootstrap certificate generation - Removed unnecessary dependencies from nifi-bootstrap - Removed unnecessary and unused settings from bootstrap.conf Signed-off-by: Joseph Witt <[email protected]>
nexr · Dec 4, 2023 · 456cf7d · 456cf7d
1 parent 283abad
commit 456cf7d
Show file tree

Hide file tree

Showing 44 changed files with 594 additions and 3,039 deletions.
diff --git a/nifi-assembly/pom.xml b/nifi-assembly/pom.xml
@@ -144,6 +144,18 @@ language governing permissions and limitations under the License. -->
             <version>2.0.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.nifi</groupId>
+            <artifactId>nifi-flow-encryptor</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.nifi</groupId>
+            <artifactId>nifi-single-user-utils</artifactId>
+            <version>2.0.0-SNAPSHOT</version>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-api</artifactId>

diff --git a/nifi-assembly/src/main/assembly/common.xml b/nifi-assembly/src/main/assembly/common.xml
@@ -28,9 +28,12 @@
                 <include>*:slf4j-api</include>
                 <include>*:logback-classic</include>
                 <include>*:logback-core</include>
+                <include>*:commons-lang3</include>
                 <include>*:nifi-api</include>
                 <include>*:nifi-property-protection-api</include>
                 <include>*:nifi-per-process-group-logging</include>
+                <include>*:nifi-single-user-utils</include>
+                <include>*:nifi-flow-encryptor</include>
             </includes>
         </dependencySet>
 

diff --git a/nifi-assembly/src/main/assembly/dependencies.xml b/nifi-assembly/src/main/assembly/dependencies.xml
@@ -37,6 +37,8 @@
                 <exclude>*:nifi-property-protection-factory</exclude>
                 <exclude>*:nifi-resources</exclude>
                 <exclude>*:nifi-docs</exclude>
+                <exclude>*:nifi-single-user-utils</exclude>
+                <exclude>*:nifi-flow-encryptor</exclude>
                 <!-- exclude AspectJ library from lib included in the aspectj subdir -->
                 <exclude>org.aspectj:aspectjweaver</exclude>
             </excludes>

diff --git a/nifi-bootstrap/pom.xml b/nifi-bootstrap/pom.xml
@@ -37,91 +37,13 @@ language governing permissions and limitations under the License. -->
         </dependency>
         <dependency>
             <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-security-utils</artifactId>
+            <artifactId>nifi-security-cert-builder</artifactId>
             <version>2.0.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-xml-processing</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-flow-encryptor</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-single-user-utils</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-        <!-- Jakarta Mail 1 required for compatibility with Jakarta Activation 1 used with JAXB 2 -->
-        <dependency>
-            <groupId>jakarta.mail</groupId>
-            <artifactId>jakarta.mail-api</artifactId>
-            <version>1.6.7</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>jakarta.mail</artifactId>
-            <version>1.6.7</version>
-        </dependency>
-        <dependency>
-            <groupId>jakarta.activation</groupId>
-            <artifactId>jakarta.activation-api</artifactId>
-            <version>1.2.2</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.activation</groupId>
-            <artifactId>jakarta.activation</artifactId>
-            <version>1.2.2</version>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-expression-language</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>mockwebserver</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <!-- This needs to be here because it is relied upon by the nifi-runtime which starts NiFi.  It uses this bootstrap module
-        and the libs that get laid down in lib/bootstrap to create a child classloader with these bits in it -->
         <dependency>
             <groupId>org.apache.nifi</groupId>
             <artifactId>nifi-properties-loader</artifactId>
             <version>2.0.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-properties</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-property-utils</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.nifi</groupId>
-            <artifactId>nifi-mock</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java b/nifi-bootstrap/src/main/java/org/apache/nifi/bootstrap/BootstrapCodec.java
@@ -25,8 +25,6 @@
 import java.io.OutputStreamWriter;
 import java.util.Arrays;
 
-import org.apache.nifi.bootstrap.exception.InvalidCommandException;
-
 public class BootstrapCodec {
 
     private final RunNiFi runner;

diff --git a/...ap/exception/InvalidCommandException.java → ...fi/bootstrap/InvalidCommandException.java b/...ap/exception/InvalidCommandException.java → ...fi/bootstrap/InvalidCommandException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.nifi.bootstrap.exception;
+package org.apache.nifi.bootstrap;
 
 public class InvalidCommandException extends Exception {