mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-03-13 16:47:58 +08:00
Update java logger version (#2643)
This commit is contained in:
parent
b8c27cec17
commit
fa388e6ba4
6
.gitattributes
vendored
6
.gitattributes
vendored
@ -192,12 +192,12 @@ java/examples/testfiles/examples.intro.H5_CreateGroup.txt -text
|
||||
java/examples/testfiles/examples.intro.H5_CreateGroupAbsoluteRelative.txt -text
|
||||
java/examples/testfiles/examples.intro.H5_CreateGroupDataset.txt -text
|
||||
java/examples/testfiles/examples.intro.H5_ReadWrite.txt -text
|
||||
java/lib/ext/slf4j-nop-1.7.33.jar -text svneol=unset#application/zip
|
||||
java/lib/ext/slf4j-simple-1.7.33.jar -text svneol=unset#application/zip
|
||||
java/lib/ext/slf4j-nop-2.0.6.jar -text svneol=unset#application/zip
|
||||
java/lib/ext/slf4j-simple-2.0.6.jar -text svneol=unset#application/zip
|
||||
java/lib/hamcrest-core.jar -text svneol=unset#application/java-archive
|
||||
java/lib/junit.jar -text svneol=unset#application/java-archive
|
||||
java/lib/simplelogger.properties -text
|
||||
java/lib/slf4j-api-1.7.33.jar -text svneol=unset#application/zip
|
||||
java/lib/slf4j-api-2.0.6.jar -text svneol=unset#application/zip
|
||||
java/src/CMakeLists.txt -text
|
||||
java/src/Makefile.am -text
|
||||
java/src/hdf/CMakeLists.txt -text
|
||||
|
@ -226,9 +226,9 @@ set (HDF5_JAVA_JNI_SRC_DIR ${HDF5_SOURCE_DIR}/java/src/jni)
|
||||
set (HDF5_JAVA_HDF5_SRC_DIR ${HDF5_SOURCE_DIR}/java/src/hdf)
|
||||
set (HDF5_JAVA_TEST_SRC_DIR ${HDF5_SOURCE_DIR}/java/test)
|
||||
set (HDF5_JAVA_LIB_DIR ${HDF5_SOURCE_DIR}/java/lib)
|
||||
set (HDF5_JAVA_LOGGING_JAR ${HDF5_SOURCE_DIR}/java/lib/slf4j-api-1.7.33.jar)
|
||||
set (HDF5_JAVA_LOGGING_NOP_JAR ${HDF5_SOURCE_DIR}/java/lib/ext/slf4j-nop-1.7.33.jar)
|
||||
set (HDF5_JAVA_LOGGING_SIMPLE_JAR ${HDF5_SOURCE_DIR}/java/lib/ext/slf4j-simple-1.7.33.jar)
|
||||
set (HDF5_JAVA_LOGGING_JAR ${HDF5_SOURCE_DIR}/java/lib/slf4j-api-2.0.6.jar)
|
||||
set (HDF5_JAVA_LOGGING_NOP_JAR ${HDF5_SOURCE_DIR}/java/lib/ext/slf4j-nop-2.0.6.jar)
|
||||
set (HDF5_JAVA_LOGGING_SIMPLE_JAR ${HDF5_SOURCE_DIR}/java/lib/ext/slf4j-simple-2.0.6.jar)
|
||||
set (HDF5_DOXYGEN_DIR ${HDF5_SOURCE_DIR}/doxygen)
|
||||
|
||||
set (HDF5_SRC_INCLUDE_DIRS ${HDF5_SRC_DIR})
|
||||
|
@ -70,8 +70,8 @@ endif ()
|
||||
if (${HDF5_PACKAGE_NAME}_BUILD_JAVA)
|
||||
set (${HDF5_PACKAGE_NAME}_JAVA_INCLUDE_DIRS
|
||||
@PACKAGE_CURRENT_BUILD_DIR@/lib/jarhdf5-@HDF5_VERSION_STRING@.jar
|
||||
@PACKAGE_CURRENT_BUILD_DIR@/lib/slf4j-api-1.7.33.jar
|
||||
@PACKAGE_CURRENT_BUILD_DIR@/lib/slf4j-nop-1.7.33.jar
|
||||
@PACKAGE_CURRENT_BUILD_DIR@/lib/slf4j-api-2.0.6.jar
|
||||
@PACKAGE_CURRENT_BUILD_DIR@/lib/slf4j-nop-2.0.6.jar
|
||||
)
|
||||
set (${HDF5_PACKAGE_NAME}_JAVA_LIBRARY "@PACKAGE_CURRENT_BUILD_DIR@/lib")
|
||||
set (${HDF5_PACKAGE_NAME}_JAVA_LIBRARIES "${${HDF5_PACKAGE_NAME}_JAVA_LIBRARY}")
|
||||
|
@ -58,8 +58,8 @@ $top_builddir/java/src/jni/.libs/libhdf5_java.*
|
||||
$top_builddir/java/src/$JARFILE
|
||||
"
|
||||
LIST_JAR_TESTFILES="
|
||||
$HDFLIB_HOME/slf4j-api-1.7.33.jar
|
||||
$HDFLIB_HOME/ext/slf4j-simple-1.7.33.jar
|
||||
$HDFLIB_HOME/slf4j-api-2.0.6.jar
|
||||
$HDFLIB_HOME/ext/slf4j-simple-2.0.6.jar
|
||||
"
|
||||
LIST_DATA_FILES="
|
||||
$HDFTEST_HOME/../testfiles/examples.datasets.H5Ex_D_Alloc.txt
|
||||
@ -222,7 +222,7 @@ JAVAEXEFLAGS=@H5_JAVAFLAGS@
|
||||
COPY_LIBFILES_TO_BLDLIBDIR
|
||||
COPY_DATAFILES_TO_BLDDIR
|
||||
|
||||
CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-1.7.33.jar:"$BLDLIBDIR"/slf4j-simple-1.7.33.jar:"$TESTJARFILE""
|
||||
CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-2.0.6.jar:"$BLDLIBDIR"/slf4j-simple-2.0.6.jar:"$TESTJARFILE""
|
||||
|
||||
TEST=/usr/bin/test
|
||||
if [ ! -x /usr/bin/test ]
|
||||
|
@ -27,7 +27,7 @@ classes:
|
||||
|
||||
pkgpath = examples/datasets
|
||||
hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-2.0.6.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-2.0.6.jar:$$CLASSPATH
|
||||
|
||||
jarfile = jar$(PACKAGE_TARNAME)datasets.jar
|
||||
|
||||
|
@ -55,8 +55,8 @@ $top_builddir/java/src/jni/.libs/libhdf5_java.*
|
||||
$top_builddir/java/src/$JARFILE
|
||||
"
|
||||
LIST_JAR_TESTFILES="
|
||||
$HDFLIB_HOME/slf4j-api-1.7.33.jar
|
||||
$HDFLIB_HOME/ext/slf4j-simple-1.7.33.jar
|
||||
$HDFLIB_HOME/slf4j-api-2.0.6.jar
|
||||
$HDFLIB_HOME/ext/slf4j-simple-2.0.6.jar
|
||||
"
|
||||
LIST_DATA_FILES="
|
||||
$HDFTEST_HOME/../testfiles/examples.datatypes.H5Ex_T_Array.txt
|
||||
@ -218,7 +218,7 @@ JAVAEXEFLAGS=@H5_JAVAFLAGS@
|
||||
COPY_LIBFILES_TO_BLDLIBDIR
|
||||
COPY_DATAFILES_TO_BLDDIR
|
||||
|
||||
CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-1.7.33.jar:"$BLDLIBDIR"/slf4j-simple-1.7.33.jar:"$TESTJARFILE""
|
||||
CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-2.0.6.jar:"$BLDLIBDIR"/slf4j-simple-2.0.6.jar:"$TESTJARFILE""
|
||||
|
||||
TEST=/usr/bin/test
|
||||
if [ ! -x /usr/bin/test ]
|
||||
|
@ -27,7 +27,7 @@ classes:
|
||||
|
||||
pkgpath = examples/datatypes
|
||||
hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-2.0.6.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-2.0.6.jar:$$CLASSPATH
|
||||
|
||||
jarfile = jar$(PACKAGE_TARNAME)datatypes.jar
|
||||
|
||||
|
@ -57,8 +57,8 @@ $top_builddir/java/src/jni/.libs/libhdf5_java.*
|
||||
$top_builddir/java/src/$JARFILE
|
||||
"
|
||||
LIST_JAR_TESTFILES="
|
||||
$HDFLIB_HOME/slf4j-api-1.7.33.jar
|
||||
$HDFLIB_HOME/ext/slf4j-simple-1.7.33.jar
|
||||
$HDFLIB_HOME/slf4j-api-2.0.6.jar
|
||||
$HDFLIB_HOME/ext/slf4j-simple-2.0.6.jar
|
||||
"
|
||||
LIST_ITER_FILES="
|
||||
$HDFTEST_HOME/h5ex_g_iterate.h5
|
||||
@ -257,7 +257,7 @@ COPY_LIBFILES_TO_BLDLIBDIR
|
||||
COPY_DATAFILES_TO_BLDDIR
|
||||
COPY_ITERFILES_TO_BLDITERDIR
|
||||
|
||||
CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-1.7.33.jar:"$BLDLIBDIR"/slf4j-simple-1.7.33.jar:"$TESTJARFILE""
|
||||
CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-2.0.6.jar:"$BLDLIBDIR"/slf4j-simple-2.0.6.jar:"$TESTJARFILE""
|
||||
|
||||
TEST=/usr/bin/test
|
||||
if [ ! -x /usr/bin/test ]
|
||||
|
@ -27,7 +27,7 @@ classes:
|
||||
|
||||
pkgpath = examples/groups
|
||||
hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-2.0.6.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-2.0.6.jar:$$CLASSPATH
|
||||
|
||||
jarfile = jar$(PACKAGE_TARNAME)groups.jar
|
||||
|
||||
|
@ -55,8 +55,8 @@ $top_builddir/java/src/jni/.libs/libhdf5_java.*
|
||||
$top_builddir/java/src/$JARFILE
|
||||
"
|
||||
LIST_JAR_TESTFILES="
|
||||
$HDFLIB_HOME/slf4j-api-1.7.33.jar
|
||||
$HDFLIB_HOME/ext/slf4j-simple-1.7.33.jar
|
||||
$HDFLIB_HOME/slf4j-api-2.0.6.jar
|
||||
$HDFLIB_HOME/ext/slf4j-simple-2.0.6.jar
|
||||
"
|
||||
LIST_DATA_FILES="
|
||||
$HDFTEST_HOME/../testfiles/examples.intro.H5_CreateDataset.txt
|
||||
@ -207,7 +207,7 @@ JAVAEXEFLAGS=@H5_JAVAFLAGS@
|
||||
COPY_LIBFILES_TO_BLDLIBDIR
|
||||
COPY_DATAFILES_TO_BLDDIR
|
||||
|
||||
CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-1.7.33.jar:"$BLDLIBDIR"/slf4j-simple-1.7.33.jar:"$TESTJARFILE""
|
||||
CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-2.0.6.jar:"$BLDLIBDIR"/slf4j-simple-2.0.6.jar:"$TESTJARFILE""
|
||||
|
||||
TEST=/usr/bin/test
|
||||
if [ ! -x /usr/bin/test ]
|
||||
|
@ -27,7 +27,7 @@ classes:
|
||||
|
||||
pkgpath = examples/intro
|
||||
hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(top_srcdir)/java/lib/slf4j-api-2.0.6.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-2.0.6.jar:$$CLASSPATH
|
||||
|
||||
jarfile = jar$(PACKAGE_TARNAME)intro.jar
|
||||
|
||||
|
Binary file not shown.
BIN
java/lib/ext/slf4j-nop-2.0.6.jar
Normal file
BIN
java/lib/ext/slf4j-nop-2.0.6.jar
Normal file
Binary file not shown.
Binary file not shown.
BIN
java/lib/ext/slf4j-simple-2.0.6.jar
Normal file
BIN
java/lib/ext/slf4j-simple-2.0.6.jar
Normal file
Binary file not shown.
Binary file not shown.
BIN
java/lib/slf4j-api-2.0.6.jar
Normal file
BIN
java/lib/slf4j-api-2.0.6.jar
Normal file
Binary file not shown.
@ -36,7 +36,7 @@ jarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
|
||||
hdf5_javadir = $(libdir)
|
||||
|
||||
pkgpath = hdf/hdf5lib
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$$CLASSPATH
|
||||
CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-2.0.6.jar:$$CLASSPATH
|
||||
|
||||
AM_JAVACFLAGS = $(H5_JAVACFLAGS) -deprecation
|
||||
|
||||
|
@ -57,6 +57,9 @@ import hdf.hdf5lib.structs.H5O_info_t;
|
||||
import hdf.hdf5lib.structs.H5O_native_info_t;
|
||||
import hdf.hdf5lib.structs.H5O_token_t;
|
||||
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* @page HDF5LIB HDF5 Java API Package
|
||||
* This class is the Java interface for the HDF5 library.
|
||||
@ -257,7 +260,7 @@ public class H5 implements java.io.Serializable {
|
||||
*/
|
||||
private static final long serialVersionUID = 6129888282117053288L;
|
||||
|
||||
private final static org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(H5.class);
|
||||
private final static Logger log = LoggerFactory.getLogger(H5.class);
|
||||
|
||||
/**
|
||||
* @ingroup JH5
|
||||
|
@ -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.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.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-2.0.6.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-2.0.6.jar:$$CLASSPATH
|
||||
|
||||
jarfile = jar$(PACKAGE_TARNAME)test.jar
|
||||
|
||||
|
@ -67,8 +67,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.33.jar
|
||||
$HDFLIB_HOME/ext/slf4j-simple-1.7.33.jar
|
||||
$HDFLIB_HOME/slf4j-api-2.0.6.jar
|
||||
$HDFLIB_HOME/ext/slf4j-simple-2.0.6.jar
|
||||
"
|
||||
LIST_JAR_FILES="
|
||||
$top_builddir/java/src/$JARFILE
|
||||
@ -304,7 +304,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.33.jar:"$BLDLIBDIR"/slf4j-simple-1.7.33.jar:"$TESTJARFILE""
|
||||
CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/junit.jar:"$BLDLIBDIR"/hamcrest-core.jar:"$BLDLIBDIR"/slf4j-api-2.0.6.jar:"$BLDLIBDIR"/slf4j-simple-2.0.6.jar:"$TESTJARFILE""
|
||||
|
||||
TEST=/usr/bin/test
|
||||
if [ ! -x /usr/bin/test ]
|
||||
|
Loading…
x
Reference in New Issue
Block a user