mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-18 15:15:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update the java slf4j logging jars to latest 1.7.33 (#1369)

Browse Source
This commit is contained in:
Allen Byrne 2022-01-18 07:44:11 -06:00 committed by GitHub
parent 8b3c09f780
commit 2f34c433dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitattributes vendored
View File

@ -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_CreateGroupAbsoluteRelative.txt -text
java/examples/testfiles/examples.intro.H5_CreateGroupDataset.txt -text java/examples/testfiles/examples.intro.H5_CreateGroupDataset.txt -text
java/examples/testfiles/examples.intro.H5_ReadWrite.txt -text java/examples/testfiles/examples.intro.H5_ReadWrite.txt -text
java/lib/ext/slf4j-nop-1.7.25.jar -text svneol=unset#application/zip java/lib/ext/slf4j-nop-1.7.33.jar -text svneol=unset#application/zip
java/lib/ext/slf4j-simple-1.7.25.jar -text svneol=unset#application/zip java/lib/ext/slf4j-simple-1.7.33.jar -text svneol=unset#application/zip
java/lib/hamcrest-core.jar -text svneol=unset#application/java-archive java/lib/hamcrest-core.jar -text svneol=unset#application/java-archive
java/lib/junit.jar -text svneol=unset#application/java-archive java/lib/junit.jar -text svneol=unset#application/java-archive
java/lib/simplelogger.properties -text java/lib/simplelogger.properties -text
java/lib/slf4j-api-1.7.25.jar -text svneol=unset#application/zip java/lib/slf4j-api-1.7.33.jar -text svneol=unset#application/zip
java/src/CMakeLists.txt -text java/src/CMakeLists.txt -text
java/src/Makefile.am -text java/src/Makefile.am -text
java/src/hdf/CMakeLists.txt -text java/src/hdf/CMakeLists.txt -text

6
CMakeLists.txt
View File

@ -229,9 +229,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_HDF5_SRC_DIR ${HDF5_SOURCE_DIR}/java/src/hdf)
set (HDF5_JAVA_TEST_SRC_DIR ${HDF5_SOURCE_DIR}/java/test) set (HDF5_JAVA_TEST_SRC_DIR ${HDF5_SOURCE_DIR}/java/test)
set (HDF5_JAVA_LIB_DIR ${HDF5_SOURCE_DIR}/java/lib) set (HDF5_JAVA_LIB_DIR ${HDF5_SOURCE_DIR}/java/lib)
set (HDF5_JAVA_LOGGING_JAR ${HDF5_SOURCE_DIR}/java/lib/slf4j-api-1.7.25.jar) 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.25.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.25.jar) set (HDF5_JAVA_LOGGING_SIMPLE_JAR ${HDF5_SOURCE_DIR}/java/lib/ext/slf4j-simple-1.7.33.jar)
set (HDF5_DOXYGEN_DIR ${HDF5_SOURCE_DIR}/doxygen) set (HDF5_DOXYGEN_DIR ${HDF5_SOURCE_DIR}/doxygen)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------

6
MANIFEST
View File

@ -3592,9 +3592,9 @@
./java/lib/hamcrest-core.jar ./java/lib/hamcrest-core.jar
./java/lib/junit.jar ./java/lib/junit.jar
./java/lib/simplelogger.properties ./java/lib/simplelogger.properties
./java/lib/slf4j-api-1.7.25.jar ./java/lib/slf4j-api-1.7.33.jar
./java/lib/ext/slf4j-nop-1.7.25.jar ./java/lib/ext/slf4j-nop-1.7.33.jar
./java/lib/ext/slf4j-simple-1.7.25.jar ./java/lib/ext/slf4j-simple-1.7.33.jar
# CMake-specific Files # CMake-specific Files
./config/toolchain/build32.cmake ./config/toolchain/build32.cmake

4
config/cmake/hdf5-config.cmake.in
View File

@ -68,8 +68,8 @@ endif ()
if (${HDF5_PACKAGE_NAME}_BUILD_JAVA) if (${HDF5_PACKAGE_NAME}_BUILD_JAVA)
set (${HDF5_PACKAGE_NAME}_JAVA_INCLUDE_DIRS set (${HDF5_PACKAGE_NAME}_JAVA_INCLUDE_DIRS
@PACKAGE_CURRENT_BUILD_DIR@/lib/jarhdf5-@HDF5_VERSION_STRING@.jar @PACKAGE_CURRENT_BUILD_DIR@/lib/jarhdf5-@HDF5_VERSION_STRING@.jar
@PACKAGE_CURRENT_BUILD_DIR@/lib/slf4j-api-1.7.25.jar @PACKAGE_CURRENT_BUILD_DIR@/lib/slf4j-api-1.7.33.jar
@PACKAGE_CURRENT_BUILD_DIR@/lib/slf4j-nop-1.7.25.jar @PACKAGE_CURRENT_BUILD_DIR@/lib/slf4j-nop-1.7.33.jar
) )
set (${HDF5_PACKAGE_NAME}_JAVA_LIBRARY "@PACKAGE_CURRENT_BUILD_DIR@/lib") set (${HDF5_PACKAGE_NAME}_JAVA_LIBRARY "@PACKAGE_CURRENT_BUILD_DIR@/lib")
set (${HDF5_PACKAGE_NAME}_JAVA_LIBRARIES "${${HDF5_PACKAGE_NAME}_JAVA_LIBRARY}") set (${HDF5_PACKAGE_NAME}_JAVA_LIBRARIES "${${HDF5_PACKAGE_NAME}_JAVA_LIBRARY}")

6
java/examples/datasets/JavaDatasetExample.sh.in
View File

@ -57,8 +57,8 @@ $top_builddir/java/src/jni/.libs/libhdf5_java.*
$top_builddir/java/src/$JARFILE $top_builddir/java/src/$JARFILE
" "
LIST_JAR_TESTFILES=" LIST_JAR_TESTFILES="
$HDFLIB_HOME/slf4j-api-1.7.25.jar $HDFLIB_HOME/slf4j-api-1.7.33.jar
$HDFLIB_HOME/ext/slf4j-simple-1.7.25.jar $HDFLIB_HOME/ext/slf4j-simple-1.7.33.jar
" "
LIST_DATA_FILES=" LIST_DATA_FILES="
$HDFTEST_HOME/../testfiles/examples.datasets.H5Ex_D_Alloc.txt $HDFTEST_HOME/../testfiles/examples.datasets.H5Ex_D_Alloc.txt
@ -220,7 +220,7 @@ JAVAEXEFLAGS=@H5_JAVAFLAGS@
COPY_LIBFILES_TO_BLDLIBDIR COPY_LIBFILES_TO_BLDLIBDIR
COPY_DATAFILES_TO_BLDDIR COPY_DATAFILES_TO_BLDDIR
CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-1.7.25.jar:"$BLDLIBDIR"/slf4j-simple-1.7.25.jar:"$TESTJARFILE"" CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-1.7.33.jar:"$BLDLIBDIR"/slf4j-simple-1.7.33.jar:"$TESTJARFILE""
TEST=/usr/bin/test TEST=/usr/bin/test
if [ ! -x /usr/bin/test ] if [ ! -x /usr/bin/test ]

2
java/examples/datasets/Makefile.am
View File

@ -27,7 +27,7 @@ classes:
pkgpath = examples/datasets pkgpath = examples/datasets
hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(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/slf4j-api-1.7.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH
jarfile = jar$(PACKAGE_TARNAME)datasets.jar jarfile = jar$(PACKAGE_TARNAME)datasets.jar

6
java/examples/datatypes/JavaDatatypeExample.sh.in
View File

@ -54,8 +54,8 @@ $top_builddir/java/src/jni/.libs/libhdf5_java.*
$top_builddir/java/src/$JARFILE $top_builddir/java/src/$JARFILE
" "
LIST_JAR_TESTFILES=" LIST_JAR_TESTFILES="
$HDFLIB_HOME/slf4j-api-1.7.25.jar $HDFLIB_HOME/slf4j-api-1.7.33.jar
$HDFLIB_HOME/ext/slf4j-simple-1.7.25.jar $HDFLIB_HOME/ext/slf4j-simple-1.7.33.jar
" "
LIST_DATA_FILES=" LIST_DATA_FILES="
$HDFTEST_HOME/../testfiles/examples.datatypes.H5Ex_T_Array.txt $HDFTEST_HOME/../testfiles/examples.datatypes.H5Ex_T_Array.txt
@ -216,7 +216,7 @@ JAVAEXEFLAGS=@H5_JAVAFLAGS@
COPY_LIBFILES_TO_BLDLIBDIR COPY_LIBFILES_TO_BLDLIBDIR
COPY_DATAFILES_TO_BLDDIR COPY_DATAFILES_TO_BLDDIR
CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-1.7.25.jar:"$BLDLIBDIR"/slf4j-simple-1.7.25.jar:"$TESTJARFILE"" CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-1.7.33.jar:"$BLDLIBDIR"/slf4j-simple-1.7.33.jar:"$TESTJARFILE""
TEST=/usr/bin/test TEST=/usr/bin/test
if [ ! -x /usr/bin/test ] if [ ! -x /usr/bin/test ]

2
java/examples/datatypes/Makefile.am
View File

@ -27,7 +27,7 @@ classes:
pkgpath = examples/datatypes pkgpath = examples/datatypes
hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(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/slf4j-api-1.7.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH
jarfile = jar$(PACKAGE_TARNAME)datatypes.jar jarfile = jar$(PACKAGE_TARNAME)datatypes.jar

6
java/examples/groups/JavaGroupExample.sh.in
View File

@ -56,8 +56,8 @@ $top_builddir/java/src/jni/.libs/libhdf5_java.*
$top_builddir/java/src/$JARFILE $top_builddir/java/src/$JARFILE
" "
LIST_JAR_TESTFILES=" LIST_JAR_TESTFILES="
$HDFLIB_HOME/slf4j-api-1.7.25.jar $HDFLIB_HOME/slf4j-api-1.7.33.jar
$HDFLIB_HOME/ext/slf4j-simple-1.7.25.jar $HDFLIB_HOME/ext/slf4j-simple-1.7.33.jar
" "
LIST_ITER_FILES=" LIST_ITER_FILES="
$HDFTEST_HOME/h5ex_g_iterate.h5 $HDFTEST_HOME/h5ex_g_iterate.h5
@ -255,7 +255,7 @@ COPY_LIBFILES_TO_BLDLIBDIR
COPY_DATAFILES_TO_BLDDIR COPY_DATAFILES_TO_BLDDIR
COPY_ITERFILES_TO_BLDITERDIR COPY_ITERFILES_TO_BLDITERDIR
CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-1.7.25.jar:"$BLDLIBDIR"/slf4j-simple-1.7.25.jar:"$TESTJARFILE"" CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-1.7.33.jar:"$BLDLIBDIR"/slf4j-simple-1.7.33.jar:"$TESTJARFILE""
TEST=/usr/bin/test TEST=/usr/bin/test
if [ ! -x /usr/bin/test ] if [ ! -x /usr/bin/test ]

2
java/examples/groups/Makefile.am
View File

@ -27,7 +27,7 @@ classes:
pkgpath = examples/groups pkgpath = examples/groups
hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(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/slf4j-api-1.7.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH
jarfile = jar$(PACKAGE_TARNAME)groups.jar jarfile = jar$(PACKAGE_TARNAME)groups.jar

6
java/examples/intro/JavaIntroExample.sh.in
View File

@ -54,8 +54,8 @@ $top_builddir/java/src/jni/.libs/libhdf5_java.*
$top_builddir/java/src/$JARFILE $top_builddir/java/src/$JARFILE
" "
LIST_JAR_TESTFILES=" LIST_JAR_TESTFILES="
$HDFLIB_HOME/slf4j-api-1.7.25.jar $HDFLIB_HOME/slf4j-api-1.7.33.jar
$HDFLIB_HOME/ext/slf4j-simple-1.7.25.jar $HDFLIB_HOME/ext/slf4j-simple-1.7.33.jar
" "
LIST_DATA_FILES=" LIST_DATA_FILES="
$HDFTEST_HOME/../testfiles/examples.intro.H5_CreateDataset.txt $HDFTEST_HOME/../testfiles/examples.intro.H5_CreateDataset.txt
@ -205,7 +205,7 @@ JAVAEXEFLAGS=@H5_JAVAFLAGS@
COPY_LIBFILES_TO_BLDLIBDIR COPY_LIBFILES_TO_BLDLIBDIR
COPY_DATAFILES_TO_BLDDIR COPY_DATAFILES_TO_BLDDIR
CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-1.7.25.jar:"$BLDLIBDIR"/slf4j-simple-1.7.25.jar:"$TESTJARFILE"" CPATH=".:"$BLDLIBDIR"/"$JARFILE":"$BLDLIBDIR"/slf4j-api-1.7.33.jar:"$BLDLIBDIR"/slf4j-simple-1.7.33.jar:"$TESTJARFILE""
TEST=/usr/bin/test TEST=/usr/bin/test
if [ ! -x /usr/bin/test ] if [ ! -x /usr/bin/test ]

2
java/examples/intro/Makefile.am
View File

@ -27,7 +27,7 @@ classes:
pkgpath = examples/intro pkgpath = examples/intro
hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
CLASSPATH_ENV=CLASSPATH=.:$(JAVAROOT):$(top_builddir)/java/src/$(hdfjarfile):$(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/slf4j-api-1.7.33.jar:$(top_srcdir)/java/lib/ext/slf4j-simple-1.7.33.jar:$$CLASSPATH
jarfile = jar$(PACKAGE_TARNAME)intro.jar jarfile = jar$(PACKAGE_TARNAME)intro.jar

BIN
java/lib/ext/slf4j-nop-1.7.25.jar
View File

Binary file not shown.

BIN
java/lib/ext/slf4j-nop-1.7.33.jar Normal file
View File

Binary file not shown.

BIN
java/lib/ext/slf4j-simple-1.7.25.jar
View File

Binary file not shown.

BIN
java/lib/ext/slf4j-simple-1.7.33.jar Normal file
View File

Binary file not shown.

BIN
java/lib/slf4j-api-1.7.25.jar
View File

Binary file not shown.

BIN
java/lib/slf4j-api-1.7.33.jar Normal file
View File

Binary file not shown.

2
java/src/Makefile.am
View File

@ -36,7 +36,7 @@ jarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar
hdf5_javadir = $(libdir) hdf5_javadir = $(libdir)
pkgpath = hdf/hdf5lib pkgpath = hdf/hdf5lib
CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.25.jar:$$CLASSPATH CLASSPATH_ENV=CLASSPATH=.:$(top_srcdir)/java/lib/slf4j-api-1.7.33.jar:$$CLASSPATH
AM_JAVACFLAGS = $(H5_JAVACFLAGS) -deprecation AM_JAVACFLAGS = $(H5_JAVACFLAGS) -deprecation

2
java/test/Makefile.am
View File

@ -27,7 +27,7 @@ classes:
pkgpath = test pkgpath = test
hdfjarfile = jar$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).jar 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 jarfile = jar$(PACKAGE_TARNAME)test.jar

6
java/test/junit.sh.in
View File

@ -66,8 +66,8 @@ $top_builddir/java/src/jni/.libs/libhdf5_java.*
LIST_JAR_TESTFILES=" LIST_JAR_TESTFILES="
$HDFLIB_HOME/hamcrest-core.jar $HDFLIB_HOME/hamcrest-core.jar
$HDFLIB_HOME/junit.jar $HDFLIB_HOME/junit.jar
$HDFLIB_HOME/slf4j-api-1.7.25.jar $HDFLIB_HOME/slf4j-api-1.7.33.jar
$HDFLIB_HOME/ext/slf4j-simple-1.7.25.jar $HDFLIB_HOME/ext/slf4j-simple-1.7.33.jar
" "
LIST_JAR_FILES=" LIST_JAR_FILES="
$top_builddir/java/src/$JARFILE $top_builddir/java/src/$JARFILE
@ -299,7 +299,7 @@ JAVAEXEFLAGS=@H5_JAVAFLAGS@
COPY_LIBFILES_TO_BLDLIBDIR COPY_LIBFILES_TO_BLDLIBDIR
COPY_DATAFILES_TO_BLDDIR 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 TEST=/usr/bin/test
if [ ! -x /usr/bin/test ] if [ ! -x /usr/bin/test ]