diff --git a/CHANGELOG.md b/CHANGELOG.md index 8833db28ec..2c63b78b78 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,7 @@ * Update notice of inventory completion report * Update notice of intent to repatriate report * Update full object with place details report -* Add contentPlaces to ES mapping +* Add contentPlaces, materialTechniqueDescription to ES mappings * Add blob alt text to media responses * Remove cspace_english namespace search diff --git a/build.properties b/build.properties index f622b3fe4f..c4d2a8b259 100644 --- a/build.properties +++ b/build.properties @@ -9,7 +9,7 @@ host=127.0.0.1 # # Release version info # -release.version=8.3.0-RC.1 +release.version=8.3.0-RC.2 cspace.release=${release.version} cspace.instance.id=${env.CSPACE_INSTANCE_ID} @@ -27,7 +27,7 @@ cspace.im.root= # UI settings cspace.ui.package.name=cspace-ui cspace.ui.library.name=cspaceUI -cspace.ui.version=10.2.0-rc1.0 +cspace.ui.version=10.2.0-rc2.0 cspace.ui.build.branch=develop cspace.ui.build.node.ver=20 service.ui.library.name=${cspace.ui.library.name}-service @@ -35,7 +35,7 @@ service.ui.library.name=${cspace.ui.library.name}-service # Public browser settings cspace.public.browser.package.name=@collectionspace/cspace-public-browser cspace.public.browser.library.name=cspacePublicBrowser -cspace.public.browser.version=3.5.0-rc1.0 +cspace.public.browser.version=3.5.0 cspace.public.browser.build.branch=main cspace.public.browser.build.node.ver=20 diff --git a/cspace-ui/anthro/build.properties b/cspace-ui/anthro/build.properties index 242e2b1b2e..6918948acf 100644 --- a/cspace-ui/anthro/build.properties +++ b/cspace-ui/anthro/build.properties @@ -3,7 +3,7 @@ tenant.ui.basename=/cspace/${tenant.shortname} tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-anthro tenant.ui.profile.plugin.library.name=cspaceUIPluginProfileAnthro -tenant.ui.profile.plugin.version=9.2.0-rc1.0 +tenant.ui.profile.plugin.version=9.2.0 tenant.ui.profile.plugin.build.branch=main # If not set, defaults to /gateway/${tenant.shortname} on the current host. diff --git a/cspace-ui/fcart/build.properties b/cspace-ui/fcart/build.properties index 0311496c2f..c8a03e3047 100644 --- a/cspace-ui/fcart/build.properties +++ b/cspace-ui/fcart/build.properties @@ -3,7 +3,7 @@ tenant.ui.basename=/cspace/${tenant.shortname} tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-fcart tenant.ui.profile.plugin.library.name=cspaceUIPluginProfileFCart -tenant.ui.profile.plugin.version=8.1.0 +tenant.ui.profile.plugin.version=8.2.0 tenant.ui.profile.plugin.build.branch=main # If not set, defaults to /gateway/${tenant.shortname} on the current host. diff --git a/cspace-ui/lhmc/build.properties b/cspace-ui/lhmc/build.properties index 45a7f0baac..8578173070 100644 --- a/cspace-ui/lhmc/build.properties +++ b/cspace-ui/lhmc/build.properties @@ -3,7 +3,7 @@ tenant.ui.basename=/cspace/${tenant.shortname} tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-lhmc tenant.ui.profile.plugin.library.name=cspaceUIPluginProfileLHMC -tenant.ui.profile.plugin.version=8.1.0 +tenant.ui.profile.plugin.version=8.2.0 tenant.ui.profile.plugin.build.branch=main # If not set, defaults to /gateway/${tenant.shortname} on the current host. diff --git a/cspace-ui/materials/build.properties b/cspace-ui/materials/build.properties index 3487aec958..99ee150440 100644 --- a/cspace-ui/materials/build.properties +++ b/cspace-ui/materials/build.properties @@ -3,7 +3,7 @@ tenant.ui.basename=/cspace/${tenant.shortname} tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-materials tenant.ui.profile.plugin.library.name=cspaceUIPluginProfileMaterials -tenant.ui.profile.plugin.version=4.0.1 +tenant.ui.profile.plugin.version=4.1.0 tenant.ui.profile.plugin.build.branch=main # If not set, defaults to /gateway/${tenant.shortname} on the current host. diff --git a/cspace-ui/publicart/build.properties b/cspace-ui/publicart/build.properties index ebe204ca63..22bf16f80b 100644 --- a/cspace-ui/publicart/build.properties +++ b/cspace-ui/publicart/build.properties @@ -3,7 +3,7 @@ tenant.ui.basename=/cspace/${tenant.shortname} tenant.ui.profile.plugin.package.name=cspace-ui-plugin-profile-publicart tenant.ui.profile.plugin.library.name=cspaceUIPluginProfilePublicArt -tenant.ui.profile.plugin.version=7.0.1 +tenant.ui.profile.plugin.version=7.1.0 tenant.ui.profile.plugin.build.branch=main # If not set, defaults to /gateway/${tenant.shortname} on the current host. diff --git a/pom.xml b/pom.xml index 6e7ed0f7b8..43a608f2ec 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ services - 8.3.0-RC.1 + 8.3.0-RC.2 UTF-8 ${revision} ${revision} diff --git a/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml b/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml index 0729f76811..5d2b1c2844 100644 --- a/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml +++ b/services/common/src/main/cspace/config/services/tenants/anthro/anthro-tenant-bindings.delta.xml @@ -85,6 +85,7 @@ "collectionobjects_common:techniqueGroupList", "collectionobjects_common:titleGroupList", "collectionobjects_common:viewersContributionNote", + "collectionobjects_anthro:materialTechniqueDescription", "collectionobjects_naturalhistory_extension:taxonomicIdentGroupList", "collectionspace_core:*", "collectionspace_denorm:*", diff --git a/services/report/3rdparty/jasper-cs-report/src/main/resources/full_obj_place.jrxml b/services/report/3rdparty/jasper-cs-report/src/main/resources/full_obj_place.jrxml index 6587a43cf6..e2a26b12f8 100644 --- a/services/report/3rdparty/jasper-cs-report/src/main/resources/full_obj_place.jrxml +++ b/services/report/3rdparty/jasper-cs-report/src/main/resources/full_obj_place.jrxml @@ -10,7 +10,7 @@