Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)

* commit 'f03758613a6ec83e5ddd664590d162ccc888f13e':
  Snapshot version 1.11 release 2.
  Normalization with vol_integration (test code and H5Xtest.c)

2 files changed, 4 insertions, 4 deletions

diff --git a/java/src/hdf/hdf5lib/H5.java b/java/src/hdf/hdf5lib/H5.java
index f58623e..be7cae4 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.2 <BR>
+ * @version HDF5 1.11.3 <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, 2 };
+    public final static int LIB_VERSION[] = { 1, 11, 3 };
 
     public final static String H5PATH_PROPERTY_KEY = "hdf.hdf5lib.H5.hdf5lib";
 
diff --git a/java/test/TestH5.java b/java/test/TestH5.java
index b922583..738c9f1 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, 2 };
+        int libversion[] = { 1, 11, 3 };
 
         try {
             H5.H5get_libversion(libversion);
@@ -184,7 +184,7 @@ public class TestH5 {
      */
     @Test
     public void testH5check_version() {
-        int majnum = 1, minnum = 11, relnum = 2;
+        int majnum = 1, minnum = 11, relnum = 3;
 
         try {
             H5.H5check_version(majnum, minnum, relnum);