From 017370682605645b1f89472dcead9251cd531d38 Mon Sep 17 00:00:00 2001 From: Larry Knox Date: Wed, 26 Oct 2022 11:07:17 -0500 Subject: Update develop branch version to 1.13.4-1 (#2189) * Updated version to 1.13.4-1 after creating hdf5_1_13_3 branch for 1.13.3 release. Added new version to exceptions in lines 74-5 of src/H5.c --- README.md | 2 +- c++/src/cpp_doc_config | 2 +- config/cmake/scripts/HDF5config.cmake | 2 +- configure.ac | 2 +- java/src/hdf/hdf5lib/H5.java | 2 +- java/test/TestH5.java | 2 +- release_docs/RELEASE.txt | 2 +- src/H5.c | 4 ++-- src/H5public.h | 4 ++-- .../testfiles/h5repack_layout.h5-plugin_version_test.ddl | 14 +++++++------- 10 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 1fdf877..ecf4b66 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -HDF5 version 1.13.3-1 currently under development +HDF5 version 1.13.4-1 currently under development ![HDF5 Logo](doxygen/img/HDF5.png) diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config index 8c19852..42bac70 100644 --- a/c++/src/cpp_doc_config +++ b/c++/src/cpp_doc_config @@ -38,7 +38,7 @@ PROJECT_NAME = # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = "1.13.3-1, currently under development" +PROJECT_NUMBER = "1.13.4-1, currently under development" # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index ff13b84..71223cb 100644 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -37,7 +37,7 @@ cmake_minimum_required (VERSION 3.18) # CTEST_SOURCE_NAME - source folder ############################################################################## -set (CTEST_SOURCE_VERSION "1.13.3") +set (CTEST_SOURCE_VERSION "1.13.4") set (CTEST_SOURCE_VERSEXT "-1") ############################################################################## diff --git a/configure.ac b/configure.ac index b045af4..ff43c44 100644 --- a/configure.ac +++ b/configure.ac @@ -23,7 +23,7 @@ AC_PREREQ([2.69]) ## NOTE: Do not forget to change the version number here when we do a ## release!!! ## -AC_INIT([HDF5], [1.13.3-1], [help@hdfgroup.org]) +AC_INIT([HDF5], [1.13.4-1], [help@hdfgroup.org]) AC_CONFIG_SRCDIR([src/H5.c]) AC_CONFIG_HEADERS([src/H5config.h]) diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java index f06163e..919a0ac 100644 --- a/java/src/hdf/hdf5lib/H5.java +++ b/java/src/hdf/hdf5lib/H5.java @@ -229,7 +229,7 @@ import hdf.hdf5lib.structs.H5O_token_t; * which prints out the HDF5 error stack, as described in the HDF5 C API @ref H5Eprint(). This * may be used by Java exception handlers to print out the HDF5 error stack.
* - * @version HDF5 1.13.3
+ * @version HDF5 1.13.4
* See also: * @ref HDFARRAY hdf.hdf5lib.HDFArray
* @ref HDF5CONST hdf.hdf5lib.HDF5Constants
diff --git a/java/test/TestH5.java b/java/test/TestH5.java index 062ea54..bb92582 100644 --- a/java/test/TestH5.java +++ b/java/test/TestH5.java @@ -354,7 +354,7 @@ public class TestH5 { @Test public void testH5check_version() { - int majnum = 1, minnum = 13, relnum = 3; + int majnum = 1, minnum = 13, relnum = 4; try { H5.H5check_version(majnum, minnum, relnum); diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index df70ea1..75b819e 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -1,4 +1,4 @@ -HDF5 version 1.13.3-1 currently under development +HDF5 version 1.13.4-1 currently under development ================================================================================ diff --git a/src/H5.c b/src/H5.c index 538925c..75b96bb 100644 --- a/src/H5.c +++ b/src/H5.c @@ -71,8 +71,8 @@ static int H5__mpi_delete_cb(MPI_Comm comm, int keyval, void *attr_val, int *fla /*****************************/ /* Library incompatible release versions, develop releases are incompatible by design */ -const unsigned VERS_RELEASE_EXCEPTIONS[] = {0, 1, 2, 3}; -const unsigned VERS_RELEASE_EXCEPTIONS_SIZE = 4; +const unsigned VERS_RELEASE_EXCEPTIONS[] = {0, 1, 2, 3, 4}; +const unsigned VERS_RELEASE_EXCEPTIONS_SIZE = 5; /* statically initialize block for pthread_once call used in initializing */ /* the first global mutex */ diff --git a/src/H5public.h b/src/H5public.h index fbd0f5f..187eec1 100644 --- a/src/H5public.h +++ b/src/H5public.h @@ -84,7 +84,7 @@ /** * For tweaks, bug-fixes, or development */ -#define H5_VERS_RELEASE 3 +#define H5_VERS_RELEASE 4 /** * For pre-releases like \c snap0. Empty string for official releases. */ @@ -92,7 +92,7 @@ /** * Full version string */ -#define H5_VERS_INFO "HDF5 library version: 1.13.3-1" +#define H5_VERS_INFO "HDF5 library version: 1.13.4-1" #define H5check() H5check_version(H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE) diff --git a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl b/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl index 150ccbe..6afabbc 100644 --- a/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl +++ b/tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl @@ -11,7 +11,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 13 3 } + PARAMS { 9 1 13 4 } } } FILLVALUE { @@ -33,7 +33,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 13 3 } + PARAMS { 9 1 13 4 } } } FILLVALUE { @@ -55,7 +55,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 13 3 } + PARAMS { 9 1 13 4 } } } FILLVALUE { @@ -77,7 +77,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 13 3 } + PARAMS { 9 1 13 4 } } } FILLVALUE { @@ -99,7 +99,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 13 3 } + PARAMS { 9 1 13 4 } } } FILLVALUE { @@ -121,7 +121,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 13 3 } + PARAMS { 9 1 13 4 } } } FILLVALUE { @@ -143,7 +143,7 @@ GROUP "/" { USER_DEFINED_FILTER { FILTER_ID 260 COMMENT dynlib4 - PARAMS { 9 1 13 3 } + PARAMS { 9 1 13 4 } } } FILLVALUE { -- cgit v0.12