From 448071b953aec5f01e67b908279a4e70c9260ab7 Mon Sep 17 00:00:00 2001 From: Francois Prunayre Date: Fri, 14 Jun 2024 08:53:30 +0200 Subject: [PATCH] Update version to 4.4.6-SNAPSHOT --- cachingxslt/pom.xml | 2 +- common/pom.xml | 2 +- core/pom.xml | 2 +- csw-server/pom.xml | 2 +- datastorages/cmis/pom.xml | 2 +- datastorages/jcloud/pom.xml | 2 +- datastorages/pom.xml | 2 +- datastorages/s3/pom.xml | 2 +- docs/manual/pom.xml | 2 +- docs/pom.xml | 2 +- doi/pom.xml | 2 +- domain/pom.xml | 2 +- es/es-dashboards/pom.xml | 2 +- es/pom.xml | 2 +- estest/pom.xml | 2 +- events/pom.xml | 2 +- harvesters/pom.xml | 2 +- healthmonitor/pom.xml | 2 +- index/pom.xml | 2 +- inspire-atom/pom.xml | 2 +- jmeter/pom.xml | 2 +- listeners/pom.xml | 2 +- messaging/pom.xml | 2 +- oaipmh/pom.xml | 2 +- pom.xml | 2 +- release/build.properties | 6 +++--- release/pom.xml | 2 +- schemas-test/pom.xml | 2 +- schemas/csw-record/pom.xml | 2 +- schemas/dublin-core/pom.xml | 2 +- schemas/iso19110/pom.xml | 2 +- schemas/iso19115-3.2018/pom.xml | 2 +- schemas/iso19139/pom.xml | 2 +- schemas/pom.xml | 2 +- schemas/schema-core/pom.xml | 2 +- sde/pom.xml | 2 +- services/pom.xml | 2 +- slave/pom.xml | 2 +- translationproviders/pom.xml | 2 +- web-ui/pom.xml | 2 +- web/pom.xml | 2 +- .../webResources/WEB-INF/config-db/database_migration.xml | 5 +++++ .../WEB-INF/classes/setup/sql/data/data-db-default.sql | 4 ++-- .../classes/setup/sql/migrate/v446/migrate-default.sql | 2 ++ workers/camelPeriodicProducer/pom.xml | 2 +- workers/pom.xml | 2 +- workers/wfsfeature-harvester/pom.xml | 2 +- wro4j/pom.xml | 2 +- 48 files changed, 56 insertions(+), 49 deletions(-) create mode 100644 web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v446/migrate-default.sql diff --git a/cachingxslt/pom.xml b/cachingxslt/pom.xml index c0e9fa8e403..5e961842496 100644 --- a/cachingxslt/pom.xml +++ b/cachingxslt/pom.xml @@ -31,7 +31,7 @@ org.geonetwork-opensource geonetwork - 4.4.5-0 + 4.4.6-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 908f296d248..631e5df8dad 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -31,7 +31,7 @@ org.geonetwork-opensource geonetwork - 4.4.5-0 + 4.4.6-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 54cfad966df..eb7fe716b4e 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/csw-server/pom.xml b/csw-server/pom.xml index f13457dc665..4f625facbe7 100644 --- a/csw-server/pom.xml +++ b/csw-server/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/datastorages/cmis/pom.xml b/datastorages/cmis/pom.xml index efb9daed3d0..18533eb6b72 100644 --- a/datastorages/cmis/pom.xml +++ b/datastorages/cmis/pom.xml @@ -28,7 +28,7 @@ gn-datastorages org.geonetwork-opensource.datastorage - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/datastorages/jcloud/pom.xml b/datastorages/jcloud/pom.xml index 7e5a64d6f74..a7eceb5abb3 100644 --- a/datastorages/jcloud/pom.xml +++ b/datastorages/jcloud/pom.xml @@ -28,7 +28,7 @@ gn-datastorages org.geonetwork-opensource.datastorage - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/datastorages/pom.xml b/datastorages/pom.xml index 8aa2323bc68..642dc24f9e6 100644 --- a/datastorages/pom.xml +++ b/datastorages/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/datastorages/s3/pom.xml b/datastorages/s3/pom.xml index 523848000e3..861af49bf91 100644 --- a/datastorages/s3/pom.xml +++ b/datastorages/s3/pom.xml @@ -28,7 +28,7 @@ gn-datastorages org.geonetwork-opensource.datastorage - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/docs/manual/pom.xml b/docs/manual/pom.xml index eca363c3a73..4ac33875de1 100644 --- a/docs/manual/pom.xml +++ b/docs/manual/pom.xml @@ -27,7 +27,7 @@ gn-docs org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 gn-guide diff --git a/docs/pom.xml b/docs/pom.xml index b343acc92ed..6330049c7b0 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 gn-docs diff --git a/doi/pom.xml b/doi/pom.xml index d4f92bc161c..8f087e09ce3 100644 --- a/doi/pom.xml +++ b/doi/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/domain/pom.xml b/domain/pom.xml index 08d63af53cb..812778871e8 100644 --- a/domain/pom.xml +++ b/domain/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/es/es-dashboards/pom.xml b/es/es-dashboards/pom.xml index c6eab0ff2e2..81ab69fcab1 100644 --- a/es/es-dashboards/pom.xml +++ b/es/es-dashboards/pom.xml @@ -27,7 +27,7 @@ gn-es org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT diff --git a/es/pom.xml b/es/pom.xml index 806bf3ba9bb..77d91442f84 100644 --- a/es/pom.xml +++ b/es/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 gn-es diff --git a/estest/pom.xml b/estest/pom.xml index 51053fa458c..e1285a801bd 100644 --- a/estest/pom.xml +++ b/estest/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/events/pom.xml b/events/pom.xml index f8d8b0c7c3b..332f074acbb 100644 --- a/events/pom.xml +++ b/events/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT GeoNetwork Events diff --git a/harvesters/pom.xml b/harvesters/pom.xml index acf5fb32e46..ad15ba83add 100644 --- a/harvesters/pom.xml +++ b/harvesters/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/healthmonitor/pom.xml b/healthmonitor/pom.xml index bb2ebe784cb..adcc4d6f283 100644 --- a/healthmonitor/pom.xml +++ b/healthmonitor/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/index/pom.xml b/index/pom.xml index 26886949b05..8aa023929ec 100644 --- a/index/pom.xml +++ b/index/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 gn-index diff --git a/inspire-atom/pom.xml b/inspire-atom/pom.xml index 8e61552d8d8..effbea67089 100644 --- a/inspire-atom/pom.xml +++ b/inspire-atom/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/jmeter/pom.xml b/jmeter/pom.xml index 9b8757bcd00..4d7e0c7f02c 100644 --- a/jmeter/pom.xml +++ b/jmeter/pom.xml @@ -29,7 +29,7 @@ org.geonetwork-opensource geonetwork - 4.4.5-0 + 4.4.6-SNAPSHOT diff --git a/listeners/pom.xml b/listeners/pom.xml index d045bfba00f..e60deaa21e4 100644 --- a/listeners/pom.xml +++ b/listeners/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT GeoNetwork Events diff --git a/messaging/pom.xml b/messaging/pom.xml index 4df5a157c0e..0bf61674795 100644 --- a/messaging/pom.xml +++ b/messaging/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/oaipmh/pom.xml b/oaipmh/pom.xml index c6d25a36394..dbe912e5e31 100644 --- a/oaipmh/pom.xml +++ b/oaipmh/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 4.4.5-0 + 4.4.6-SNAPSHOT diff --git a/pom.xml b/pom.xml index 80b7a9c30b0..412a4886e0a 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.geonetwork-opensource geonetwork pom - 4.4.5-0 + 4.4.6-SNAPSHOT GeoNetwork opensource GeoNetwork opensource is a standards based, Free and Open Source catalog application to manage spatially referenced diff --git a/release/build.properties b/release/build.properties index 718f91f8232..f77dcb0ce66 100644 --- a/release/build.properties +++ b/release/build.properties @@ -5,11 +5,11 @@ homepage=https://geonetwork-opensource.org supportEmail=geonetwork-users@lists.sourceforge.net # Application version properties -version=4.4.5 -subVersion=0 +version=4.4.6 +subVersion=SNAPSHOT # Java runtime properties javaVersion=11 javaDisplayVersion=11 -jreUrl=https://adoptium.net/en-GB/temurin/releases/?version=4.4.5 +jreUrl=https://adoptium.net/en-GB/temurin/releases/?version=4.4.6 jreName=AdoptOpenJDK diff --git a/release/pom.xml b/release/pom.xml index aa14681b92f..41e95a1b782 100644 --- a/release/pom.xml +++ b/release/pom.xml @@ -7,7 +7,7 @@ org.geonetwork-opensource geonetwork - 4.4.5-0 + 4.4.6-SNAPSHOT gn-release diff --git a/schemas-test/pom.xml b/schemas-test/pom.xml index adf14328a93..e6e2bbe4021 100644 --- a/schemas-test/pom.xml +++ b/schemas-test/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 jar diff --git a/schemas/csw-record/pom.xml b/schemas/csw-record/pom.xml index f81bed41ec0..c85af25a331 100644 --- a/schemas/csw-record/pom.xml +++ b/schemas/csw-record/pom.xml @@ -5,7 +5,7 @@ gn-schemas org.geonetwork-opensource.schemas - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 gn-schema-csw-record diff --git a/schemas/dublin-core/pom.xml b/schemas/dublin-core/pom.xml index ff2caf4ff6b..97e5ff2113f 100644 --- a/schemas/dublin-core/pom.xml +++ b/schemas/dublin-core/pom.xml @@ -5,7 +5,7 @@ gn-schemas org.geonetwork-opensource.schemas - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/schemas/iso19110/pom.xml b/schemas/iso19110/pom.xml index d32128c0777..296f4288703 100644 --- a/schemas/iso19110/pom.xml +++ b/schemas/iso19110/pom.xml @@ -28,7 +28,7 @@ gn-schemas org.geonetwork-opensource.schemas - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/schemas/iso19115-3.2018/pom.xml b/schemas/iso19115-3.2018/pom.xml index 0605c90c701..e4fd4167c18 100644 --- a/schemas/iso19115-3.2018/pom.xml +++ b/schemas/iso19115-3.2018/pom.xml @@ -6,7 +6,7 @@ gn-schemas org.geonetwork-opensource.schemas - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/schemas/iso19139/pom.xml b/schemas/iso19139/pom.xml index f8a37a6b0d3..1f0fb2404f1 100644 --- a/schemas/iso19139/pom.xml +++ b/schemas/iso19139/pom.xml @@ -5,7 +5,7 @@ gn-schemas org.geonetwork-opensource.schemas - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/schemas/pom.xml b/schemas/pom.xml index 9aee45fb4b4..a53759dfc16 100644 --- a/schemas/pom.xml +++ b/schemas/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/schemas/schema-core/pom.xml b/schemas/schema-core/pom.xml index 9c0ad7cd3e2..2404ad904d8 100644 --- a/schemas/schema-core/pom.xml +++ b/schemas/schema-core/pom.xml @@ -28,7 +28,7 @@ gn-schemas org.geonetwork-opensource.schemas - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/sde/pom.xml b/sde/pom.xml index b6a7647844a..4d0e33f5c8b 100644 --- a/sde/pom.xml +++ b/sde/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 4.4.5-0 + 4.4.6-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index c81cb28f395..048ab6d3f01 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/slave/pom.xml b/slave/pom.xml index c3ffab845bb..77e1821d4bd 100644 --- a/slave/pom.xml +++ b/slave/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT GeoNetwork Slave diff --git a/translationproviders/pom.xml b/translationproviders/pom.xml index 40eb8d14ceb..588219ee6d2 100644 --- a/translationproviders/pom.xml +++ b/translationproviders/pom.xml @@ -6,7 +6,7 @@ org.geonetwork-opensource geonetwork - 4.4.5-0 + 4.4.6-SNAPSHOT gn-translationproviders diff --git a/web-ui/pom.xml b/web-ui/pom.xml index bbb0666ac42..e01fc18a23c 100644 --- a/web-ui/pom.xml +++ b/web-ui/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 4.4.5-0 + 4.4.6-SNAPSHOT org.geonetwork-opensource diff --git a/web/pom.xml b/web/pom.xml index e505a94d3a2..960e20c0772 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 4.4.5-0 + 4.4.6-SNAPSHOT diff --git a/web/src/main/webResources/WEB-INF/config-db/database_migration.xml b/web/src/main/webResources/WEB-INF/config-db/database_migration.xml index 1e3fb2025e6..0352f3a4983 100644 --- a/web/src/main/webResources/WEB-INF/config-db/database_migration.xml +++ b/web/src/main/webResources/WEB-INF/config-db/database_migration.xml @@ -394,5 +394,10 @@ WEB-INF/classes/setup/sql/migrate/v445/migrate- + + + WEB-INF/classes/setup/sql/migrate/v446/migrate- + + 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 e4ccf39b0a5..5c9e89a1858 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 @@ -574,8 +574,8 @@ INSERT INTO Operations (id, name) VALUES (6,'featured'); INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/site/name', 'My GeoNetwork catalogue', 0, 110, 'n'); 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', '4.4.5', 0, 150, '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/platform/version', '4.4.6', 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/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/v446/migrate-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v446/migrate-default.sql new file mode 100644 index 00000000000..12551f10c8e --- /dev/null +++ b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v446/migrate-default.sql @@ -0,0 +1,2 @@ +UPDATE Settings SET value='4.4.6' WHERE name='system/platform/version'; +UPDATE Settings SET value='SNAPSHOT' WHERE name='system/platform/subVersion'; diff --git a/workers/camelPeriodicProducer/pom.xml b/workers/camelPeriodicProducer/pom.xml index b99135284a3..bd54adce64e 100644 --- a/workers/camelPeriodicProducer/pom.xml +++ b/workers/camelPeriodicProducer/pom.xml @@ -5,7 +5,7 @@ gn-workers org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/workers/pom.xml b/workers/pom.xml index c8b764b6973..25a212b2db4 100644 --- a/workers/pom.xml +++ b/workers/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/workers/wfsfeature-harvester/pom.xml b/workers/wfsfeature-harvester/pom.xml index b0eb3d63463..082e45fd487 100644 --- a/workers/wfsfeature-harvester/pom.xml +++ b/workers/wfsfeature-harvester/pom.xml @@ -28,7 +28,7 @@ gn-workers org.geonetwork-opensource - 4.4.5-0 + 4.4.6-SNAPSHOT 4.0.0 diff --git a/wro4j/pom.xml b/wro4j/pom.xml index 3cd6b077945..52833d91d41 100644 --- a/wro4j/pom.xml +++ b/wro4j/pom.xml @@ -7,7 +7,7 @@ org.geonetwork-opensource geonetwork - 4.4.5-0 + 4.4.6-SNAPSHOT