diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-01-24 21:40:45 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-24 21:40:45 (GMT) |
| commit | b88cfdbfc9a6f2ff737d73ba4cb4931e5ffe2e74 (patch) | |
| tree | 857403758e02713c269228dd536256972b264a0d /java/test | |
| parent | 9d90c37c96c8804169f5b0a6cf4174cfffc269e1 (diff) | |
| download | hdf5-b88cfdbfc9a6f2ff737d73ba4cb4931e5ffe2e74.zip hdf5-b88cfdbfc9a6f2ff737d73ba4cb4931e5ffe2e74.tar.gz hdf5-b88cfdbfc9a6f2ff737d73ba4cb4931e5ffe2e74.tar.bz2 | |
Merge Update the java slf4j logging jars to latest 1.7.33 (#1370)
Diffstat (limited to 'java/test')
| -rw-r--r-- | java/test/Makefile.am | 2 | ||||
| -rw-r--r-- | java/test/junit.sh.in | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/test/Makefile.am b/java/test/Makefile.am index 4f34bc5..bb6be7f 100644 --- a/java/test/Makefile.am +++ b/java/test/Makefile.am @@ -27,7 +27,7 @@ classes: pkgpath = test hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar -CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/junit.jar:$(top_srcdir)/java/lib/hamcrest-core.jar:$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.25.jar:$$CLASSPATH +CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/junit.jar:$(top_srcdir)/java/lib/hamcrest-core.jar:$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH jarfile = jar$(PACKAGE_TARNAME)test.jar diff --git a/java/test/junit.sh.in b/java/test/junit.sh.in index e096302..ca2b3a9 100644 --- a/java/test/junit.sh.in +++ b/java/test/junit.sh.in @@ -66,8 +66,8 @@ $top_builddir/java/src/jni/.libs/libhdf5_java.* LIST_JAR_TESTFILES=" $HDFLIB_HOME/hamcrest-core.jar $HDFLIB_HOME/junit.jar -$HDFLIB_HOME/slf4j-api-1.7.25.jar -$HDFLIB_HOME/ext/slf4j-simple-1.7.25.jar +$HDFLIB_HOME/slf4j-api-1.7.33.jar +$HDFLIB_HOME/ext/slf4j-simple-1.7.33.jar " LIST_JAR_FILES=" $top_builddir/java/src/$JARFILE @@ -299,7 +299,7 @@ JAVAEXEFLAGS=@H5_JAVAFLAGS@ COPY_LIBFILES_TO_BLDLIBDIR COPY_DATAFILES_TO_BLDDIR -CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/junit.jar:"$BLDLIBDIR"/hamcrest-core.jar:"$BLDLIBDIR"/slf4j-api-1.7.25.jar:"$BLDLIBDIR"/slf4j-simple-1.7.25.jar:"$TESTJARFILE"" +CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/junit.jar:"$BLDLIBDIR"/hamcrest-core.jar:"$BLDLIBDIR"/slf4j-api-1.7.33.jar:"$BLDLIBDIR"/slf4j-simple-1.7.33.jar:"$TESTJARFILE"" TEST=/usr/bin/test if [ ! -x /usr/bin/test ] |