This is an automated email from the ASF dual-hosted git repository.
pvillard 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 0ed1efc50a NIFI-11712 Removed java.net.preferIPv4Stack from
bootstrap.conf
0ed1efc50a is described below
commit 0ed1efc50a61706f42e3189014eb776a27c3dc39
Author: exceptionfactory <[email protected]>
AuthorDate: Thu Jun 15 16:03:25 2023 -0500
NIFI-11712 Removed java.net.preferIPv4Stack from bootstrap.conf
Signed-off-by: Pierre Villard <[email protected]>
This closes #7392.
---
minifi/minifi-bootstrap/src/test/resources/MINIFI-516/bootstrap.conf | 2 --
.../bootstrap-provenance-reporting/bootstrap.conf.configured | 2 --
.../resources/bootstrap-provenance-reporting/bootstrap.conf.default | 2 --
.../src/test/resources/bootstrap-ssl-ctx/bootstrap.conf.configured | 2 --
.../resources/bootstrap-ssl-ctx/bootstrap.conf.configured.invalid | 2 --
.../src/test/resources/bootstrap-ssl-ctx/bootstrap.conf.default | 2 --
minifi/minifi-bootstrap/src/test/resources/bootstrap.conf | 2 --
minifi/minifi-c2/minifi-c2-assembly/src/main/resources/bin/c2.bat | 2 +-
minifi/minifi-c2/minifi-c2-assembly/src/main/resources/bin/c2.sh | 4 ++--
minifi/minifi-integration-tests/src/test/resources/bootstrap.conf | 2 --
.../src/test/resources/c2/hierarchical/minifi-edge1/bootstrap.conf | 2 --
.../src/test/resources/c2/hierarchical/minifi-edge2/bootstrap.conf | 2 --
.../src/test/resources/c2/hierarchical/minifi-edge3/bootstrap.conf | 2 --
.../src/test/resources/c2/protocol/minifi-edge1/bootstrap.conf | 2 --
.../src/test/resources/c2/protocol/minifi-edge2/bootstrap.conf | 2 --
.../src/test/resources/c2/protocol/minifi-edge3/bootstrap.conf | 2 --
.../minifi-resources/src/main/resources/conf/bootstrap.conf | 2 --
.../nifi-resources/src/main/resources/conf/bootstrap.conf | 2 --
.../nifi-web-api/src/test/resources/access-control/bootstrap.conf | 2 --
.../nifi-registry-resources/src/main/resources/conf/bootstrap.conf | 2 --
.../src/test/resources/conf/secure-ldap/bootstrap.conf | 2 --
.../nifi-toolkit-encrypt-config/src/test/resources/bootstrap.conf | 2 --
.../src/test/resources/bootstrap_with_empty_root_key.conf | 2 --
.../src/test/resources/bootstrap_with_root_key.conf | 2 --
.../src/test/resources/bootstrap_with_root_key_128.conf | 2 --
.../src/test/resources/bootstrap_with_root_key_password.conf | 2 --
.../src/test/resources/bootstrap_with_root_key_password_128.conf | 2 --
.../src/test/resources/nifi-registry/bootstrap_default.conf | 2 --
.../test/resources/nifi-registry/bootstrap_with_empty_root_key.conf | 2 --
.../src/test/resources/nifi-registry/bootstrap_with_root_key_128.conf | 2 --
.../nifi-registry/bootstrap_with_root_key_from_password_128.conf | 2 --
.../src/test/resources/nifi-registry/bootstrap_without_root_key.conf | 2 --
32 files changed, 3 insertions(+), 63 deletions(-)
diff --git
a/minifi/minifi-bootstrap/src/test/resources/MINIFI-516/bootstrap.conf
b/minifi/minifi-bootstrap/src/test/resources/MINIFI-516/bootstrap.conf
index b4aae7f6d2..eaffac084c 100644
--- a/minifi/minifi-bootstrap/src/test/resources/MINIFI-516/bootstrap.conf
+++ b/minifi/minifi-bootstrap/src/test/resources/MINIFI-516/bootstrap.conf
@@ -113,8 +113,6 @@ java.arg.3=-Xmx256m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/minifi/minifi-bootstrap/src/test/resources/bootstrap-provenance-reporting/bootstrap.conf.configured
b/minifi/minifi-bootstrap/src/test/resources/bootstrap-provenance-reporting/bootstrap.conf.configured
index acc97ed78e..5e34e82a10 100644
---
a/minifi/minifi-bootstrap/src/test/resources/bootstrap-provenance-reporting/bootstrap.conf.configured
+++
b/minifi/minifi-bootstrap/src/test/resources/bootstrap-provenance-reporting/bootstrap.conf.configured
@@ -110,8 +110,6 @@ java.arg.3=-Xmx256m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/minifi/minifi-bootstrap/src/test/resources/bootstrap-provenance-reporting/bootstrap.conf.default
b/minifi/minifi-bootstrap/src/test/resources/bootstrap-provenance-reporting/bootstrap.conf.default
index 37b66a3075..e004080154 100644
---
a/minifi/minifi-bootstrap/src/test/resources/bootstrap-provenance-reporting/bootstrap.conf.default
+++
b/minifi/minifi-bootstrap/src/test/resources/bootstrap-provenance-reporting/bootstrap.conf.default
@@ -110,8 +110,6 @@ java.arg.3=-Xmx256m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/minifi/minifi-bootstrap/src/test/resources/bootstrap-ssl-ctx/bootstrap.conf.configured
b/minifi/minifi-bootstrap/src/test/resources/bootstrap-ssl-ctx/bootstrap.conf.configured
index 688653055d..6c615690c9 100644
---
a/minifi/minifi-bootstrap/src/test/resources/bootstrap-ssl-ctx/bootstrap.conf.configured
+++
b/minifi/minifi-bootstrap/src/test/resources/bootstrap-ssl-ctx/bootstrap.conf.configured
@@ -100,8 +100,6 @@ java.arg.3=-Xmx256m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/minifi/minifi-bootstrap/src/test/resources/bootstrap-ssl-ctx/bootstrap.conf.configured.invalid
b/minifi/minifi-bootstrap/src/test/resources/bootstrap-ssl-ctx/bootstrap.conf.configured.invalid
index f535b51225..b09e0c6663 100644
---
a/minifi/minifi-bootstrap/src/test/resources/bootstrap-ssl-ctx/bootstrap.conf.configured.invalid
+++
b/minifi/minifi-bootstrap/src/test/resources/bootstrap-ssl-ctx/bootstrap.conf.configured.invalid
@@ -100,8 +100,6 @@ java.arg.3=-Xmx256m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/minifi/minifi-bootstrap/src/test/resources/bootstrap-ssl-ctx/bootstrap.conf.default
b/minifi/minifi-bootstrap/src/test/resources/bootstrap-ssl-ctx/bootstrap.conf.default
index 41b7388ae3..684f78c9d9 100644
---
a/minifi/minifi-bootstrap/src/test/resources/bootstrap-ssl-ctx/bootstrap.conf.default
+++
b/minifi/minifi-bootstrap/src/test/resources/bootstrap-ssl-ctx/bootstrap.conf.default
@@ -100,8 +100,6 @@ java.arg.3=-Xmx256m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git a/minifi/minifi-bootstrap/src/test/resources/bootstrap.conf
b/minifi/minifi-bootstrap/src/test/resources/bootstrap.conf
index b4aae7f6d2..eaffac084c 100644
--- a/minifi/minifi-bootstrap/src/test/resources/bootstrap.conf
+++ b/minifi/minifi-bootstrap/src/test/resources/bootstrap.conf
@@ -113,8 +113,6 @@ java.arg.3=-Xmx256m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git a/minifi/minifi-c2/minifi-c2-assembly/src/main/resources/bin/c2.bat
b/minifi/minifi-c2/minifi-c2-assembly/src/main/resources/bin/c2.bat
index 6c02746cf6..468f07a1e7 100644
--- a/minifi/minifi-c2/minifi-c2-assembly/src/main/resources/bin/c2.bat
+++ b/minifi/minifi-c2/minifi-c2-assembly/src/main/resources/bin/c2.bat
@@ -35,7 +35,7 @@ set LIB_DIR=%~dp0..\conf;%~dp0..\lib
set C2_SERVER_HOME=%~sdp0..\
-SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS%
-Djava.net.preferIPv4Stack=true org.apache.nifi.minifi.c2.jetty.JettyServer
+SET JAVA_PARAMS=-cp %LIB_DIR%\* -Xms12m -Xmx24m %JAVA_ARGS%
org.apache.nifi.minifi.c2.jetty.JettyServer
cmd.exe /C "%JAVA_EXE%" %JAVA_PARAMS% %*
diff --git a/minifi/minifi-c2/minifi-c2-assembly/src/main/resources/bin/c2.sh
b/minifi/minifi-c2/minifi-c2-assembly/src/main/resources/bin/c2.sh
index f20f072253..172069ab77 100755
--- a/minifi/minifi-c2/minifi-c2-assembly/src/main/resources/bin/c2.sh
+++ b/minifi/minifi-c2/minifi-c2-assembly/src/main/resources/bin/c2.sh
@@ -114,9 +114,9 @@ run() {
echo
if [ "$1" = "debug" ]; then
- "${JAVA}" -cp "${CLASSPATH}" -Xms12m -Xmx128m
-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005
-Djava.net.preferIPv4Stack=true org.apache.nifi.minifi.c2.jetty.JettyServer $@
+ "${JAVA}" -cp "${CLASSPATH}" -Xms12m -Xmx128m
-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005
org.apache.nifi.minifi.c2.jetty.JettyServer $@
else
- "${JAVA}" -cp "${CLASSPATH}" -Xms12m -Xmx128m
-Djava.net.preferIPv4Stack=true org.apache.nifi.minifi.c2.jetty.JettyServer $@
+ "${JAVA}" -cp "${CLASSPATH}" -Xms12m -Xmx128m
org.apache.nifi.minifi.c2.jetty.JettyServer $@
fi
return $?
}
diff --git a/minifi/minifi-integration-tests/src/test/resources/bootstrap.conf
b/minifi/minifi-integration-tests/src/test/resources/bootstrap.conf
index 28e9d1bd43..ac152b873d 100644
--- a/minifi/minifi-integration-tests/src/test/resources/bootstrap.conf
+++ b/minifi/minifi-integration-tests/src/test/resources/bootstrap.conf
@@ -83,8 +83,6 @@ java.arg.3=-Xmx256m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/minifi/minifi-integration-tests/src/test/resources/c2/hierarchical/minifi-edge1/bootstrap.conf
b/minifi/minifi-integration-tests/src/test/resources/c2/hierarchical/minifi-edge1/bootstrap.conf
index 80476423f4..c5cfe5f9e8 100644
---
a/minifi/minifi-integration-tests/src/test/resources/c2/hierarchical/minifi-edge1/bootstrap.conf
+++
b/minifi/minifi-integration-tests/src/test/resources/c2/hierarchical/minifi-edge1/bootstrap.conf
@@ -90,8 +90,6 @@ java.arg.3=-Xmx256m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/minifi/minifi-integration-tests/src/test/resources/c2/hierarchical/minifi-edge2/bootstrap.conf
b/minifi/minifi-integration-tests/src/test/resources/c2/hierarchical/minifi-edge2/bootstrap.conf
index bdff1f9c12..1bcad1596d 100644
---
a/minifi/minifi-integration-tests/src/test/resources/c2/hierarchical/minifi-edge2/bootstrap.conf
+++
b/minifi/minifi-integration-tests/src/test/resources/c2/hierarchical/minifi-edge2/bootstrap.conf
@@ -83,8 +83,6 @@ java.arg.3=-Xmx256m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/minifi/minifi-integration-tests/src/test/resources/c2/hierarchical/minifi-edge3/bootstrap.conf
b/minifi/minifi-integration-tests/src/test/resources/c2/hierarchical/minifi-edge3/bootstrap.conf
index 9ffe7d35a9..c0de827e3c 100644
---
a/minifi/minifi-integration-tests/src/test/resources/c2/hierarchical/minifi-edge3/bootstrap.conf
+++
b/minifi/minifi-integration-tests/src/test/resources/c2/hierarchical/minifi-edge3/bootstrap.conf
@@ -93,8 +93,6 @@ java.arg.3=-Xmx256m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/minifi/minifi-integration-tests/src/test/resources/c2/protocol/minifi-edge1/bootstrap.conf
b/minifi/minifi-integration-tests/src/test/resources/c2/protocol/minifi-edge1/bootstrap.conf
index 35a14acc94..0c5240cb28 100644
---
a/minifi/minifi-integration-tests/src/test/resources/c2/protocol/minifi-edge1/bootstrap.conf
+++
b/minifi/minifi-integration-tests/src/test/resources/c2/protocol/minifi-edge1/bootstrap.conf
@@ -109,8 +109,6 @@ java.arg.3=-Xmx256m
# Enable Remote Debugging
#
java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/minifi/minifi-integration-tests/src/test/resources/c2/protocol/minifi-edge2/bootstrap.conf
b/minifi/minifi-integration-tests/src/test/resources/c2/protocol/minifi-edge2/bootstrap.conf
index 35a14acc94..0c5240cb28 100644
---
a/minifi/minifi-integration-tests/src/test/resources/c2/protocol/minifi-edge2/bootstrap.conf
+++
b/minifi/minifi-integration-tests/src/test/resources/c2/protocol/minifi-edge2/bootstrap.conf
@@ -109,8 +109,6 @@ java.arg.3=-Xmx256m
# Enable Remote Debugging
#
java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/minifi/minifi-integration-tests/src/test/resources/c2/protocol/minifi-edge3/bootstrap.conf
b/minifi/minifi-integration-tests/src/test/resources/c2/protocol/minifi-edge3/bootstrap.conf
index b3ca35c762..be5568ee78 100644
---
a/minifi/minifi-integration-tests/src/test/resources/c2/protocol/minifi-edge3/bootstrap.conf
+++
b/minifi/minifi-integration-tests/src/test/resources/c2/protocol/minifi-edge3/bootstrap.conf
@@ -109,8 +109,6 @@ java.arg.3=-Xmx256m
# Enable Remote Debugging
#
java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/bootstrap.conf
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/bootstrap.conf
index 3d7aa5ceb1..d263c9b28f 100644
---
a/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/bootstrap.conf
+++
b/minifi/minifi-nar-bundles/minifi-framework-bundle/minifi-framework/minifi-resources/src/main/resources/conf/bootstrap.conf
@@ -112,8 +112,6 @@ java.arg.3=-Xmx${minifi.jvm.heap.mb}m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
index 881ad08971..941947f22a 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-resources/src/main/resources/conf/bootstrap.conf
@@ -41,8 +41,6 @@ java.arg.3=-Xmx${nifi.jvm.heap.max}
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/bootstrap.conf
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/bootstrap.conf
index d02b43f7a3..f59c659623 100644
---
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/bootstrap.conf
+++
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/test/resources/access-control/bootstrap.conf
@@ -38,8 +38,6 @@ java.arg.3=-Xmx512m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap.conf
b/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap.conf
index 0fc45d5d44..22680b0ceb 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap.conf
+++
b/nifi-registry/nifi-registry-core/nifi-registry-resources/src/main/resources/conf/bootstrap.conf
@@ -44,8 +44,6 @@ java.arg.3=-Xmx512m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/resources/conf/secure-ldap/bootstrap.conf
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/resources/conf/secure-ldap/bootstrap.conf
index 4bd28baf8b..da0079db70 100644
---
a/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/resources/conf/secure-ldap/bootstrap.conf
+++
b/nifi-registry/nifi-registry-core/nifi-registry-web-api/src/test/resources/conf/secure-ldap/bootstrap.conf
@@ -38,8 +38,6 @@ java.arg.3=-Xmx512m
# Enable Remote Debugging
java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap.conf
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap.conf
index a2674a69f5..67c829c80e 100644
--- a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap.conf
+++ b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap.conf
@@ -38,8 +38,6 @@ java.arg.3=-Xmx512m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_empty_root_key.conf
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_empty_root_key.conf
index 601e6c9f7d..b37a027f76 100644
---
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_empty_root_key.conf
+++
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_empty_root_key.conf
@@ -38,8 +38,6 @@ java.arg.3=-Xmx512m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_root_key.conf
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_root_key.conf
index d02b43f7a3..f59c659623 100644
---
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_root_key.conf
+++
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_root_key.conf
@@ -38,8 +38,6 @@ java.arg.3=-Xmx512m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_root_key_128.conf
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_root_key_128.conf
index 9481f2fd86..c37b8bcf13 100644
---
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_root_key_128.conf
+++
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_root_key_128.conf
@@ -38,8 +38,6 @@ java.arg.3=-Xmx512m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_root_key_password.conf
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_root_key_password.conf
index 9ef4fed124..2eea1e2941 100644
---
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_root_key_password.conf
+++
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_root_key_password.conf
@@ -38,8 +38,6 @@ java.arg.3=-Xmx512m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_root_key_password_128.conf
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_root_key_password_128.conf
index 02baee0235..72ddcc08d4 100644
---
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_root_key_password_128.conf
+++
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/bootstrap_with_root_key_password_128.conf
@@ -38,8 +38,6 @@ java.arg.3=-Xmx512m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_default.conf
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_default.conf
index de0dc2a8bb..abdfb512d4 100644
---
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_default.conf
+++
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_default.conf
@@ -38,8 +38,6 @@ java.arg.3=-Xmx512m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_with_empty_root_key.conf
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_with_empty_root_key.conf
index de0dc2a8bb..abdfb512d4 100644
---
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_with_empty_root_key.conf
+++
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_with_empty_root_key.conf
@@ -38,8 +38,6 @@ java.arg.3=-Xmx512m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_with_root_key_128.conf
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_with_root_key_128.conf
index e3ee0ac699..ed503f0970 100644
---
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_with_root_key_128.conf
+++
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_with_root_key_128.conf
@@ -38,8 +38,6 @@ java.arg.3=-Xmx512m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_with_root_key_from_password_128.conf
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_with_root_key_from_password_128.conf
index eb1bbbcba5..86afb0018f 100644
---
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_with_root_key_from_password_128.conf
+++
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_with_root_key_from_password_128.conf
@@ -38,8 +38,6 @@ java.arg.3=-Xmx512m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
diff --git
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_without_root_key.conf
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_without_root_key.conf
index 7abf30cfb4..dacc5a3f7e 100644
---
a/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_without_root_key.conf
+++
b/nifi-toolkit/nifi-toolkit-encrypt-config/src/test/resources/nifi-registry/bootstrap_without_root_key.conf
@@ -38,8 +38,6 @@ java.arg.3=-Xmx512m
# Enable Remote Debugging
#java.arg.debug=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-java.arg.4=-Djava.net.preferIPv4Stack=true
-
# allowRestrictedHeaders is required for Cluster/Node communications to work
properly
java.arg.5=-Dsun.net.http.allowRestrictedHeaders=true
java.arg.6=-Djava.protocol.handler.pkgs=sun.net.www.protocol
