summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-11-06 22:01:16 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-11-06 22:01:16 (GMT)
commit1652a60fcbe9894d7c34a778fb24dce1979fb9a9 (patch)
treeac0ae66841c1d382cb73cdcecdec014d590799f4
parent0f4f4cf5dd417f354799ba3740a482f7dee3e923 (diff)
parent81cb24ac1db0f4936b19067cdb7fa4e14e0d00db (diff)
downloadhdf5-1652a60fcbe9894d7c34a778fb24dce1979fb9a9.zip
hdf5-1652a60fcbe9894d7c34a778fb24dce1979fb9a9.tar.gz
hdf5-1652a60fcbe9894d7c34a778fb24dce1979fb9a9.tar.bz2
Merge pull request #1319 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit '81cb24ac1db0f4936b19067cdb7fa4e14e0d00db': Commit version changes for additional files for 1.11.3 snapshot release.
-rw-r--r--java/src/hdf/hdf5lib/H5.java4
-rw-r--r--java/test/TestH5.java4
-rw-r--r--tools/test/h5repack/testfiles/h5repack_layout.h5-plugin_version_test.ddl14
3 files changed, 11 insertions, 11 deletions
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index be7cae4..f9f9b65 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.3 <BR>
+ * @version HDF5 1.11.4 <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, 3 };
+ public final static int LIB_VERSION[] = { 1, 11, 4 };
public final static String H5PATH_PROPERTY_KEY = "hdf.hdf5lib.H5.hdf5lib";
diff --git a/java/test/TestH5.java b/java/test/TestH5.java
index 738c9f1..54603ca 100644
--- a/java/test/TestH5.java
+++ b/java/test/TestH5.java
@@ -162,7 +162,7 @@ public class TestH5 {
*/
@Test
public void testH5get_libversion() {
- int libversion[] = { 1, 11, 3 };
+ int libversion[] = { 1, 11, 4 };
try {
H5.H5get_libversion(libversion);
@@ -184,7 +184,7 @@ public class TestH5 {
*/
@Test
public void testH5check_version() {
- int majnum = 1, minnum = 11, relnum = 3;
+ int majnum = 1, minnum = 11, relnum = 4;
try {
H5.H5check_version(majnum, minnum, relnum);
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 8f48c37..1d2914b 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 3 }
+ PARAMS { 9 1 11 4 }
}
}
FILLVALUE {
@@ -33,7 +33,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 11 3 }
+ PARAMS { 9 1 11 4 }
}
}
FILLVALUE {
@@ -55,7 +55,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 11 3 }
+ PARAMS { 9 1 11 4 }
}
}
FILLVALUE {
@@ -77,7 +77,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 11 3 }
+ PARAMS { 9 1 11 4 }
}
}
FILLVALUE {
@@ -99,7 +99,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 11 3 }
+ PARAMS { 9 1 11 4 }
}
}
FILLVALUE {
@@ -121,7 +121,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 11 3 }
+ PARAMS { 9 1 11 4 }
}
}
FILLVALUE {
@@ -143,7 +143,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
- PARAMS { 9 1 11 3 }
+ PARAMS { 9 1 11 4 }
}
}
FILLVALUE {