From d7282ae6b0be91df26305468d1d77ba79efef42d Mon Sep 17 00:00:00 2001 From: Galen Charlton Date: Tue, 15 Nov 2022 18:48:53 -0500 Subject: [PATCH] update version stamps and ChangeLog Signed-off-by: Galen Charlton --- ChangeLog | 44 ++++++++++++++++++++++ Open-ILS/src/perlmods/lib/OpenILS/Application.pm | 2 +- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- .../staff_client/chrome/content/main/about.html | 2 +- .../xul/staff_client/defaults/preferences/prefs.js | 2 +- configure.ac | 2 +- 6 files changed, 49 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8ca9784e4d..e4ed5b037c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,47 @@ +commit e35f6692fe6ee5c8743f63b972ae3ee4dd7f8eef +Author: Galen Charlton +Date: Tue Nov 15 18:43:52 2022 -0500 + + more updates to the server upgrade + + Signed-off-by: Galen Charlton + +2 2 docs/modules/installation/pages/server_upgrade.adoc + +commit 474314fb80b8fe131b1297a65f77d97132444c5c +Author: Galen Charlton +Date: Tue Nov 15 18:42:57 2022 -0500 + + update upgrade instructions for 3.10.0 + + Signed-off-by: Galen Charlton + +14 14 docs/modules/installation/pages/server_upgrade.adoc + +commit e92df1ba43275f9a3a82ecdd83e66a67fd3c80d5 +Author: Galen Charlton +Date: Tue Nov 15 18:41:58 2022 -0500 + + update release notes for 3.10.0 + + Signed-off-by: Galen Charlton + +66 5 docs/RELEASE_NOTES_3_10.adoc + +commit ad7743285cbbe4e7adabb994482c3a8d95737cdf +Author: Galen Charlton +Date: Tue Nov 15 18:35:51 2022 -0500 + + update schema update script + + - tag for 3.10.0 + - add back reingest at the end + + Signed-off-by: Galen Charlton + +14 3 Open-ILS/src/sql/Pg/version-upgrade/{3.9.1-3.10-rc-upgrade-db.sql => 3.9.1-3.10.0-upgrade-db.sql} + rename Open-ILS/src/sql/Pg/version-upgrade/{3.9.1-3.10-rc-upgrade-db.sql => 3.9.1-3.10.0-upgrade-db.sql} (99%) + commit a7db4e3b552563fe8300a351eb922f2f835b0e7e Author: Jane Sandberg Date: Thu Nov 10 22:19:36 2022 -0600 diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm index 857a68e400..fae359be26 100644 --- a/Open-ILS/src/perlmods/lib/OpenILS/Application.pm +++ b/Open-ILS/src/perlmods/lib/OpenILS/Application.pm @@ -7,7 +7,7 @@ use OpenILS::Utils::Fieldmapper; sub ils_version { # version format is "x-y-z", for example "2-0-0" for Evergreen 2.0.0 # For branches, format is "x-y" - return "3-10-rc"; + return "3-10-0"; } __PACKAGE__->register_method( diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index d98ac7ab68..05fb7a71bc 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -93,7 +93,7 @@ CREATE TRIGGER no_overlapping_deps FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates'); INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1353', :eg_version); -- khuckins/smorrison/sandbergja -INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.10-rc', :eg_version); +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('3.10.0', :eg_version); CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/xul/staff_client/chrome/content/main/about.html b/Open-ILS/xul/staff_client/chrome/content/main/about.html index 2b50e06866..5ab510a308 100644 --- a/Open-ILS/xul/staff_client/chrome/content/main/about.html +++ b/Open-ILS/xul/staff_client/chrome/content/main/about.html @@ -1,7 +1,7 @@

Evergreen

Target Server ID:

http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_3_10_rc

http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_3_10_0

What is Evergreen?

diff --git a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js index 936d4132a3..ddc60b6f7a 100644 --- a/Open-ILS/xul/staff_client/defaults/preferences/prefs.js +++ b/Open-ILS/xul/staff_client/defaults/preferences/prefs.js @@ -11,7 +11,7 @@ pref("toolkit.singletonWindowType", "eg_main"); pref("open-ils.enable_join_tabs", true); // We'll use this one to help brand some build information into the client, and rely on subversion keywords -pref("open-ils.repository.headURL","http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_3_10_rc"); +pref("open-ils.repository.headURL","http://git.evergreen-ils.org/?p=Evergreen.git;a=shortlog;h=refs/heads/tags/rel_3_10_0"); pref("open-ils.repository.author","$Author$"); pref("open-ils.repository.revision","$Revision$"); pref("open-ils.repository.date","$Date$"); diff --git a/configure.ac b/configure.ac index faaa787691..fc5653345e 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ export PATH=${PATH}:/usr/sbin AC_PREREQ(2.61) -AC_INIT(Open-ILS, 3.10-rc, open-ils-dev@list.georgialibraries.org) +AC_INIT(Open-ILS, 3.10.0, open-ils-dev@list.georgialibraries.org) AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE -- 2.11.0