From 72b524c2377225f1b4a567069f7dee97d4523c79 Mon Sep 17 00:00:00 2001 From: Francois Prunayre Date: Thu, 14 Mar 2024 08:38:56 +0100 Subject: [PATCH] Update version to 4.4.4-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 +- 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/v444/migrate-default.sql | 2 ++ workers/camelPeriodicProducer/pom.xml | 2 +- workers/pom.xml | 2 +- workers/wfsfeature-harvester/pom.xml | 2 +- wro4j/pom.xml | 2 +- 47 files changed, 55 insertions(+), 48 deletions(-) create mode 100644 web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v444/migrate-default.sql diff --git a/cachingxslt/pom.xml b/cachingxslt/pom.xml index c8a874f1f40..2c7d55b23c1 100644 --- a/cachingxslt/pom.xml +++ b/cachingxslt/pom.xml @@ -31,7 +31,7 @@ org.geonetwork-opensource geonetwork - 4.4.3-0 + 4.4.4-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index edf2c51f2e2..275b1544a3b 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -31,7 +31,7 @@ org.geonetwork-opensource geonetwork - 4.4.3-0 + 4.4.4-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 1bf63749685..a3b490a3c17 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/csw-server/pom.xml b/csw-server/pom.xml index cc1f371c5b5..cd7b317b79d 100644 --- a/csw-server/pom.xml +++ b/csw-server/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/datastorages/cmis/pom.xml b/datastorages/cmis/pom.xml index 3b776509b7c..dd96c065dd8 100644 --- a/datastorages/cmis/pom.xml +++ b/datastorages/cmis/pom.xml @@ -28,7 +28,7 @@ gn-datastorages org.geonetwork-opensource.datastorage - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/datastorages/jcloud/pom.xml b/datastorages/jcloud/pom.xml index 4963ca7772c..7d2dc8caeee 100644 --- a/datastorages/jcloud/pom.xml +++ b/datastorages/jcloud/pom.xml @@ -28,7 +28,7 @@ gn-datastorages org.geonetwork-opensource.datastorage - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/datastorages/pom.xml b/datastorages/pom.xml index 0c31061a619..790fa36bffd 100644 --- a/datastorages/pom.xml +++ b/datastorages/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/datastorages/s3/pom.xml b/datastorages/s3/pom.xml index d9f0ed1caa9..f93af3fd4f9 100644 --- a/datastorages/s3/pom.xml +++ b/datastorages/s3/pom.xml @@ -28,7 +28,7 @@ gn-datastorages org.geonetwork-opensource.datastorage - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/docs/manual/pom.xml b/docs/manual/pom.xml index 0b625985424..ec2012561cc 100644 --- a/docs/manual/pom.xml +++ b/docs/manual/pom.xml @@ -27,7 +27,7 @@ gn-docs org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 gn-guide diff --git a/docs/pom.xml b/docs/pom.xml index 0d1f664efd5..41fadf135f2 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 gn-docs diff --git a/doi/pom.xml b/doi/pom.xml index 4df96bb0b73..b18b6e06c3f 100644 --- a/doi/pom.xml +++ b/doi/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/domain/pom.xml b/domain/pom.xml index fa6618403dc..f715db3010e 100644 --- a/domain/pom.xml +++ b/domain/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/es/es-dashboards/pom.xml b/es/es-dashboards/pom.xml index 24e32460629..fd86d42981d 100644 --- a/es/es-dashboards/pom.xml +++ b/es/es-dashboards/pom.xml @@ -28,7 +28,7 @@ gn-es org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT diff --git a/es/pom.xml b/es/pom.xml index 39341677445..d9338a9fc8f 100644 --- a/es/pom.xml +++ b/es/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 gn-es diff --git a/estest/pom.xml b/estest/pom.xml index e583bcd18a7..588ce309374 100644 --- a/estest/pom.xml +++ b/estest/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/events/pom.xml b/events/pom.xml index a4c1300439d..329dd0c6ad5 100644 --- a/events/pom.xml +++ b/events/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT GeoNetwork Events diff --git a/harvesters/pom.xml b/harvesters/pom.xml index 1c9c9a6f93c..07259922463 100644 --- a/harvesters/pom.xml +++ b/harvesters/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/healthmonitor/pom.xml b/healthmonitor/pom.xml index 8285db17cf7..fd58de76ef6 100644 --- a/healthmonitor/pom.xml +++ b/healthmonitor/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/index/pom.xml b/index/pom.xml index e6851122406..e4801d49c46 100644 --- a/index/pom.xml +++ b/index/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 gn-index diff --git a/inspire-atom/pom.xml b/inspire-atom/pom.xml index 623482583b3..09424fda0c8 100644 --- a/inspire-atom/pom.xml +++ b/inspire-atom/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/jmeter/pom.xml b/jmeter/pom.xml index 61fbf92124c..8e4d6b03860 100644 --- a/jmeter/pom.xml +++ b/jmeter/pom.xml @@ -29,7 +29,7 @@ org.geonetwork-opensource geonetwork - 4.4.3-0 + 4.4.4-SNAPSHOT diff --git a/listeners/pom.xml b/listeners/pom.xml index 40221100f28..ed51f29c582 100644 --- a/listeners/pom.xml +++ b/listeners/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT GeoNetwork Events diff --git a/messaging/pom.xml b/messaging/pom.xml index 2f1c75168b9..72f32b8bdba 100644 --- a/messaging/pom.xml +++ b/messaging/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/oaipmh/pom.xml b/oaipmh/pom.xml index 98e9f97cae1..0e0f1055cf3 100644 --- a/oaipmh/pom.xml +++ b/oaipmh/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 4.4.3-0 + 4.4.4-SNAPSHOT diff --git a/pom.xml b/pom.xml index 1f1c53ef86c..bf7a6932bbe 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.geonetwork-opensource geonetwork pom - 4.4.3-0 + 4.4.4-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 ab4a6da1df5..bf6bc74a749 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.3 -subVersion=0 +version=4.4.4 +subVersion=SNAPSHOT # Java runtime properties javaVersion=11 javaDisplayVersion=11 -jreUrl=https://adoptium.net/en-GB/temurin/releases/?version=4.4.3 +jreUrl=https://adoptium.net/en-GB/temurin/releases/?version=4.4.4 jreName=AdoptOpenJDK diff --git a/release/pom.xml b/release/pom.xml index 0033956e61b..44514cb837d 100644 --- a/release/pom.xml +++ b/release/pom.xml @@ -7,7 +7,7 @@ org.geonetwork-opensource geonetwork - 4.4.3-0 + 4.4.4-SNAPSHOT gn-release diff --git a/schemas-test/pom.xml b/schemas-test/pom.xml index c36908f66de..4a5030a5f39 100644 --- a/schemas-test/pom.xml +++ b/schemas-test/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 jar diff --git a/schemas/csw-record/pom.xml b/schemas/csw-record/pom.xml index 769097b6c6f..c687b740dab 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.3-0 + 4.4.4-SNAPSHOT 4.0.0 gn-schema-csw-record diff --git a/schemas/dublin-core/pom.xml b/schemas/dublin-core/pom.xml index 4a00be58654..2ef0f9b6309 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.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/schemas/iso19110/pom.xml b/schemas/iso19110/pom.xml index 72f5a53c847..f529f2f67dc 100644 --- a/schemas/iso19110/pom.xml +++ b/schemas/iso19110/pom.xml @@ -28,7 +28,7 @@ gn-schemas org.geonetwork-opensource.schemas - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/schemas/iso19115-3.2018/pom.xml b/schemas/iso19115-3.2018/pom.xml index ae4bdd8238f..2e047ce220e 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.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/schemas/iso19139/pom.xml b/schemas/iso19139/pom.xml index 1ca95b8a5a0..4d63ef8ffce 100644 --- a/schemas/iso19139/pom.xml +++ b/schemas/iso19139/pom.xml @@ -5,7 +5,7 @@ gn-schemas org.geonetwork-opensource.schemas - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/schemas/pom.xml b/schemas/pom.xml index b51eac723bb..9067bb95ee9 100644 --- a/schemas/pom.xml +++ b/schemas/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/schemas/schema-core/pom.xml b/schemas/schema-core/pom.xml index 2fd4a553fa1..560c937ac02 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.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/sde/pom.xml b/sde/pom.xml index 6e25d46f564..cfe299ba538 100644 --- a/sde/pom.xml +++ b/sde/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 4.4.3-0 + 4.4.4-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index a4fb98bc73a..14ed8bc753e 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/slave/pom.xml b/slave/pom.xml index c038372ef18..fcffaafd4fd 100644 --- a/slave/pom.xml +++ b/slave/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT GeoNetwork Slave diff --git a/web-ui/pom.xml b/web-ui/pom.xml index 399616173c2..c360922c8ac 100644 --- a/web-ui/pom.xml +++ b/web-ui/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 4.4.3-0 + 4.4.4-SNAPSHOT org.geonetwork-opensource diff --git a/web/pom.xml b/web/pom.xml index 0162a6b0485..b0faabb4375 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 4.4.3-0 + 4.4.4-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 e3b6e01cab7..0682f2eb5d8 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 @@ -384,5 +384,10 @@ WEB-INF/classes/setup/sql/migrate/v443/migrate- + + + WEB-INF/classes/setup/sql/migrate/v444/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 ab09029d435..4d09dae7ba7 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.3', 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.4', 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/v444/migrate-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v444/migrate-default.sql new file mode 100644 index 00000000000..8a49001716c --- /dev/null +++ b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v444/migrate-default.sql @@ -0,0 +1,2 @@ +UPDATE Settings SET value='4.4.4' 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 596a170feed..350861205e5 100644 --- a/workers/camelPeriodicProducer/pom.xml +++ b/workers/camelPeriodicProducer/pom.xml @@ -5,7 +5,7 @@ gn-workers org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/workers/pom.xml b/workers/pom.xml index 1ffd09a82e8..32bdaa6f7dc 100644 --- a/workers/pom.xml +++ b/workers/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/workers/wfsfeature-harvester/pom.xml b/workers/wfsfeature-harvester/pom.xml index 157faa1925d..820cb0a83fe 100644 --- a/workers/wfsfeature-harvester/pom.xml +++ b/workers/wfsfeature-harvester/pom.xml @@ -28,7 +28,7 @@ gn-workers org.geonetwork-opensource - 4.4.3-0 + 4.4.4-SNAPSHOT 4.0.0 diff --git a/wro4j/pom.xml b/wro4j/pom.xml index 41d22fbeac8..e4d029fa68d 100644 --- a/wro4j/pom.xml +++ b/wro4j/pom.xml @@ -7,7 +7,7 @@ org.geonetwork-opensource geonetwork - 4.4.3-0 + 4.4.4-SNAPSHOT