From a05b73985d2ba7fc9df767656cb713c7e3cc62b8 Mon Sep 17 00:00:00 2001
From: Jason Katonica <katonica@us.ibm.com>
Date: Thu, 6 Mar 2025 12:48:08 -0500
Subject: [PATCH] Run OpenJCEPlus tests without FIPS properties

The mvn based OpenJCEPlus tests are not intended to be run in FIPS mode
this update runs these tests whenever FIPS flags are not present.

It should be noted that these tests are still expected to run and test
from a functional perspective both FIPS and non FIPS related tests.

Signed-off-by: Jason Katonica <katonica@us.ibm.com>
---
 functional/OpenJcePlusTests/build.xml    | 1 -
 functional/OpenJcePlusTests/playlist.xml | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/functional/OpenJcePlusTests/build.xml b/functional/OpenJcePlusTests/build.xml
index f09f1c30ec..0ec595c30b 100644
--- a/functional/OpenJcePlusTests/build.xml
+++ b/functional/OpenJcePlusTests/build.xml
@@ -123,7 +123,6 @@
 	<target name="build">
 		<if>
 			<and>
-				<contains string="${TEST_FLAG}" substring="FIPS140_3_OpenJCEPlusFIPS"/>
 				<equals arg1="${JDK_VENDOR}" arg2="ibm" />
 				<equals arg1="${JDK_IMPL}" arg2="openj9" />
 				<not>
diff --git a/functional/OpenJcePlusTests/playlist.xml b/functional/OpenJcePlusTests/playlist.xml
index a1bf6c68b3..521d50af5f 100644
--- a/functional/OpenJcePlusTests/playlist.xml
+++ b/functional/OpenJcePlusTests/playlist.xml
@@ -43,8 +43,8 @@
 		cp -r ${REPORTDIR}/target/surefire-reports/* junitreports
 		</command>
 		<features>
-			<feature>FIPS140_3_OpenJCEPlusFIPS:required</feature>
-			<feature>FIPS140_3_OpenJCEPlusFIPS.FIPS140-3:required</feature>
+			<feature>FIPS140_3_OpenJCEPlusFIPS:nonapplicable</feature>
+			<feature>FIPS140_3_OpenJCEPlusFIPS.FIPS140-3:nonapplicable</feature>
 		</features>
 		<levels>
 			<level>extended</level>