summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-04-03 13:56:57 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-04-03 13:56:57 (GMT)
commitcb0ff923de3876e43c5d23bf1e542f14a0dab59e (patch)
treec492ec96cbcdb4bb464c45a3a87c9c4c810b8260 /java
parentbd2317cc11071f91e41f7229585173e956129932 (diff)
parent844f38c6462f42a9a3a6002de6a4acb0520b8fb7 (diff)
downloadhdf5-cb0ff923de3876e43c5d23bf1e542f14a0dab59e.zip
hdf5-cb0ff923de3876e43c5d23bf1e542f14a0dab59e.tar.gz
hdf5-cb0ff923de3876e43c5d23bf1e542f14a0dab59e.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '844f38c6462f42a9a3a6002de6a4acb0520b8fb7': Correct entry Snapshot version 1.11 release 4. Update version to 1.11.5. Allow option to select NAMESPACE Correct examples for packaging
Diffstat (limited to 'java')
-rw-r--r--java/src/hdf/hdf5lib/H5.java4
-rw-r--r--java/test/TestH5.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index 57157c2..d107ad8 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -212,7 +212,7 @@ import hdf.hdf5lib.structs.H5O_info_t;
* exception handlers to print out the HDF-5 error stack.
* <hr>
*
- * @version HDF5 1.11.4 <BR>
+ * @version HDF5 1.11.5 <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>
@@ -235,7 +235,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, 4 };
+ public final static int LIB_VERSION[] = { 1, 11, 5 };
public final static String H5PATH_PROPERTY_KEY = "hdf.hdf5lib.H5.hdf5lib";
diff --git a/java/test/TestH5.java b/java/test/TestH5.java
index c59101b..1d24724 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, 4 };
+ int libversion[] = { 1, 11, 5 };
try {
H5.H5get_libversion(libversion);
@@ -201,7 +201,7 @@ public class TestH5 {
*/
@Test
public void testH5check_version() {
- int majnum = 1, minnum = 11, relnum = 4;
+ int majnum = 1, minnum = 11, relnum = 5;
try {
H5.H5check_version(majnum, minnum, relnum);