Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update support branch version number to 1.14.5-1 #4320

Merged
merged 2 commits into from
Apr 4, 2024
Merged

Update support branch version number to 1.14.5-1 #4320

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
503491e
Update support branch
Apr 3, 2024
6714c11
Merge remote-tracking branch 'canonical/hdf5_1_14' into hdf5_1_14
lrknox Apr 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
HDF5 version 1.14.4-1 currently under development
HDF5 version 1.14.5-1 currently under development

![HDF5 Logo](doxygen/img/HDF5.png)

Expand Down
2 changes: 1 addition & 1 deletion c++/src/cpp_doc_config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME =
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = "1.14.4-1, currently under development"
PROJECT_NUMBER = "1.14.5-1, currently under development"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is 1.14.5 correct?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

According to the release process document, it is correct.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now that the release branch is created

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

1.14.5 is the correct version for the hdf5_1_14 branch - for the next 1.14 release. The version in the release branch hdf5_1_14_4 is 1.14.4-2 until the -2 is removed for the actual release.


# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion config/cmake/scripts/HDF5config.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ cmake_minimum_required (VERSION 3.18)
# CTEST_SOURCE_NAME - source folder
##############################################################################

set (CTEST_SOURCE_VERSION "1.14.4")
set (CTEST_SOURCE_VERSION "1.14.5")
set (CTEST_SOURCE_VERSEXT "-1")

##############################################################################
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ AC_PREREQ([2.71])
## NOTE: Do not forget to change the version number here when we do a
## release!!!
##
AC_INIT([HDF5], [1.14.4-1], [[email protected]])
AC_INIT([HDF5], [1.14.5-1], [[email protected]])

AC_CONFIG_SRCDIR([src/H5.c])
AC_CONFIG_HEADERS([src/H5config.h])
Expand Down
4 changes: 2 additions & 2 deletions java/src/hdf/hdf5lib/H5.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@
* which prints out the HDF5 error stack, as described in the HDF5 C API <i><b>@ref H5Eprint()</b>.</i> This
* may be used by Java exception handlers to print out the HDF5 error stack. <hr>
*
* @version HDF5 1.14.4 <BR>
* @version HDF5 1.14.5 <BR>
* <b>See also: </b>
* @ref HDFARRAY hdf.hdf5lib.HDFArray<br />
* @ref HDF5CONST hdf.hdf5lib.HDF5Constants<br />
Expand Down Expand Up @@ -273,7 +273,7 @@ public class H5 implements java.io.Serializable {
* </ul>
* Make sure to update the versions number when a different library is used.
*/
public final static int LIB_VERSION[] = {1, 14, 4};
public final static int LIB_VERSION[] = {1, 14, 5};

/**
* @ingroup JH5
Expand Down
4 changes: 2 additions & 2 deletions java/test/TestH5.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ public void testH5set_free_list_limits()
@Test
public void testH5get_libversion()
{
int libversion[] = {1, 14, 4};
int libversion[] = {1, 14, 5};

try {
H5.H5get_libversion(libversion);
Expand Down Expand Up @@ -354,7 +354,7 @@ public void testH5get_libversion_null_param()
@Test
public void testH5check_version()
{
int majnum = 1, minnum = 14, relnum = 4;
int majnum = 1, minnum = 14, relnum = 5;

try {
H5.H5check_version(majnum, minnum, relnum);
Expand Down
2 changes: 1 addition & 1 deletion release_docs/NEWSLETTER.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Release of HDF5 1.14.4 Library and Tools is now available from the HDF5 Releases page.
HDF5 version 1.14.5-1 currently under development

This is a maintenance release with a few changes and updates:
----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion release_docs/RELEASE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
HDF5 version 1.14.4-1 currently under development
HDF5 version 1.14.5-1 currently under development
================================================================================


Expand Down
4 changes: 2 additions & 2 deletions src/H5public.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,15 @@
/**
* For tweaks, bug-fixes, or development
*/
#define H5_VERS_RELEASE 4
#define H5_VERS_RELEASE 5
/**
* For pre-releases like \c snap0. Empty string for official releases.
*/
#define H5_VERS_SUBRELEASE "1"
/**
* Full version string
*/
#define H5_VERS_INFO "HDF5 library version: 1.14.4-1"
#define H5_VERS_INFO "HDF5 library version: 1.14.5-1"

#define H5check() H5check_version(H5_VERS_MAJOR, H5_VERS_MINOR, H5_VERS_RELEASE)

Expand Down
14 changes: 7 additions & 7 deletions tools/test/h5repack/expected/h5repack_layout.h5-plugin_version_test.ddl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
PARAMS { 9 1 14 4 }
PARAMS { 9 1 14 5 }
}
}
FILLVALUE {
Expand All @@ -33,7 +33,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
PARAMS { 9 1 14 4 }
PARAMS { 9 1 14 5 }
}
}
FILLVALUE {
Expand All @@ -55,7 +55,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
PARAMS { 9 1 14 4 }
PARAMS { 9 1 14 5 }
}
}
FILLVALUE {
Expand All @@ -77,7 +77,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
PARAMS { 9 1 14 4 }
PARAMS { 9 1 14 5 }
}
}
FILLVALUE {
Expand All @@ -99,7 +99,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
PARAMS { 9 1 14 4 }
PARAMS { 9 1 14 5 }
}
}
FILLVALUE {
Expand All @@ -121,7 +121,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
PARAMS { 9 1 14 4 }
PARAMS { 9 1 14 5 }
}
}
FILLVALUE {
Expand All @@ -143,7 +143,7 @@ GROUP "/" {
USER_DEFINED_FILTER {
FILTER_ID 260
COMMENT dynlib4
PARAMS { 9 1 14 4 }
PARAMS { 9 1 14 5 }
}
}
FILLVALUE {
Expand Down
Loading