summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2017-03-24 18:44:36 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2017-03-24 18:44:36 (GMT)
commit78f488b0b420e81e113cf4ca39267c7efea6cf44 (patch)
tree1e676cb32235093cfc8d7983791fdc677d5818dc /java
parent87dceab9deb7e1580b3c5a1216ac3a9003eb0a42 (diff)
parent00a19eebf00f17736ca01d2375ebdb05e5f817d8 (diff)
downloadhdf5-78f488b0b420e81e113cf4ca39267c7efea6cf44.zip
hdf5-78f488b0b420e81e113cf4ca39267c7efea6cf44.tar.gz
hdf5-78f488b0b420e81e113cf4ca39267c7efea6cf44.tar.bz2
Merge pull request #368 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '00a19eebf00f17736ca01d2375ebdb05e5f817d8': Update RELEASE.txt Remove "currently under development" from h5vers for HDF5Config.cmake that causes cmake not to find HDF5. Merge bin/h5vers changes from develop. Pull version from configure for version test in h5repack_plugin.sh.in Update version to 1.10.2-snap0 for hdf5_1_10 branch.
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 4a491fe..996feeb 100644
--- a/java/src/hdf/hdf5lib/H5.java
+++ b/java/src/hdf/hdf5lib/H5.java
@@ -216,7 +216,7 @@ import hdf.hdf5lib.structs.H5O_info_t;
* exception handlers to print out the HDF-5 error stack.
* <hr>
*
- * @version HDF5 1.10.1-pre0 <BR>
+ * @version HDF5 1.10.2 <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>
@@ -239,7 +239,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, 10, 1 };
+ public final static int LIB_VERSION[] = { 1, 10, 2 };
public final static String H5PATH_PROPERTY_KEY = "hdf.hdf5lib.H5.hdf5lib";
diff --git a/java/test/TestH5.java b/java/test/TestH5.java
index 205a51c..b5864e8 100644
--- a/java/test/TestH5.java
+++ b/java/test/TestH5.java
@@ -164,7 +164,7 @@ public class TestH5 {
*/
@Test
public void testH5get_libversion() {
- int libversion[] = { 1, 10, 1 };
+ int libversion[] = { 1, 10, 2 };
try {
H5.H5get_libversion(libversion);
@@ -186,7 +186,7 @@ public class TestH5 {
*/
@Test
public void testH5check_version() {
- int majnum = 1, minnum = 10, relnum = 1;
+ int majnum = 1, minnum = 10, relnum = 2;
try {
H5.H5check_version(majnum, minnum, relnum);