summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-11-06 22:01:35 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-11-06 22:01:35 (GMT)
commit4616c1e863ab756d22af696672ba9bc2fe0eea25 (patch)
tree8b9a61576033c5a121e548c78b13b507a2a43e50 /java
parent7f5d91fa8fb79507570084e1d45307b21f9a7a99 (diff)
parent1652a60fcbe9894d7c34a778fb24dce1979fb9a9 (diff)
downloadhdf5-4616c1e863ab756d22af696672ba9bc2fe0eea25.zip
hdf5-4616c1e863ab756d22af696672ba9bc2fe0eea25.tar.gz
hdf5-4616c1e863ab756d22af696672ba9bc2fe0eea25.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '1652a60fcbe9894d7c34a778fb24dce1979fb9a9': HDFFV-10605 Only test plugins if SHARED enabled Correct platforms Correct extlib depends Commit version changes for additional files for 1.11.3 snapshot release.
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 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);