summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-09-25 21:23:52 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-09-25 21:23:52 (GMT)
commit46f81a33dd2d4d0273d896792850b19111b4e945 (patch)
treede87b5d50a3edb0a1a12abb7e0991fe712c2061c
parent6632780f419d48b7ca21f5b5dcd912f9698f67e7 (diff)
parentb04e1ad058fd98fc0b303586dd5f6f19aa645ed0 (diff)
downloadhdf5-46f81a33dd2d4d0273d896792850b19111b4e945.zip
hdf5-46f81a33dd2d4d0273d896792850b19111b4e945.tar.gz
hdf5-46f81a33dd2d4d0273d896792850b19111b4e945.tar.bz2
Merge pull request #1944 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'b04e1ad058fd98fc0b303586dd5f6f19aa645ed0': Update develop branch version to 1.13.0 after creation of hdf5_1_12 branch.
-rw-r--r--README.txt2
-rw-r--r--c++/src/cpp_doc_config2
-rw-r--r--config/cmake/scripts/HDF5config.cmake2
-rw-r--r--configure.ac2
-rw-r--r--java/src/hdf/hdf5lib/H5.java4
-rw-r--r--java/test/TestH5.java4
-rw-r--r--release_docs/RELEASE.txt2
-rw-r--r--src/H5public.h6
-rw-r--r--tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl14
9 files changed, 19 insertions, 19 deletions
diff --git a/README.txt b/README.txt
index 64f1345..88f1df0 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.11.6 currently under development
+HDF5 version 1.13.0 currently under development
------------------------------------------------------------------------------
Please refer to the release_docs/INSTALL file for installation instructions.
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index 14ca90c..71db7f6 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.11.6"
+PROJECT_NUMBER = "1.13.0"
# 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 3511d05..b5659c3 100644
--- a/config/cmake/scripts/HDF5config.cmake
+++ b/config/cmake/scripts/HDF5config.cmake
@@ -34,7 +34,7 @@ cmake_minimum_required (VERSION 3.10)
# CTEST_SOURCE_NAME - source folder
##############################################################################
-set (CTEST_SOURCE_VERSION "1.11.6")
+set (CTEST_SOURCE_VERSION "1.13.0")
set (CTEST_SOURCE_VERSEXT "")
##############################################################################
diff --git a/configure.ac b/configure.ac
index e119e0a..e40f750 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,7 +24,7 @@ AC_PREREQ([2.69])
## NOTE: Do not forget to change the version number here when we do a
## release!!!
##
-AC_INIT([HDF5], [1.11.6], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.13.0], [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 4b563fd..adb50f1 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -214,7 +214,7 @@ import hdf.hdf5lib.structs.H5O_info_t;
* exception handlers to print out the HDF-5 error stack.
* <hr>
*
- * @version HDF5 1.11.6 <BR>
+ * @version HDF5 1.13.0 <BR>
* <b>See also: <a href ="./hdf.hdf5lib.HDFArray.html"> hdf.hdf5lib.HDFArray</a> </b><BR>
* <a href ="./hdf.hdf5lib.HDF5Constants.html"> hdf.hdf5lib.HDF5Constants</a><BR>
* <a href ="./hdf.hdf5lib.HDF5CDataTypes.html"> hdf.hdf5lib.HDF5CDataTypes</a><BR>
@@ -237,7 +237,7 @@ public class H5 implements java.io.Serializable {
*
* Make sure to update the versions number when a different library is used.
*/
- public final static int LIB_VERSION[] = { 1, 11, 6 };
+ public final static int LIB_VERSION[] = { 1, 13, 0 };
public final static String H5PATH_PROPERTY_KEY = "hdf.hdf5lib.H5.hdf5lib";
diff --git a/java/test/TestH5.java b/java/test/TestH5.java
index 1dbcce3..2bee075 100644
--- a/java/test/TestH5.java
+++ b/java/test/TestH5.java
@@ -161,7 +161,7 @@ public class TestH5 {
*/
@Test
public void testH5get_libversion() {
- int libversion[] = { 1, 11, 6 };
+ int libversion[] = { 1, 13, 0 };
try {
H5.H5get_libversion(libversion);
@@ -200,7 +200,7 @@ public class TestH5 {
*/
@Test
public void testH5check_version() {
- int majnum = 1, minnum = 11, relnum = 6;
+ int majnum = 1, minnum = 13, relnum = 0;
try {
H5.H5check_version(majnum, minnum, relnum);
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index eb47648..f9547f3 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.11.6 currently under development
+HDF5 version 1.13.0 currently under development
================================================================================
diff --git a/src/H5public.h b/src/H5public.h
index b79fcfb..8021027 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -95,11 +95,11 @@ extern "C" {
/* Version numbers */
#define H5_VERS_MAJOR 1 /* For major interface/format changes */
-#define H5_VERS_MINOR 11 /* For minor interface/format changes */
-#define H5_VERS_RELEASE 6 /* For tweaks, bug-fixes, or development */
+#define H5_VERS_MINOR 13 /* For minor interface/format changes */
+#define H5_VERS_RELEASE 0 /* For tweaks, bug-fixes, or development */
#define H5_VERS_SUBRELEASE "" /* For pre-releases like snap0 */
/* Empty string for real releases. */
-#define H5_VERS_INFO "HDF5 library version: 1.11.6" /* Full version string */
+#define H5_VERS_INFO "HDF5 library version: 1.13.0" /* Full version string */
#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 3ff2170..eeb0f2d 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 11 6 }
+ PARAMS { 9 1 13 0 }
}
}
FILLVALUE {
@@ -33,7 +33,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 11 6 }
+ PARAMS { 9 1 13 0 }
}
}
FILLVALUE {
@@ -55,7 +55,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 11 6 }
+ PARAMS { 9 1 13 0 }
}
}
FILLVALUE {
@@ -77,7 +77,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 11 6 }
+ PARAMS { 9 1 13 0 }
}
}
FILLVALUE {
@@ -99,7 +99,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 11 6 }
+ PARAMS { 9 1 13 0 }
}
}
FILLVALUE {
@@ -121,7 +121,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 11 6 }
+ PARAMS { 9 1 13 0 }
}
}
FILLVALUE {
@@ -143,7 +143,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 11 6 }
+ PARAMS { 9 1 13 0 }
}
}
FILLVALUE {