Skip to content

Commit

Permalink
Merge pull request #493 from dtcenter/feature_492_v6.0.0-beta1
Browse files Browse the repository at this point in the history
Create the METviewer v6.0.0-beta1 release  #492
  • Loading branch information
TatianaBurek committed Sep 18, 2023
2 parents 50528ad + fbafb25 commit 68e52d4
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -319,7 +319,7 @@
</copy>
<delete file="${build}/MANIFEST.MF"/>
<manifest file="${build}/MANIFEST.MF">
<attribute name="Specification-Version" value="6.0.0-beta1-dev"/>
<attribute name="Specification-Version" value="6.0.0-beta1"/>
</manifest>

<jar jarfile="${dist}/lib/metviewer.jar" basedir="${build}" manifest="${build}/MANIFEST.MF">
Expand Down
8 changes: 4 additions & 4 deletions docker/hooks/build
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash

docker build -t $IMAGE_NAME \
--build-arg METVIEWER_GIT_NAME=v5.1.0 \
--build-arg METCALCPY_GIT_NAME=v2.1.0 \
--build-arg METDATAIO_GIT_NAME=v2.1.0 \
--build-arg METPLOTPY_GIT_NAME=v2.1.0 .
--build-arg METVIEWER_GIT_NAME=v6.0.0-beta1 \
--build-arg METCALCPY_GIT_NAME=v3.0.0-beta1 \
--build-arg METDATAIO_GIT_NAME=v3.0.0-beta1 \
--build-arg METPLOTPY_GIT_NAME=v3.0.0-beta1 .

12 changes: 12 additions & 0 deletions docs/Users_Guide/release-notes.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,18 @@ When applicable, release notes are followed by the GitHub issue number which
describes the bugfix, enhancement, or new feature:
https://github.com/dtcenter/METviewer/issues

Version `v6.0.0-beta1 <https://github.com/dtcenter/METviewer>`_ release notes (20230918)
----------------------------------------------------------------------------------------

.. dropdown:: New Features

.. dropdown:: Enhancements

.. dropdown:: Bugfixes

.. dropdown:: Internal


Version `v5.1.0 <https://github.com/dtcenter/METviewer>`_ release notes (20230731)
----------------------------------------------------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion docs/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.0.0-beta1-dev
6.0.0-beta1
4 changes: 2 additions & 2 deletions webapp/metviewer/metviewer1.jsp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">

<TITLE>METviewer 5.1.0</TITLE>
<TITLE>METviewer 6.0.0-beta1</TITLE>
<link rel="shortcut icon" href="./favicon.ico">

<link rel="stylesheet"
Expand Down Expand Up @@ -252,7 +252,7 @@

<div class="toolbar ui-widget" id="toolbar ">
<div style="float: left; cursor: alias;font-family: 'Arial Black',Gadget,sans-serif;"
id="release">METviewer 5.1.0<span class="ui-icon ui-icon-info " style="float: right;
id="release">METviewer 6.0.0-beta1<span class="ui-icon ui-icon-info " style="float: right;
margin-left: .4em;"></span>

</div>
Expand Down

0 comments on commit 68e52d4

Please sign in to comment.