diff --git a/functional/OpenJcePlusTests/build.xml b/functional/OpenJcePlusTests/build.xml
index ae457f2f1f..5d0b2fea1a 100644
--- a/functional/OpenJcePlusTests/build.xml
+++ b/functional/OpenJcePlusTests/build.xml
@@ -26,7 +26,7 @@
-
+
@@ -105,52 +105,13 @@
-
-
-
- Ant version is ${ant.version}
- ============COMPILER SETTINGS============
- ===fork: yes
- ===executable: ${compiler.javac}
- ===debug: on
- ===destdir: ${DEST}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/functional/OpenJcePlusTests/playlist.xml b/functional/OpenJcePlusTests/playlist.xml
index 81d74c5b7c..5c4e5de15f 100644
--- a/functional/OpenJcePlusTests/playlist.xml
+++ b/functional/OpenJcePlusTests/playlist.xml
@@ -26,8 +26,22 @@
cp -r ${TEST_RESROOT}/* ${REPORTDIR}/. ; \
- ant -f test.xml -DTEST_JAVA=$(Q)$(JAVA_COMMAND)$(Q) launch_test; \
- $(TEST_STATUS)
+ cd ${REPORTDIR}; \
+ chmod 755 *.sh; \
+ mkdir apache-maven; \
+ tar xvzf apache-maven-bin.tar.gz -C apache-maven --strip-components 1; \
+ ls -al; \
+ ${REPORTDIR}/apache-maven/bin/mvn -version; \
+ ${REPORTDIR}/apache-maven/bin/mvn -f ${REPORTDIR}/pom.xml \
+ -Denforcer.skip \
+ -Dtestenvironment=standalonebundled \
+ clean \
+ test-compile \
+ surefire:test; \
+ $(TEST_STATUS); \
+ mkdir junitreports; \
+ cp -r ${REPORTDIR}/target/surefire-reports/* junitreports
+
extended
diff --git a/functional/OpenJcePlusTests/test.xml b/functional/OpenJcePlusTests/test.xml
deleted file mode 100644
index 856066abe2..0000000000
--- a/functional/OpenJcePlusTests/test.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-
-
-
-
-
-
- Ant script to run the tests for ibm.jceplus.junit.TestMemStressAll,
- ibm.jceplus.junit.TestMultiThread,
- ibm.jceplus.junit.TestMultithreadFIPS,
- ibm.jceplus.junit.TestAll.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-