From b2509a632b585d636f8620ba922b2c38d00d39e2 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Fri, 2 May 2025 16:39:38 -0600 Subject: [PATCH 01/25] DRYD-1797: Add note field to 8.1 procedures (#317) --- tomcat-main/src/main/resources/defaults/base-procedure-exit.xml | 2 ++ .../src/main/resources/defaults/base-procedure-heldintrust.xml | 2 ++ .../main/resources/defaults/base-procedure-nagprainventory.xml | 2 ++ .../resources/defaults/base-procedure-summarydocumentation.xml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-exit.xml b/tomcat-main/src/main/resources/defaults/base-procedure-exit.xml index 92630b6f0..be0a82a65 100644 --- a/tomcat-main/src/main/resources/defaults/base-procedure-exit.xml +++ b/tomcat-main/src/main/resources/defaults/base-procedure-exit.xml @@ -40,6 +40,8 @@ + +
diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-heldintrust.xml b/tomcat-main/src/main/resources/defaults/base-procedure-heldintrust.xml index ec9fa04e8..c519dc12c 100644 --- a/tomcat-main/src/main/resources/defaults/base-procedure-heldintrust.xml +++ b/tomcat-main/src/main/resources/defaults/base-procedure-heldintrust.xml @@ -44,6 +44,8 @@ + +
diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-nagprainventory.xml b/tomcat-main/src/main/resources/defaults/base-procedure-nagprainventory.xml index e6d7f1335..6aa5cb92d 100644 --- a/tomcat-main/src/main/resources/defaults/base-procedure-nagprainventory.xml +++ b/tomcat-main/src/main/resources/defaults/base-procedure-nagprainventory.xml @@ -51,6 +51,8 @@ + +
diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-summarydocumentation.xml b/tomcat-main/src/main/resources/defaults/base-procedure-summarydocumentation.xml index d706a50b9..979b0f15b 100644 --- a/tomcat-main/src/main/resources/defaults/base-procedure-summarydocumentation.xml +++ b/tomcat-main/src/main/resources/defaults/base-procedure-summarydocumentation.xml @@ -55,6 +55,8 @@ + +
From c9c5bcbe8cf9b1c6ccddfefb78062b07a3707082 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Thu, 8 May 2025 11:48:16 -0600 Subject: [PATCH 02/25] DRYD-1790: Add deaccession reason to fcart (#318) --- .../fcart-profile-instance-vocabularies.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml b/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml index c888069a4..59c1b6518 100644 --- a/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml +++ b/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml @@ -1524,6 +1524,19 @@ + + deaccessionreason + deaccessionreason + Deaccession Reason + + + + + + + + + objexitmethod objexitmethod From d422b854ec7828dd01baddf7ddaf324100944e12 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Mon, 12 May 2025 13:40:18 -0600 Subject: [PATCH 03/25] DRYD-1770: Add production agent (#319) --- .../src/main/resources/defaults/base-collectionobject.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tomcat-main/src/main/resources/defaults/base-collectionobject.xml b/tomcat-main/src/main/resources/defaults/base-collectionobject.xml index fd39153bf..d2646c9b1 100644 --- a/tomcat-main/src/main/resources/defaults/base-collectionobject.xml +++ b/tomcat-main/src/main/resources/defaults/base-collectionobject.xml @@ -346,6 +346,9 @@ + + +
From 939f29e2873265662d79bf0d4d738fce66ffa2e0 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Tue, 13 May 2025 13:14:11 -0600 Subject: [PATCH 04/25] DRYD-1744: Remove anthroOwnershipAccess (#320) --- .../main/resources/tenants/anthro/anthro-collectionobject.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/tomcat-main/src/main/resources/tenants/anthro/anthro-collectionobject.xml b/tomcat-main/src/main/resources/tenants/anthro/anthro-collectionobject.xml index 68215b2c7..7244532f9 100644 --- a/tomcat-main/src/main/resources/tenants/anthro/anthro-collectionobject.xml +++ b/tomcat-main/src/main/resources/tenants/anthro/anthro-collectionobject.xml @@ -73,7 +73,6 @@
- From 63fc3f6dc6570c03330d5cafddcf527240d6a2ac Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Thu, 12 Jun 2025 16:00:52 -0600 Subject: [PATCH 05/25] Add Changelog (#321) --- CHANGELOG.md | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..a829f9269 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,35 @@ +# CollectionSpace Application Changelog + +## 8.2.0 + +## Procedures + +### CollectionObject + +* Add repeating field `objectProductionAgents/objectProductionAgent` + +### Object Exit + +* Add field `note` + +### Held-in-Trust + +* Add field `note` + +### Summary Documentation + +* Add field `note` + +### NAGPRA Inventory + +* Add field `note` + +## Profiles + +### Anthro + +* Remove `anthroOwnershipAccess` from `CollectionObject` + +### FCART + +* Add `deaccessionreason` term list to fcart profile instance vocabularies From ba0ce88a6a53ef826ad0b14ed901409666fde37d Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Fri, 27 Jun 2025 14:38:38 -0600 Subject: [PATCH 06/25] Update Release Version to 8.2.0 (#322) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 60acc7b68..679ab197a 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ Root - 8.2.0-SNAPSHOT + 8.2.0 ${revision} ${basedir}/tmp csmake From fb5a2d2a3a9b0889cb7d69d64e7eb7f59b31e935 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Mon, 30 Jun 2025 13:04:17 -0600 Subject: [PATCH 07/25] Update to 8.3.0-SNAPSHOT (#323) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 679ab197a..c3e2d725f 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ Root - 8.2.0 + 8.3.0-SNAPSHOT ${revision} ${basedir}/tmp csmake From 56ab2ff6f7bc3fea2bddd3a3b81448f27a8c9932 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Tue, 4 Nov 2025 13:14:21 -0700 Subject: [PATCH 08/25] Add support for authority display names (#325) * Add display name support for Authorities in order to provide a standard name to the services layer * Update authorities to include a display name * Update authority vocab titles to match cspace-ui.js or the respective profile plugin --- .../installation/ServiceBindingsGeneration.java | 4 ++-- .../collectionspace/chain/csp/schema/Record.java | 8 ++++++++ .../defaults/base-authority-chronology.xml | 7 ++++--- .../defaults/base-authority-citation.xml | 5 +++-- .../resources/defaults/base-authority-concept.xml | 13 +++++++------ .../defaults/base-authority-location.xml | 5 +++-- .../defaults/base-authority-material.xml | 1 + .../defaults/base-authority-organization.xml | 5 +++-- .../resources/defaults/base-authority-person.xml | 5 +++-- .../resources/defaults/base-authority-place.xml | 7 ++++--- .../resources/defaults/base-authority-taxon.xml | 5 +++-- .../resources/defaults/base-authority-work.xml | 5 +++-- .../extensions/fineart-authority-concept.xml | 8 ++++---- .../anthro/anthro-authority-chronology.xml | 6 +++--- .../tenants/anthro/anthro-authority-concept.xml | 14 +++++++------- .../herbarium/herbarium-authority-concept.xml | 15 +++++++-------- .../materials/materials-authority-citation.xml | 4 ++-- .../materials/materials-authority-concept.xml | 6 +++--- .../materials/materials-authority-location.xml | 4 ++-- .../materials/materials-authority-material.xml | 4 ++-- .../materials-authority-organization.xml | 4 ++-- .../materials/materials-authority-person.xml | 4 ++-- .../materials/materials-authority-place.xml | 4 ++-- .../materials/materials-authority-work.xml | 4 ++-- .../publicart/publicart-authority-citation.xml | 4 ++-- .../publicart/publicart-authority-concept.xml | 6 +++--- .../publicart/publicart-authority-location.xml | 4 ++-- .../publicart-authority-organization.xml | 6 +++--- .../publicart/publicart-authority-person.xml | 6 +++--- .../publicart/publicart-authority-place.xml | 6 +++--- 30 files changed, 98 insertions(+), 81 deletions(-) diff --git a/cspi-installation/src/main/java/org/collectionspace/chain/installation/ServiceBindingsGeneration.java b/cspi-installation/src/main/java/org/collectionspace/chain/installation/ServiceBindingsGeneration.java index e8d94edf6..c5d53e2a1 100644 --- a/cspi-installation/src/main/java/org/collectionspace/chain/installation/ServiceBindingsGeneration.java +++ b/cspi-installation/src/main/java/org/collectionspace/chain/installation/ServiceBindingsGeneration.java @@ -716,7 +716,6 @@ private void doRefnameDisplayNameField(Record record, Element ele, Namespace thi * @param thisns * @param isAuthority */ - private void doDocHandlerParams(Record r, Element el, Namespace nsservices2, Boolean isAuthority) { // Element dhele = el.addElement(new QName("DocHandlerParams", nsservices2)); @@ -902,6 +901,7 @@ private void addAuthorities(Record r, Element el, String serviceBindingVersion) bindingsForAuthority.addAttribute("id", r.getServicesTenantAuthPl()); bindingsForAuthority.addAttribute("type", RECORD_TYPE_UTILITY); bindingsForAuthority.addAttribute("version", serviceBindingVersion); + bindingsForAuthority.addAttribute("displayName", r.getServicesTenantAuthDisplayName()); bindingsForAuthority.addAttribute(Record.SUPPORTS_REPLICATING, Boolean.toString(r.supportsReplicating())); bindingsForAuthority.addAttribute(Record.REQUIRES_UNIQUE_SHORTID, Boolean.TRUE.toString()); String remoteClientConfigName = r.getRemoteClientConfigName(); @@ -952,7 +952,7 @@ private void addServiceBinding(Record r, Element el, Namespace nameSpace, Boolea doDocHandlerParams(r, el, this.nsservices, isAuthority); // - if (isAuthority == true || r.isType(RECORD_TYPE_VOCABULARY) == true) { + if (isAuthority || r.isType(RECORD_TYPE_VOCABULARY)) { doAuthorityInstanceList(r, el, this.nsservices); } diff --git a/cspi-schema/src/main/java/org/collectionspace/chain/csp/schema/Record.java b/cspi-schema/src/main/java/org/collectionspace/chain/csp/schema/Record.java index 1f91c87cd..1c9442336 100644 --- a/cspi-schema/src/main/java/org/collectionspace/chain/csp/schema/Record.java +++ b/cspi-schema/src/main/java/org/collectionspace/chain/csp/schema/Record.java @@ -38,6 +38,8 @@ public class Record implements FieldParent { private static final String TYPE_AUTHORITY = "Authority"; private static final String TYPE_AUTHORITY_LOWERCASE = TYPE_AUTHORITY.toLowerCase(); + public static final String AUTH_DISPLAY_NAME = "services-tenant-auth-display-name"; + public static final String ELASTICSEARCH_INDEXED = "elasticsearchIndexed"; public static final String SUPPORTS_LOCKING = "supportslocking"; public static final String SUPPORTS_REPLICATING = "supportsReplicating"; @@ -257,6 +259,7 @@ public void setLastAuthorityProxy(Record lastAuthoriyProxy) { utils.initStrings(section, "services-tenant-plural", utils.getString("services-tenant-singular") + "s"); utils.initStrings(section, "services-tenant-auth-singular", utils.getString("services-url")); utils.initStrings(section, "services-tenant-auth-plural", utils.getString("services-tenant-singular") + "s"); + utils.initStrings(section, AUTH_DISPLAY_NAME, utils.getString("services-tenant-singular")); utils.initStrings(section, "services-schema-location", "http://services.collectionspace.org"); @@ -827,6 +830,10 @@ public String getServicesTenantAuthSg() { return utils.getString("services-tenant-auth-singular"); } + public String getServicesTenantAuthDisplayName() { + return utils.getString(AUTH_DISPLAY_NAME); + } + /* * By convention, the value from getServicesTenantSg() is the Nuxeo doctype * name. However, if the record explicitly declares a doctype using the @@ -1442,4 +1449,5 @@ public void setSortKey(String fieldId, String sortFieldId) { public String getSortKey(String fieldId) { return sortKeys.get(fieldId); } + } diff --git a/tomcat-main/src/main/resources/defaults/base-authority-chronology.xml b/tomcat-main/src/main/resources/defaults/base-authority-chronology.xml index ee1d0f958..cfce76685 100644 --- a/tomcat-main/src/main/resources/defaults/base-authority-chronology.xml +++ b/tomcat-main/src/main/resources/defaults/base-authority-chronology.xml @@ -4,6 +4,7 @@ Chronologyauthorities Chronologyauthority + Chronology Chronology Chronologies @@ -31,12 +32,12 @@ era era - Era Chronologies + Era event event - Event Chronologies + Event @@ -91,4 +92,4 @@
- \ No newline at end of file + diff --git a/tomcat-main/src/main/resources/defaults/base-authority-citation.xml b/tomcat-main/src/main/resources/defaults/base-authority-citation.xml index e9f61f71f..cc6e54295 100644 --- a/tomcat-main/src/main/resources/defaults/base-authority-citation.xml +++ b/tomcat-main/src/main/resources/defaults/base-authority-citation.xml @@ -5,6 +5,7 @@ Citationauthority Citationauthorities + Citation Citation citationauthorities_common:http://collectionspace.org/services/citation,abstract-common-list/list-item @@ -30,12 +31,12 @@ citation citation - Local Citations + Local worldcat worldcat - WorldCat Citations + WorldCat diff --git a/tomcat-main/src/main/resources/defaults/base-authority-concept.xml b/tomcat-main/src/main/resources/defaults/base-authority-concept.xml index 9dcd42f57..49faf00d1 100644 --- a/tomcat-main/src/main/resources/defaults/base-authority-concept.xml +++ b/tomcat-main/src/main/resources/defaults/base-authority-concept.xml @@ -4,6 +4,7 @@ Conceptauthority Conceptauthorities + Concept Concept Conceptitem @@ -33,17 +34,17 @@ concept concept - Associated Concepts + Associated material_ca material_ca - Material Concepts + Material activity activity - Activity Concepts + Activity nomenclature @@ -65,18 +66,18 @@ occasion occasion - Occasion Concepts + Occasion ethculture ethculture - Ethnographic Cultures + Cultural Group archculture archculture - Archaeological Cultures + Archaeological Culture diff --git a/tomcat-main/src/main/resources/defaults/base-authority-location.xml b/tomcat-main/src/main/resources/defaults/base-authority-location.xml index 57aace77d..29b839227 100644 --- a/tomcat-main/src/main/resources/defaults/base-authority-location.xml +++ b/tomcat-main/src/main/resources/defaults/base-authority-location.xml @@ -4,6 +4,7 @@ Locationauthority Locationauthorities + Storage Location Location Locationitem @@ -30,12 +31,12 @@ location location - Local Storage Locations + Local offsite_sla offsite_sla - Offsite Storage Locations + Offsite diff --git a/tomcat-main/src/main/resources/defaults/base-authority-material.xml b/tomcat-main/src/main/resources/defaults/base-authority-material.xml index 3e546d973..790efdb96 100644 --- a/tomcat-main/src/main/resources/defaults/base-authority-material.xml +++ b/tomcat-main/src/main/resources/defaults/base-authority-material.xml @@ -4,6 +4,7 @@ Materialauthority Materialauthorities + Material Material Materialitem diff --git a/tomcat-main/src/main/resources/defaults/base-authority-organization.xml b/tomcat-main/src/main/resources/defaults/base-authority-organization.xml index d1944f447..de2701156 100644 --- a/tomcat-main/src/main/resources/defaults/base-authority-organization.xml +++ b/tomcat-main/src/main/resources/defaults/base-authority-organization.xml @@ -4,6 +4,7 @@ Orgauthorities Orgauthority + Organization Organization orgauthorities_common:http://collectionspace.org/services/organization,abstract-common-list/list-item @@ -31,12 +32,12 @@ organization organization - Local Organizations + Local ulan_oa ulan_oa - ULAN Organizations + ULAN diff --git a/tomcat-main/src/main/resources/defaults/base-authority-person.xml b/tomcat-main/src/main/resources/defaults/base-authority-person.xml index 4a8d050b3..1b375e8ed 100644 --- a/tomcat-main/src/main/resources/defaults/base-authority-person.xml +++ b/tomcat-main/src/main/resources/defaults/base-authority-person.xml @@ -4,6 +4,7 @@ Personauthority Personauthorities + Person Person personauthorities_common:http://collectionspace.org/services/person,abstract-common-list/list-item @@ -32,12 +33,12 @@ person person - Local Persons + Local ulan_pa ulan_pa - ULAN Persons + ULAN diff --git a/tomcat-main/src/main/resources/defaults/base-authority-place.xml b/tomcat-main/src/main/resources/defaults/base-authority-place.xml index ecf34ccaa..02d95b125 100644 --- a/tomcat-main/src/main/resources/defaults/base-authority-place.xml +++ b/tomcat-main/src/main/resources/defaults/base-authority-place.xml @@ -4,6 +4,7 @@ Placeauthority Placeauthorities + Place Place Placeitem @@ -33,17 +34,17 @@ place place - Local Places + Local tgn_place tgn_place - Thesaurus of Geographic Names + TGN archaeological archaeological - Archaeological Site + Archaeological diff --git a/tomcat-main/src/main/resources/defaults/base-authority-taxon.xml b/tomcat-main/src/main/resources/defaults/base-authority-taxon.xml index e428e1aee..85f2fe052 100644 --- a/tomcat-main/src/main/resources/defaults/base-authority-taxon.xml +++ b/tomcat-main/src/main/resources/defaults/base-authority-taxon.xml @@ -4,6 +4,7 @@ Taxonomyauthority Taxonomyauthority + Taxon Taxon Taxon @@ -31,12 +32,12 @@ taxon taxon - Local Taxa + Local common_ta common_ta - Common Taxa + Common diff --git a/tomcat-main/src/main/resources/defaults/base-authority-work.xml b/tomcat-main/src/main/resources/defaults/base-authority-work.xml index 44312fb70..2719f0a4b 100644 --- a/tomcat-main/src/main/resources/defaults/base-authority-work.xml +++ b/tomcat-main/src/main/resources/defaults/base-authority-work.xml @@ -7,6 +7,7 @@ Workauthority Workauthorities + Work Work Workitem @@ -33,12 +34,12 @@ work work - Local Works + Local cona_work cona_work - CONA Works + CONA diff --git a/tomcat-main/src/main/resources/defaults/extensions/fineart-authority-concept.xml b/tomcat-main/src/main/resources/defaults/extensions/fineart-authority-concept.xml index 86fdfa4ef..7cfa84fca 100644 --- a/tomcat-main/src/main/resources/defaults/extensions/fineart-authority-concept.xml +++ b/tomcat-main/src/main/resources/defaults/extensions/fineart-authority-concept.xml @@ -7,17 +7,17 @@ concept concept - Associated Concepts + Associated material_ca material_ca - Material Concepts + Material activity activity - Activity Concepts + Activity @@ -34,7 +34,7 @@ occasion occasion - Occasion Concepts + Occasion diff --git a/tomcat-main/src/main/resources/tenants/anthro/anthro-authority-chronology.xml b/tomcat-main/src/main/resources/tenants/anthro/anthro-authority-chronology.xml index 6f84c25dd..ea88d7f8d 100644 --- a/tomcat-main/src/main/resources/tenants/anthro/anthro-authority-chronology.xml +++ b/tomcat-main/src/main/resources/tenants/anthro/anthro-authority-chronology.xml @@ -3,17 +3,17 @@ era era - Era Chronologies + Era event event - Event Chronologies + Event field_collection field_collection - Field Collection Chronologies + Field Collection diff --git a/tomcat-main/src/main/resources/tenants/anthro/anthro-authority-concept.xml b/tomcat-main/src/main/resources/tenants/anthro/anthro-authority-concept.xml index 56a701005..d4f9e2ce0 100644 --- a/tomcat-main/src/main/resources/tenants/anthro/anthro-authority-concept.xml +++ b/tomcat-main/src/main/resources/tenants/anthro/anthro-authority-concept.xml @@ -3,17 +3,17 @@ concept concept - Associated Concepts + Associated material_ca material_ca - Material Concepts + Material activity activity - Activity Concepts + Activity nomenclature @@ -23,23 +23,23 @@ archculture archculture - Archaeological Cultures + Archaeological Culture ethculture ethculture - Ethnographic Cultures + Cultural Group ethfilecode ethfilecode - Ethnographic File Codes + Function occasion occasion - Occasion Concepts + Occasion diff --git a/tomcat-main/src/main/resources/tenants/herbarium/herbarium-authority-concept.xml b/tomcat-main/src/main/resources/tenants/herbarium/herbarium-authority-concept.xml index 6876e816e..5386341f5 100644 --- a/tomcat-main/src/main/resources/tenants/herbarium/herbarium-authority-concept.xml +++ b/tomcat-main/src/main/resources/tenants/herbarium/herbarium-authority-concept.xml @@ -1,20 +1,19 @@ - concept concept - Associated Concepts + Associated material_ca material_ca - Material Concepts + Material activity activity - Activity Concepts + Activity nomenclature @@ -25,7 +24,7 @@ materialclassification materialclassification - Material Classifications + Material Classification materialformtype @@ -36,13 +35,13 @@ occasion occasion - Occasion Concepts + Occasion - + labeltext labeltext - Label Text + Label diff --git a/tomcat-main/src/main/resources/tenants/materials/materials-authority-citation.xml b/tomcat-main/src/main/resources/tenants/materials/materials-authority-citation.xml index b0e39e9bb..ded6ad2ac 100644 --- a/tomcat-main/src/main/resources/tenants/materials/materials-authority-citation.xml +++ b/tomcat-main/src/main/resources/tenants/materials/materials-authority-citation.xml @@ -3,13 +3,13 @@ citation citation - Local Citations + Local false citation_shared citation_shared - Shared Citations + Shared false diff --git a/tomcat-main/src/main/resources/tenants/materials/materials-authority-concept.xml b/tomcat-main/src/main/resources/tenants/materials/materials-authority-concept.xml index 683b9057a..fca73e790 100644 --- a/tomcat-main/src/main/resources/tenants/materials/materials-authority-concept.xml +++ b/tomcat-main/src/main/resources/tenants/materials/materials-authority-concept.xml @@ -3,20 +3,20 @@ materialclassification materialclassification - Material Classifications + Material Classification false materialclassification_shared materialclassification_shared - Shared Material Classifications + Shared Material Classification false occasion occasion - Occasion Concepts + Occasion diff --git a/tomcat-main/src/main/resources/tenants/materials/materials-authority-location.xml b/tomcat-main/src/main/resources/tenants/materials/materials-authority-location.xml index 129af831a..b994334a8 100644 --- a/tomcat-main/src/main/resources/tenants/materials/materials-authority-location.xml +++ b/tomcat-main/src/main/resources/tenants/materials/materials-authority-location.xml @@ -3,13 +3,13 @@ location location - Local Storage Locations + Local false offsite_sla offsite_sla - Offsite Storage Locations + Offsite false diff --git a/tomcat-main/src/main/resources/tenants/materials/materials-authority-material.xml b/tomcat-main/src/main/resources/tenants/materials/materials-authority-material.xml index bba57c9a1..7a851d69d 100644 --- a/tomcat-main/src/main/resources/tenants/materials/materials-authority-material.xml +++ b/tomcat-main/src/main/resources/tenants/materials/materials-authority-material.xml @@ -5,13 +5,13 @@ material material - Local Materials + Local false material_shared material_shared - Shared Materials + Shared false diff --git a/tomcat-main/src/main/resources/tenants/materials/materials-authority-organization.xml b/tomcat-main/src/main/resources/tenants/materials/materials-authority-organization.xml index 4a6d0f172..b97984e54 100644 --- a/tomcat-main/src/main/resources/tenants/materials/materials-authority-organization.xml +++ b/tomcat-main/src/main/resources/tenants/materials/materials-authority-organization.xml @@ -3,13 +3,13 @@ organization organization - Local Organizations + Local false organization_shared organization_shared - Shared Organizations + Shared false diff --git a/tomcat-main/src/main/resources/tenants/materials/materials-authority-person.xml b/tomcat-main/src/main/resources/tenants/materials/materials-authority-person.xml index aff670f78..6c2306354 100644 --- a/tomcat-main/src/main/resources/tenants/materials/materials-authority-person.xml +++ b/tomcat-main/src/main/resources/tenants/materials/materials-authority-person.xml @@ -3,13 +3,13 @@ person person - Local Persons + Local false person_shared person_shared - Shared Persons + Shared diff --git a/tomcat-main/src/main/resources/tenants/materials/materials-authority-place.xml b/tomcat-main/src/main/resources/tenants/materials/materials-authority-place.xml index 8c43bf867..ce72a3590 100644 --- a/tomcat-main/src/main/resources/tenants/materials/materials-authority-place.xml +++ b/tomcat-main/src/main/resources/tenants/materials/materials-authority-place.xml @@ -3,13 +3,13 @@ place place - Local Places + Local false place_shared place_shared - Shared Places + Shared false diff --git a/tomcat-main/src/main/resources/tenants/materials/materials-authority-work.xml b/tomcat-main/src/main/resources/tenants/materials/materials-authority-work.xml index e7e1966c9..94f18816c 100644 --- a/tomcat-main/src/main/resources/tenants/materials/materials-authority-work.xml +++ b/tomcat-main/src/main/resources/tenants/materials/materials-authority-work.xml @@ -3,13 +3,13 @@ work work - Local Works + Local false work_shared work_shared - Shared Works + Shared false diff --git a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-citation.xml b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-citation.xml index f7a5eb85e..1953b0ff8 100644 --- a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-citation.xml +++ b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-citation.xml @@ -3,7 +3,7 @@ citation citation - Local Citations + Local @@ -11,7 +11,7 @@ worldcat worldcat - WorldCat Citations + WorldCat diff --git a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-concept.xml b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-concept.xml index bc866c569..d3cc6f606 100644 --- a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-concept.xml +++ b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-concept.xml @@ -7,12 +7,12 @@ concept concept - Associated Concepts + Associated material_ca material_ca - Material Concepts + Material @@ -232,7 +232,7 @@ worktype worktype - Work Types + Work Type diff --git a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-location.xml b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-location.xml index 360d80c35..b159bb62a 100644 --- a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-location.xml +++ b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-location.xml @@ -5,12 +5,12 @@ location location - Local Storage Locations + Local offsite_sla offsite_sla - Offsite Storage Locations + Offsite diff --git a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-organization.xml b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-organization.xml index fb78ca9f6..2ee56a23d 100644 --- a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-organization.xml +++ b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-organization.xml @@ -5,17 +5,17 @@ organization organization - Local Organizations + Local organization_shared organization_shared - Shared Organizations + Shared ulan_oa ulan_oa - ULAN Organizations + ULAN diff --git a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-person.xml b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-person.xml index 4105094b0..c9c44ce38 100644 --- a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-person.xml +++ b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-person.xml @@ -5,17 +5,17 @@ person person - Local Persons + Local ulan_pa ulan_pa - ULAN Persons + ULAN person_shared person_shared - Shared Persons + Shared diff --git a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-place.xml b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-place.xml index e4c0324a2..d2d754e58 100644 --- a/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-place.xml +++ b/tomcat-main/src/main/resources/tenants/publicart/publicart-authority-place.xml @@ -6,17 +6,17 @@ place place - Local Places + Local tgn_place tgn_place - Thesaurus of Geographic Names + TGN place_shared place_shared - Shared Places + Shared From 0f44f26644e9136c1922c218fab632fc7e04b224 Mon Sep 17 00:00:00 2001 From: Spiros Dimopulos Date: Wed, 10 Dec 2025 11:05:03 +0200 Subject: [PATCH 09/25] DRYD-1904: Object Record > Anthro > Add Material/technique description (#326) --- .../main/resources/tenants/anthro/anthro-collectionobject.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/tomcat-main/src/main/resources/tenants/anthro/anthro-collectionobject.xml b/tomcat-main/src/main/resources/tenants/anthro/anthro-collectionobject.xml index 7244532f9..fce618184 100644 --- a/tomcat-main/src/main/resources/tenants/anthro/anthro-collectionobject.xml +++ b/tomcat-main/src/main/resources/tenants/anthro/anthro-collectionobject.xml @@ -37,6 +37,7 @@ +
From d290c89273f223146188cac62e7251800ef7700a Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Thu, 11 Dec 2025 15:15:01 -0700 Subject: [PATCH 10/25] DRYD-1982: Add alt text to list response (#327) --- CHANGELOG.md | 8 ++++++++ .../src/main/resources/defaults/base-procedure-media.xml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a829f9269..e6d440833 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,13 @@ # CollectionSpace Application Changelog +## 8.3.0 + +## Procedures + +### Media + +* Add `mini="list"` to alt text + ## 8.2.0 ## Procedures diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-media.xml b/tomcat-main/src/main/resources/defaults/base-procedure-media.xml index aac0155d8..bbfc7e11b 100644 --- a/tomcat-main/src/main/resources/defaults/base-procedure-media.xml +++ b/tomcat-main/src/main/resources/defaults/base-procedure-media.xml @@ -55,7 +55,7 @@ - + From 030751f40f0f0e365ab3aa36561249af54d72891 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Wed, 17 Dec 2025 11:13:53 -0700 Subject: [PATCH 11/25] Terms/org types and annotation types (#329) --- CHANGELOG.md | 18 ++++++++++++++++-- .../defaults/base-instance-vocabularies.xml | 14 +++++--------- .../fcart-profile-instance-vocabularies.xml | 14 +++++--------- .../botgarden/base-instance-vocabularies.xml | 14 +++++--------- .../materials/base-instance-vocabularies.xml | 14 +++++--------- .../publicart/base-instance-vocabularies.xml | 12 +++--------- 6 files changed, 39 insertions(+), 47 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6d440833..a6a28a47e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,26 @@ ## 8.3.0 -## Procedures +### Procedures -### Media +#### Media * Add `mini="list"` to alt text +### Term Lists + +#### Annotation Type + +**All Profiles** + +* Update default terms to catalog note, legacy data note, and staff note + +#### Organization Types + +**Core, Bonsai, BotGarden, FCART, Herbarium, LHMC, Materials** + +* Add federally-recognized tribe and non-federally-recognized tribe to default terms + ## 8.2.0 ## Procedures diff --git a/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml b/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml index 60ae5bff7..9134c58ca 100644 --- a/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml +++ b/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml @@ -508,6 +508,8 @@ + + @@ -1326,15 +1328,9 @@ annotationtype Annotation Type - - - - - - - - - + + + diff --git a/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml b/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml index 59c1b6518..c53452b32 100644 --- a/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml +++ b/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml @@ -518,6 +518,8 @@ + + @@ -782,15 +784,9 @@ annotationtype Annotation Type - - - - - - - - - + + + diff --git a/tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml b/tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml index 89f3f968b..8057f60c7 100644 --- a/tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml +++ b/tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml @@ -509,6 +509,8 @@ + + - localhost - 25 - false - + ${CSPACE_SMTP_EMAIL_HOST_OPT} + ${CSPACE_SMTP_EMAIL_PORT_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT} + - - + ${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT} diff --git a/tomcat-main/src/main/resources/tenants/bonsai/settings.xml b/tomcat-main/src/main/resources/tenants/bonsai/settings.xml index f66d98740..8414ed8ef 100644 --- a/tomcat-main/src/main/resources/tenants/bonsai/settings.xml +++ b/tomcat-main/src/main/resources/tenants/bonsai/settings.xml @@ -36,13 +36,13 @@ - localhost - 25 - false - + ${CSPACE_SMTP_EMAIL_HOST_OPT} + ${CSPACE_SMTP_EMAIL_PORT_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT} + - - + ${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT} diff --git a/tomcat-main/src/main/resources/tenants/botgarden/settings.xml b/tomcat-main/src/main/resources/tenants/botgarden/settings.xml index c99477463..c3b678b88 100644 --- a/tomcat-main/src/main/resources/tenants/botgarden/settings.xml +++ b/tomcat-main/src/main/resources/tenants/botgarden/settings.xml @@ -36,13 +36,13 @@ - localhost - 25 - false - + ${CSPACE_SMTP_EMAIL_HOST_OPT} + ${CSPACE_SMTP_EMAIL_PORT_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT} + - - + ${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT} diff --git a/tomcat-main/src/main/resources/tenants/core/settings.xml b/tomcat-main/src/main/resources/tenants/core/settings.xml index e0b8aeee2..59e857491 100644 --- a/tomcat-main/src/main/resources/tenants/core/settings.xml +++ b/tomcat-main/src/main/resources/tenants/core/settings.xml @@ -27,13 +27,13 @@ - localhost - 25 - ${CSPACE_CORE_EMAIL_AUTH_DEBUG_OPT} - + ${CSPACE_SMTP_EMAIL_HOST_OPT} + ${CSPACE_SMTP_EMAIL_PORT_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT} + - ${CSPACE_CORE_EMAIL_AUTH_USERNAME_OPT} - ${CSPACE_CORE_EMAIL_AUTH_PASSWORD_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT} diff --git a/tomcat-main/src/main/resources/tenants/fcart/settings.xml b/tomcat-main/src/main/resources/tenants/fcart/settings.xml index c81a79148..9065af614 100644 --- a/tomcat-main/src/main/resources/tenants/fcart/settings.xml +++ b/tomcat-main/src/main/resources/tenants/fcart/settings.xml @@ -27,13 +27,13 @@ - localhost - 25 - false - + ${CSPACE_SMTP_EMAIL_HOST_OPT} + ${CSPACE_SMTP_EMAIL_PORT_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT} + - - + ${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT} diff --git a/tomcat-main/src/main/resources/tenants/herbarium/settings.xml b/tomcat-main/src/main/resources/tenants/herbarium/settings.xml index c8fc25387..f0cd40339 100644 --- a/tomcat-main/src/main/resources/tenants/herbarium/settings.xml +++ b/tomcat-main/src/main/resources/tenants/herbarium/settings.xml @@ -27,13 +27,13 @@ - localhost - 25 - false - + ${CSPACE_SMTP_EMAIL_HOST_OPT} + ${CSPACE_SMTP_EMAIL_PORT_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT} + - - + ${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT} diff --git a/tomcat-main/src/main/resources/tenants/lhmc/settings.xml b/tomcat-main/src/main/resources/tenants/lhmc/settings.xml index baca08ada..2bb6c73c6 100644 --- a/tomcat-main/src/main/resources/tenants/lhmc/settings.xml +++ b/tomcat-main/src/main/resources/tenants/lhmc/settings.xml @@ -27,13 +27,13 @@ - localhost - 25 - false - + ${CSPACE_SMTP_EMAIL_HOST_OPT} + ${CSPACE_SMTP_EMAIL_PORT_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT} + - - + ${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT} diff --git a/tomcat-main/src/main/resources/tenants/materials/settings.xml b/tomcat-main/src/main/resources/tenants/materials/settings.xml index 7d3d335fc..bf57f2f38 100644 --- a/tomcat-main/src/main/resources/tenants/materials/settings.xml +++ b/tomcat-main/src/main/resources/tenants/materials/settings.xml @@ -27,13 +27,13 @@ - localhost - 25 - false - + ${CSPACE_SMTP_EMAIL_HOST_OPT} + ${CSPACE_SMTP_EMAIL_PORT_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT} + - - + ${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT} diff --git a/tomcat-main/src/main/resources/tenants/publicart/settings.xml b/tomcat-main/src/main/resources/tenants/publicart/settings.xml index d7a557a72..098e18aae 100644 --- a/tomcat-main/src/main/resources/tenants/publicart/settings.xml +++ b/tomcat-main/src/main/resources/tenants/publicart/settings.xml @@ -27,13 +27,13 @@ - localhost - 25 - false - + ${CSPACE_SMTP_EMAIL_HOST_OPT} + ${CSPACE_SMTP_EMAIL_PORT_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT} + - - + ${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT} diff --git a/tomcat-main/src/main/resources/tenants/testsci/settings.xml b/tomcat-main/src/main/resources/tenants/testsci/settings.xml index bf51e0513..8d862ba8e 100644 --- a/tomcat-main/src/main/resources/tenants/testsci/settings.xml +++ b/tomcat-main/src/main/resources/tenants/testsci/settings.xml @@ -27,13 +27,13 @@ - localhost - 25 - false - + ${CSPACE_SMTP_EMAIL_HOST_OPT} + ${CSPACE_SMTP_EMAIL_PORT_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_DEBUG_OPT} + - - + ${CSPACE_SMTP_EMAIL_AUTH_USERNAME_OPT} + ${CSPACE_SMTP_EMAIL_AUTH_PASSWORD_OPT} From 7f36aa08f6213db3537d5e22885328db01b311f0 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Thu, 29 Jan 2026 10:24:02 -0700 Subject: [PATCH 14/25] Prepare 8.3.0-RC.1 (#331) --- CHANGELOG.md | 9 +++++++++ pom.xml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b60d67d2a..e48e54f28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,10 @@ ### Procedures +#### CollectionObject + +* **Anthro** Add material/technique description free text field + #### Media * Add `mini="list"` to alt text @@ -28,6 +32,11 @@ * Add federally-recognized tribe and non-federally-recognized tribe to default terms +### Misc + +* Added SMTP environment variables +* Added displayName to tenant binding output for authority records + ## 8.2.0 ## Procedures diff --git a/pom.xml b/pom.xml index c3e2d725f..0e2349a4e 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ Root - 8.3.0-SNAPSHOT + 8.3.0-RC.1 ${revision} ${basedir}/tmp csmake From c341d9a17b0c4d4b27a2bb896a945bd16ecd6d69 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Wed, 4 Feb 2026 14:09:08 -0700 Subject: [PATCH 15/25] DRYD-2019: Add controlled content place (#333) --- CHANGELOG.md | 1 + .../src/main/resources/defaults/base-collectionobject.xml | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e48e54f28..a7be59462 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ #### CollectionObject * **Anthro** Add material/technique description free text field +* Add repeating autocomplete field `controlledContentPlaces/controlledContentPlace` #### Media diff --git a/tomcat-main/src/main/resources/defaults/base-collectionobject.xml b/tomcat-main/src/main/resources/defaults/base-collectionobject.xml index d2646c9b1..76d210d6a 100644 --- a/tomcat-main/src/main/resources/defaults/base-collectionobject.xml +++ b/tomcat-main/src/main/resources/defaults/base-collectionobject.xml @@ -254,6 +254,9 @@ + + + From fa0ec4209db2c9aca049e3a47c57570357b459bd Mon Sep 17 00:00:00 2001 From: Spiros Dimopulos Date: Mon, 9 Feb 2026 10:59:22 +0200 Subject: [PATCH 16/25] DRYD-2008: Procedure > Acquisition > Create new Acquisition Description field (#334) --- CHANGELOG.md | 16 ++++++++++------ .../defaults/base-procedure-acquisition.xml | 1 + 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a7be59462..f7967ae15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,12 +10,16 @@ ### Procedures -#### CollectionObject +#### Acquisition + +* Add free text field `acquisitionDescription` + +### CollectionObject * **Anthro** Add material/technique description free text field * Add repeating autocomplete field `controlledContentPlaces/controlledContentPlace` -#### Media +### Media * Add `mini="list"` to alt text @@ -40,7 +44,7 @@ ## 8.2.0 -## Procedures +### Procedures ### CollectionObject @@ -62,12 +66,12 @@ * Add field `note` -## Profiles +### Profiles -### Anthro +#### Anthro * Remove `anthroOwnershipAccess` from `CollectionObject` -### FCART +#### FCART * Add `deaccessionreason` term list to fcart profile instance vocabularies diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml b/tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml index 8b3780eb7..e0e005e2b 100644 --- a/tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml +++ b/tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml @@ -50,6 +50,7 @@ + From d5bed42a200904da1288f085ee5c4b3ce52a1d77 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Wed, 11 Feb 2026 12:33:04 -0700 Subject: [PATCH 17/25] Multiple Procedures > Add Parties Involved Group (#335) * Add the parties involved group of fields to acquisition * Add the parties involved group of fields to deaccession --- .../main/resources/defaults/base-procedure-acquisition.xml | 5 +++++ .../main/resources/defaults/base-procedure-deaccession.xml | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml b/tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml index e0e005e2b..bc9f5c763 100644 --- a/tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml +++ b/tomcat-main/src/main/resources/defaults/base-procedure-acquisition.xml @@ -60,6 +60,11 @@ + + + + +
diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-deaccession.xml b/tomcat-main/src/main/resources/defaults/base-procedure-deaccession.xml index 461ab122f..1d815e82c 100644 --- a/tomcat-main/src/main/resources/defaults/base-procedure-deaccession.xml +++ b/tomcat-main/src/main/resources/defaults/base-procedure-deaccession.xml @@ -36,6 +36,12 @@ + + + + + +
From 514270cc43a4afb58d2187dd27664ac642a045e1 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Wed, 11 Feb 2026 12:48:40 -0700 Subject: [PATCH 18/25] Multiple Procedures > Update CHANGELOG for Parties Involved (#336) --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7967ae15..31718d827 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,11 @@ #### Acquisition * Add free text field `acquisitionDescription` +* Add parties involved group `partiesInvovledGroupList/partiesInvolvedGroup` + +#### Deaccession + +* Add parties involved group `partiesInvovledGroupList/partiesInvolvedGroup` ### CollectionObject From 2e2dc572765f44cc3197730c31cbaf9aa7b7a112 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Mon, 16 Feb 2026 13:59:31 -0700 Subject: [PATCH 19/25] DRYD-2028: Procedure > Consultation > Add consultation outcome (#337) --- CHANGELOG.md | 4 ++++ .../main/resources/defaults/base-procedure-consultation.xml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31718d827..a0aae7a35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,10 @@ * Add free text field `acquisitionDescription` * Add parties involved group `partiesInvovledGroupList/partiesInvolvedGroup` +#### Consultation + +* Add repeatable field `consultationOutcomes/consultationOutcome` + #### Deaccession * Add parties involved group `partiesInvovledGroupList/partiesInvolvedGroup` diff --git a/tomcat-main/src/main/resources/defaults/base-procedure-consultation.xml b/tomcat-main/src/main/resources/defaults/base-procedure-consultation.xml index d41e6f7b3..7d81d00f3 100644 --- a/tomcat-main/src/main/resources/defaults/base-procedure-consultation.xml +++ b/tomcat-main/src/main/resources/defaults/base-procedure-consultation.xml @@ -35,6 +35,10 @@ + + + + From ca38aa6b36f0c14802af85018e0599dadc784b05 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Thu, 19 Feb 2026 11:50:24 -0700 Subject: [PATCH 20/25] DRYD-1909: Term List > Update Inventory Status Terms (#338) --- CHANGELOG.md | 8 ++++- .../defaults/base-instance-vocabularies.xml | 27 ++--------------- .../fcart-profile-instance-vocabularies.xml | 29 +++---------------- .../botgarden/base-instance-vocabularies.xml | 27 ++--------------- .../materials/base-instance-vocabularies.xml | 27 ++--------------- 5 files changed, 20 insertions(+), 98 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0aae7a35..224f49d28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -40,9 +40,15 @@ * Update default terms to catalog note, legacy data note, and staff note +#### Inventory Status + +**Core, Anthro, Bonsai, BotGarden, FCART, Herbarium, LHMC, Materials** + +* Update default terms to deaccessions, in storage, missing, off site, on loan, and on display + #### Organization Types -**Core, Bonsai, BotGarden, FCART, Herbarium, LHMC, Materials** +**Core, Anthro, Bonsai, BotGarden, FCART, Herbarium, LHMC, Materials** * Add federally-recognized tribe and non-federally-recognized tribe to default terms diff --git a/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml b/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml index 9134c58ca..e60a3eacf 100644 --- a/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml +++ b/tomcat-main/src/main/resources/defaults/base-instance-vocabularies.xml @@ -5,33 +5,12 @@ inventorystatus Inventory Status - - - - - - - - - + - - - - - - + - - - - - - - - - + diff --git a/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml b/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml index c53452b32..6a8b86d22 100644 --- a/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml +++ b/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml @@ -5,33 +5,12 @@ inventorystatus Inventory Status - - - - - - - - - + - - - - - - + - - - - - - - - - + @@ -58,7 +37,7 @@ - + uocuserroles uocuserroles Use of Collections User Roles diff --git a/tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml b/tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml index 8057f60c7..da39233ef 100644 --- a/tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml +++ b/tomcat-main/src/main/resources/tenants/botgarden/base-instance-vocabularies.xml @@ -7,33 +7,12 @@ inventorystatus Inventory Status - - - - - - - - - + - - - - - - + - - - - - - - - - + diff --git a/tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml b/tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml index 32d675682..c46ddbd35 100644 --- a/tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml +++ b/tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml @@ -7,33 +7,12 @@ inventorystatus Inventory Status - - - - - - - - - + - - - - - - + - - - - - - - - - + From 0e7b72c56e507f09f28212cc43ed5c3bb6e9f767 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Tue, 24 Feb 2026 11:10:24 -0700 Subject: [PATCH 21/25] DRYD-2009: Add NAGPRA Involved Role terms to FCART (#339) --- CHANGELOG.md | 6 ++++++ .../fcart-profile-instance-vocabularies.xml | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 224f49d28..b39f698d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,12 @@ * Update default terms to deaccessions, in storage, missing, off site, on loan, and on display +#### NAGPRA Involved Role + +**FCART** + +* Added existing default terms to profile + #### Organization Types **Core, Anthro, Bonsai, BotGarden, FCART, Herbarium, LHMC, Materials** diff --git a/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml b/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml index 6a8b86d22..594aa7ff6 100644 --- a/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml +++ b/tomcat-main/src/main/resources/defaults/extensions/fcart-profile-instance-vocabularies.xml @@ -1550,4 +1550,15 @@ + + nagprainvolvedrole + nagprainvolvedrole + NAGPRA Involved Role + + + + + + + From 52f18fc7c0a7455dac99b9b6c03901b2f481d9bd Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Tue, 24 Feb 2026 13:37:04 -0700 Subject: [PATCH 22/25] Release Prepare 8.3.0-RC.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0e2349a4e..06d5885d4 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ Root - 8.3.0-RC.1 + 8.3.0-RC.2 ${revision} ${basedir}/tmp csmake From 4d03276acf06a808cb7a50f57c58e96c4ea8fd25 Mon Sep 17 00:00:00 2001 From: Michael Ritter Date: Mon, 2 Mar 2026 10:12:22 -0700 Subject: [PATCH 23/25] DRYD-2043: Add nagprainvolvedrole to materials and publicart (#342) --- CHANGELOG.md | 2 +- .../tenants/materials/base-instance-vocabularies.xml | 11 +++++++++++ .../tenants/publicart/base-instance-vocabularies.xml | 11 +++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b39f698d3..151573f9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -48,7 +48,7 @@ #### NAGPRA Involved Role -**FCART** +**FCART, Materials, PublicArt** * Added existing default terms to profile diff --git a/tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml b/tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml index c46ddbd35..4fd77234a 100644 --- a/tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml +++ b/tomcat-main/src/main/resources/tenants/materials/base-instance-vocabularies.xml @@ -1492,4 +1492,15 @@ + + nagprainvolvedrole + nagprainvolvedrole + NAGPRA Involved Role + + + + + + + diff --git a/tomcat-main/src/main/resources/tenants/publicart/base-instance-vocabularies.xml b/tomcat-main/src/main/resources/tenants/publicart/base-instance-vocabularies.xml index 783cd8fa5..e42a43ad4 100644 --- a/tomcat-main/src/main/resources/tenants/publicart/base-instance-vocabularies.xml +++ b/tomcat-main/src/main/resources/tenants/publicart/base-instance-vocabularies.xml @@ -2107,4 +2107,15 @@ + + nagprainvolvedrole + nagprainvolvedrole + NAGPRA Involved Role + + + + + + + From 8b24e12ad3e6c1b3c73b31ac65f1dfbf7b30f973 Mon Sep 17 00:00:00 2001 From: Spiros Dimopulos Date: Fri, 6 Mar 2026 00:08:23 +0200 Subject: [PATCH 24/25] Prepare 8.3.0-RC.3 (#343) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 06d5885d4..516e2c307 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ Root - 8.3.0-RC.2 + 8.3.0-RC.3 ${revision} ${basedir}/tmp csmake From 35c7180049cdcbe7184ba09a8f3bade5f3397ccf Mon Sep 17 00:00:00 2001 From: Spiros Dimopulos Date: Thu, 19 Mar 2026 11:09:57 +0200 Subject: [PATCH 25/25] Release 8.3.0 (#346) Co-authored-by: Michael Ritter --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 516e2c307..21cc16b55 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ Root - 8.3.0-RC.3 + 8.3.0 ${revision} ${basedir}/tmp csmake