diff --git a/cachingxslt/pom.xml b/cachingxslt/pom.xml index 1732a816841..2648a22d0c7 100644 --- a/cachingxslt/pom.xml +++ b/cachingxslt/pom.xml @@ -31,7 +31,7 @@ org.geonetwork-opensource geonetwork - 3.12-SNAPSHOT + 3.12.10 diff --git a/common/pom.xml b/common/pom.xml index f9d084aca21..4053b6b806a 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -31,7 +31,7 @@ org.geonetwork-opensource geonetwork - 3.12-SNAPSHOT + 3.12.10 diff --git a/core/pom.xml b/core/pom.xml index 6ae1dc249f3..f8a85b499bc 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/csw-server/pom.xml b/csw-server/pom.xml index de77a8f343f..1903c1ad6ed 100644 --- a/csw-server/pom.xml +++ b/csw-server/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/docs/changes3.12.10-0.txt b/docs/changes3.12.10-0.txt new file mode 100644 index 00000000000..db053e4bb7c --- /dev/null +++ b/docs/changes3.12.10-0.txt @@ -0,0 +1,19 @@ +================================================================================ +=== +=== GeoNetwork 3.12.10: List of changes +=== +================================================================================ +- [BP] Metadata editor / fix disable link to parent button. (#7045) +- [BP] Update publish link so that it is disabled if the metadata has not been approved. (#7009) +- [BP] Metadata editor / Use created, modified, issued date from thesaurus when adding keywords (#6972) +- [BP] Fix admin setting error with duplicate id="metadata/workflow/draftWhenInGroup" (#6980) +- [BP] Metadata publication mail - support additional fields (#6906) +- [BP] Metadata file downloads report - fix check to retrieve user related information (#6971) +- [BP] Fix issue with initial db creation not having language list when @PostConstruct was called (#6870) +- [BP] Remove requirement for gmd:fileDescription so that thumbnail urls are transformed when migrating records +- [BP] Update the password min length check (#6953) +- [BP] Update validation report to include more information in the report. #6900 (#6902) +- Update Geotools to v24.7 (#6926) +- reload4j drop-in replacement for Log4J 1.2 API (#6896) +- Support withheld to filter out elements defined in the schema filters configurations in Lucene query output (#6897) +- [BP] Cmis performance enhancements (#6893) diff --git a/docs/manuals b/docs/manuals index 24000964a0e..00346c19cd1 160000 --- a/docs/manuals +++ b/docs/manuals @@ -1 +1 @@ -Subproject commit 24000964a0e9a7ae2e354f3dccdbf39155095a15 +Subproject commit 00346c19cd1f0d88aeaa64c69d3b319fdf486b23 diff --git a/docs/pom.xml b/docs/pom.xml index 6a1159755dd..62b72e0ba44 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 4.0.0 docs diff --git a/doi/pom.xml b/doi/pom.xml index 42a01ce01e8..49e4a132ca6 100644 --- a/doi/pom.xml +++ b/doi/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/domain/pom.xml b/domain/pom.xml index 33c6f8023c0..cc34c6b5ac2 100644 --- a/domain/pom.xml +++ b/domain/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/es/es-core/pom.xml b/es/es-core/pom.xml index b8c97b5c20f..d209eaac10e 100644 --- a/es/es-core/pom.xml +++ b/es/es-core/pom.xml @@ -5,7 +5,7 @@ es org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 4.0.0 es-core diff --git a/es/es-dashboards/pom.xml b/es/es-dashboards/pom.xml index 6c4c64de84d..fca06c9d5eb 100644 --- a/es/es-dashboards/pom.xml +++ b/es/es-dashboards/pom.xml @@ -28,7 +28,7 @@ es org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 diff --git a/es/pom.xml b/es/pom.xml index 251c3184c72..3af3b032d1f 100644 --- a/es/pom.xml +++ b/es/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 4.0.0 es diff --git a/events/pom.xml b/events/pom.xml index 556c18530c7..c9307a61243 100644 --- a/events/pom.xml +++ b/events/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 GeoNetwork Events diff --git a/harvesters/pom.xml b/harvesters/pom.xml index a06014ab524..0d3c34f0167 100644 --- a/harvesters/pom.xml +++ b/harvesters/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/healthmonitor/pom.xml b/healthmonitor/pom.xml index 9e8ef3db3ad..1a1c21ff176 100644 --- a/healthmonitor/pom.xml +++ b/healthmonitor/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/inspire-atom/pom.xml b/inspire-atom/pom.xml index dc8469b172f..1337319c050 100644 --- a/inspire-atom/pom.xml +++ b/inspire-atom/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/jmeter/pom.xml b/jmeter/pom.xml index c6c2bafd6e3..11bdd319626 100644 --- a/jmeter/pom.xml +++ b/jmeter/pom.xml @@ -29,7 +29,7 @@ org.geonetwork-opensource geonetwork - 3.12-SNAPSHOT + 3.12.10 diff --git a/listeners/pom.xml b/listeners/pom.xml index f1c1f9ea0e5..7b786be7dbc 100644 --- a/listeners/pom.xml +++ b/listeners/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 GeoNetwork Events diff --git a/messaging/pom.xml b/messaging/pom.xml index 31a70f70031..2779a9e7e97 100644 --- a/messaging/pom.xml +++ b/messaging/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/oaipmh/pom.xml b/oaipmh/pom.xml index 0029f330e92..ff360cbe077 100644 --- a/oaipmh/pom.xml +++ b/oaipmh/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 3.12-SNAPSHOT + 3.12.10 diff --git a/pom.xml b/pom.xml index d3e42a6cf17..68308473bbb 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.geonetwork-opensource geonetwork pom - 3.12-SNAPSHOT + 3.12.10 GeoNetwork opensource GeoNetwork opensource is a standards based, Free and diff --git a/release/build.properties b/release/build.properties index c09160753c9..d668baf7218 100644 --- a/release/build.properties +++ b/release/build.properties @@ -6,7 +6,7 @@ supportEmail=geonetwork-users@lists.sourceforge.net # Application version properties version=3.12.10 -subVersion=SNAPSHOT +subVersion=0 # Java runtime properties javaVersion=1.8.0 diff --git a/release/pom.xml b/release/pom.xml index 2e62f08c96e..6e772f40105 100644 --- a/release/pom.xml +++ b/release/pom.xml @@ -7,7 +7,7 @@ org.geonetwork-opensource geonetwork - 3.12-SNAPSHOT + 3.12.10 release diff --git a/schemas-test/pom.xml b/schemas-test/pom.xml index 270d38c5e4d..873a8c792a5 100644 --- a/schemas-test/pom.xml +++ b/schemas-test/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 4.0.0 jar diff --git a/schemas/csw-record/pom.xml b/schemas/csw-record/pom.xml index d170ae3c28c..f68d97d7518 100644 --- a/schemas/csw-record/pom.xml +++ b/schemas/csw-record/pom.xml @@ -5,7 +5,7 @@ schemas org.geonetwork-opensource.schemas - 3.12-SNAPSHOT + 3.12.10 4.0.0 schema-csw-record diff --git a/schemas/dublin-core/pom.xml b/schemas/dublin-core/pom.xml index fa410a1e84a..7d05d87ca46 100644 --- a/schemas/dublin-core/pom.xml +++ b/schemas/dublin-core/pom.xml @@ -5,7 +5,7 @@ schemas org.geonetwork-opensource.schemas - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/schemas/iso19110/pom.xml b/schemas/iso19110/pom.xml index 05e0025a545..6f8b5c7d485 100644 --- a/schemas/iso19110/pom.xml +++ b/schemas/iso19110/pom.xml @@ -28,7 +28,7 @@ schemas org.geonetwork-opensource.schemas - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/schemas/iso19115-3.2018/pom.xml b/schemas/iso19115-3.2018/pom.xml index 438a73008c4..e80f9916bfb 100644 --- a/schemas/iso19115-3.2018/pom.xml +++ b/schemas/iso19115-3.2018/pom.xml @@ -6,7 +6,7 @@ schemas org.geonetwork-opensource.schemas - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/schemas/iso19139/pom.xml b/schemas/iso19139/pom.xml index 85ab0fc8005..e0c9dbe5d16 100644 --- a/schemas/iso19139/pom.xml +++ b/schemas/iso19139/pom.xml @@ -5,7 +5,7 @@ schemas org.geonetwork-opensource.schemas - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/schemas/pom.xml b/schemas/pom.xml index d64838cd764..fa7676fb0fa 100644 --- a/schemas/pom.xml +++ b/schemas/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/schemas/schema-core/pom.xml b/schemas/schema-core/pom.xml index daa0a7a66ca..8ede922e5fd 100644 --- a/schemas/schema-core/pom.xml +++ b/schemas/schema-core/pom.xml @@ -28,7 +28,7 @@ schemas org.geonetwork-opensource.schemas - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/sde/pom.xml b/sde/pom.xml index 4d8dec0ad2d..6430ee6c3b2 100644 --- a/sde/pom.xml +++ b/sde/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 3.12-SNAPSHOT + 3.12.10 diff --git a/services/pom.xml b/services/pom.xml index 730f03887bd..dd25fe7a4a6 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/slave/pom.xml b/slave/pom.xml index 5bc3e45d1b7..87ad11152a2 100644 --- a/slave/pom.xml +++ b/slave/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 GeoNetwork Slave diff --git a/update-version.sh b/update-version.sh index 031156809b7..db460c9b77a 100755 --- a/update-version.sh +++ b/update-version.sh @@ -38,7 +38,7 @@ then fi -if [[ $1 =~ ^[0-9]+.[0-9]+.[0-9x]$ || $1 =~ ^[0-9]+.[0-9]+(-SNAPSHOT|-RC[0-2]|-[0-9]+)$ ]]; then +if [[ $1 =~ ^[0-9]+.[0-9]+.[0-9]+x?$ || $1 =~ ^[0-9]+.[0-9]+(-SNAPSHOT|-RC[0-2]|-[0-9]+)$ ]]; then echo else echo @@ -50,7 +50,7 @@ else exit fi -if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9x]$ || $2 =~ ^[0-9]+.[0-9]+(-SNAPSHOT|-RC[0-2]|-[0-9]+)$ ]]; then +if [[ $2 =~ ^[0-9]+.[0-9]+.[0-9]+x?$ || $2 =~ ^[0-9]+.[0-9]+(-SNAPSHOT|-RC[0-2]|-[0-9]+)$ ]]; then # Retrieve version and subversion if [[ $2 =~ ^[0-9]+.[0-9]+-.*$ ]]; then patch=${version##*.} diff --git a/web-ui/pom.xml b/web-ui/pom.xml index fb32561cb3f..716d98b48d8 100644 --- a/web-ui/pom.xml +++ b/web-ui/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 3.12-SNAPSHOT + 3.12.10 org.geonetwork-opensource diff --git a/web/pom.xml b/web/pom.xml index 19172bbd34d..43ef0ffc180 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 3.12-SNAPSHOT + 3.12.10 diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql index 8e51c801088..da1a0b8ccd3 100644 --- a/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql +++ b/web/src/main/webapp/WEB-INF/classes/setup/sql/data/data-db-default.sql @@ -575,7 +575,7 @@ INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/site/siteId', '', 0, 120, 'n'); INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/site/organization', 'My organization', 0, 130, 'n'); INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/platform/version', '3.12.10', 0, 150, 'n'); -INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/platform/subVersion', 'SNAPSHOT', 0, 160, 'n'); +INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/platform/subVersion', '0', 0, 160, 'n'); INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/site/svnUuid', '', 0, 170, 'y'); INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/server/host', 'localhost', 0, 210, 'n'); diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v31210/migrate-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v31210/migrate-default.sql index 8789fc27a3a..3970f383be8 100644 --- a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v31210/migrate-default.sql +++ b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v31210/migrate-default.sql @@ -1,2 +1,2 @@ UPDATE Settings SET value='3.12.10' WHERE name='system/platform/version'; -UPDATE Settings SET value='SNAPSHOT' WHERE name='system/platform/subVersion'; +UPDATE Settings SET value='0' WHERE name='system/platform/subVersion'; diff --git a/workers/pom.xml b/workers/pom.xml index f07650fcb8b..bc33db3a634 100644 --- a/workers/pom.xml +++ b/workers/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/workers/wfsfeature-harvester/pom.xml b/workers/wfsfeature-harvester/pom.xml index ef08d761e72..5dae5b43888 100644 --- a/workers/wfsfeature-harvester/pom.xml +++ b/workers/wfsfeature-harvester/pom.xml @@ -28,7 +28,7 @@ workers org.geonetwork-opensource - 3.12-SNAPSHOT + 3.12.10 4.0.0 diff --git a/wro4j/pom.xml b/wro4j/pom.xml index cdf14820399..12f465137bc 100644 --- a/wro4j/pom.xml +++ b/wro4j/pom.xml @@ -7,7 +7,7 @@ org.geonetwork-opensource geonetwork - 3.12-SNAPSHOT + 3.12.10