From 99e23f96ec362ac2f524cb5cd80ca375fa13f196 Mon Sep 17 00:00:00 2001 From: Michael Heppler Date: Tue, 5 Jun 2018 11:52:04 -0400 Subject: [PATCH 1/3] Update version 4.8.6 to 4.9 [ref #4734] --- doc/sphinx-guides/source/conf.py | 4 ++-- doc/sphinx-guides/source/versions.rst | 3 ++- pom.xml | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/sphinx-guides/source/conf.py b/doc/sphinx-guides/source/conf.py index b6c1d990337..8093ede98d7 100755 --- a/doc/sphinx-guides/source/conf.py +++ b/doc/sphinx-guides/source/conf.py @@ -64,9 +64,9 @@ # built documents. # # The short X.Y version. -version = '4.8.6' +version = '4.9' # The full version, including alpha/beta/rc tags. -release = '4.8.6' +release = '4.9' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/doc/sphinx-guides/source/versions.rst b/doc/sphinx-guides/source/versions.rst index 9aa0c827a1a..a6dacb43113 100755 --- a/doc/sphinx-guides/source/versions.rst +++ b/doc/sphinx-guides/source/versions.rst @@ -5,7 +5,8 @@ Dataverse Guides Versions This list provides a way to refer to previous versions of the Dataverse guides, which we still host. In order to learn more about the updates delivered from one version to another, visit the `Releases `__ page in our GitHub repo. -- 4.8.6 +- 4.9 +- `4.8.6 `__ - `4.8.5 `__ - `4.8.4 `__ - `4.8.3 `__ diff --git a/pom.xml b/pom.xml index ff01f1d9d44..6ec45d26f6c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ edu.harvard.iq dataverse - 4.8.6 + 4.9 war dataverse From 9f9902037a08dbeadba3af925e515b9bf5cb28ac Mon Sep 17 00:00:00 2001 From: Michael Heppler Date: Tue, 5 Jun 2018 11:54:34 -0400 Subject: [PATCH 2/3] Update version number commit example updated in Developer Guide [ref #4734] --- doc/sphinx-guides/source/developers/making-releases.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx-guides/source/developers/making-releases.rst b/doc/sphinx-guides/source/developers/making-releases.rst index 99c0855a337..910657412b0 100755 --- a/doc/sphinx-guides/source/developers/making-releases.rst +++ b/doc/sphinx-guides/source/developers/making-releases.rst @@ -14,7 +14,7 @@ Before tagging, ensure the version number has been incremented to the milestone - doc/sphinx-guides/source/conf.py - doc/sphinx-guides/source/versions.rst -.. Here's an example commit where all three files were updated at once: https://github.com/IQSS/dataverse/commit/813b66a6077e8f94026a8db5320cceffefc10e11 +.. Here's an example commit where all three files were updated at once: https://github.com/IQSS/dataverse/commit/99e23f96ec362ac2f524cb5cd80ca375fa13f196 Merge "develop" into "master" ----------------------------- From 122530117fe3eeeee8f578301d06c2bbc393cf4b Mon Sep 17 00:00:00 2001 From: Michael Heppler Date: Tue, 5 Jun 2018 12:33:56 -0400 Subject: [PATCH 3/3] Removed comment-out from line in Making Releases pg in Developer Guide. [ref #4734] --- doc/sphinx-guides/source/developers/making-releases.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/sphinx-guides/source/developers/making-releases.rst b/doc/sphinx-guides/source/developers/making-releases.rst index 910657412b0..6a77b2865b5 100755 --- a/doc/sphinx-guides/source/developers/making-releases.rst +++ b/doc/sphinx-guides/source/developers/making-releases.rst @@ -14,7 +14,7 @@ Before tagging, ensure the version number has been incremented to the milestone - doc/sphinx-guides/source/conf.py - doc/sphinx-guides/source/versions.rst -.. Here's an example commit where all three files were updated at once: https://github.com/IQSS/dataverse/commit/99e23f96ec362ac2f524cb5cd80ca375fa13f196 +Here's an example commit where all three files were updated at once: https://github.com/IQSS/dataverse/commit/99e23f96ec362ac2f524cb5cd80ca375fa13f196 Merge "develop" into "master" -----------------------------