diff options
| author | Endi S. Dewata <edewata@redhat.com> | 2014-10-24 21:54:44 -0400 |
|---|---|---|
| committer | Endi S. Dewata <edewata@redhat.com> | 2014-10-27 10:52:40 -0400 |
| commit | 4ac463dabb81e94cc4083dd052af232a77001fe3 (patch) | |
| tree | 875250d58673a248f1a08bd1d79e959a8ed25751 | |
| parent | a4ffbd41d9ebb15ca0ea7d4f5c2b8ebc3ce25331 (diff) | |
| download | pki-4ac463dabb81e94cc4083dd052af232a77001fe3.tar.gz pki-4ac463dabb81e94cc4083dd052af232a77001fe3.tar.xz pki-4ac463dabb81e94cc4083dd052af232a77001fe3.zip | |
Updated JUnit JAR file name.
The Eclipse classpath and the test scripts have been updated to
use junit.jar instead of junit4.jar to support Fedora 20 and 21.
https://fedorahosted.org/pki/ticket/1192
| -rw-r--r-- | .classpath | 2 | ||||
| -rwxr-xr-x | scripts/compose_pki_test_package | 2 | ||||
| -rw-r--r-- | tests/dogtag/dev_java_tests/run_junit_tests.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.classpath b/.classpath index 8d5aed01b..2908ed019 100644 --- a/.classpath +++ b/.classpath @@ -28,7 +28,7 @@ <classpathentry kind="lib" path="/usr/share/java/idm-console-mcc.jar"/> <classpathentry kind="lib" path="/usr/share/java/idm-console-nmclf.jar"/> <classpathentry kind="lib" path="/usr/share/java/jakarta-commons-httpclient.jar"/> - <classpathentry kind="lib" path="/usr/share/java/junit4.jar"/> + <classpathentry kind="lib" path="/usr/share/java/junit.jar"/> <classpathentry kind="lib" path="/usr/share/java/ldapjdk.jar"/> <classpathentry kind="lib" path="/usr/share/java/jackson-annotations.jar"/> <classpathentry kind="lib" path="/usr/share/java/jackson/jackson-core-asl.jar"/> diff --git a/scripts/compose_pki_test_package b/scripts/compose_pki_test_package index 2614ead0b..524706875 100755 --- a/scripts/compose_pki_test_package +++ b/scripts/compose_pki_test_package @@ -90,7 +90,7 @@ CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/kra/functional/src CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/ocsp/src CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/tks/src CLASSPATH=$CLASSPATH:$PKI_SOURCE_DIR/base/tps/src -CLASSPATH=$CLASSPATH:/usr/share/java/junit4.jar +CLASSPATH=$CLASSPATH:/usr/share/java/junit.jar CLASSPATH=$CLASSPATH:`pwd`/src CLASSPATH=$CLASSPATH:/usr/lib64/jss/jss4.jar CLASSPATH=$CLASSPATH:/usr/share/java/httpcomponents/httpclient.jar diff --git a/tests/dogtag/dev_java_tests/run_junit_tests.sh b/tests/dogtag/dev_java_tests/run_junit_tests.sh index 7b298a4b7..60912af5c 100644 --- a/tests/dogtag/dev_java_tests/run_junit_tests.sh +++ b/tests/dogtag/dev_java_tests/run_junit_tests.sh @@ -26,7 +26,7 @@ run_dev_junit_tests() { export nss_db_dir nss_db_password admin_cert_nickname host CA_CLIENT_PKCS12_PASSWORD RUNNING_WITH_BEAKER ### Add all the pki packages and other dependent pki packages to the class path - CLASSPATH=/usr/share/java/junit4.jar + CLASSPATH=/usr/share/java/junit.jar CLASSPATH=$CLASSPATH:/usr/share/java/pki/* CLASSPATH=$CLASSPATH:/usr/lib64/jss/jss4.jar CLASSPATH=$CLASSPATH:/usr/share/java/httpcomponents/httpclient.jar |