diff --git a/cachingxslt/pom.xml b/cachingxslt/pom.xml index 8dc41c49359..897ff970754 100644 --- a/cachingxslt/pom.xml +++ b/cachingxslt/pom.xml @@ -31,7 +31,7 @@ org.geonetwork-opensource geonetwork - 4.4.6-0 + 4.4.7-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 97b4980ca06..2c2e9083ba9 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -31,7 +31,7 @@ org.geonetwork-opensource geonetwork - 4.4.6-0 + 4.4.7-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 68663f8dcda..7b724db211c 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/csw-server/pom.xml b/csw-server/pom.xml index b53a3c3ac22..f6a27aadb3c 100644 --- a/csw-server/pom.xml +++ b/csw-server/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/datastorages/cmis/pom.xml b/datastorages/cmis/pom.xml index fe4f2d39e1f..dffd357d170 100644 --- a/datastorages/cmis/pom.xml +++ b/datastorages/cmis/pom.xml @@ -28,7 +28,7 @@ gn-datastorages org.geonetwork-opensource.datastorage - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/datastorages/jcloud/pom.xml b/datastorages/jcloud/pom.xml index 0c4b3736c30..b578e1177b5 100644 --- a/datastorages/jcloud/pom.xml +++ b/datastorages/jcloud/pom.xml @@ -28,7 +28,7 @@ gn-datastorages org.geonetwork-opensource.datastorage - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/datastorages/pom.xml b/datastorages/pom.xml index 00bb90f9fe0..3f2f009d2a4 100644 --- a/datastorages/pom.xml +++ b/datastorages/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/datastorages/s3/pom.xml b/datastorages/s3/pom.xml index baec1871812..7c348f271e2 100644 --- a/datastorages/s3/pom.xml +++ b/datastorages/s3/pom.xml @@ -28,7 +28,7 @@ gn-datastorages org.geonetwork-opensource.datastorage - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/docs/manual/pom.xml b/docs/manual/pom.xml index 07ce63cdd4c..a0d9a973a96 100644 --- a/docs/manual/pom.xml +++ b/docs/manual/pom.xml @@ -27,7 +27,7 @@ gn-docs org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 gn-guide diff --git a/docs/pom.xml b/docs/pom.xml index 49b2aab9ddb..0621811afc1 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 gn-docs diff --git a/doi/pom.xml b/doi/pom.xml index 7324bb66077..21348549305 100644 --- a/doi/pom.xml +++ b/doi/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/domain/pom.xml b/domain/pom.xml index c8a74fe702a..685c96638c2 100644 --- a/domain/pom.xml +++ b/domain/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/es/es-dashboards/pom.xml b/es/es-dashboards/pom.xml index 5542a13d38f..19ccbe6aefe 100644 --- a/es/es-dashboards/pom.xml +++ b/es/es-dashboards/pom.xml @@ -27,7 +27,7 @@ gn-es org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT diff --git a/es/pom.xml b/es/pom.xml index 6112f432dce..4397414592b 100644 --- a/es/pom.xml +++ b/es/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 gn-es diff --git a/estest/pom.xml b/estest/pom.xml index c652c0638b2..2c447fa74dd 100644 --- a/estest/pom.xml +++ b/estest/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/events/pom.xml b/events/pom.xml index ee6cc00b2ee..f1a335196a4 100644 --- a/events/pom.xml +++ b/events/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT GeoNetwork Events diff --git a/harvesters/pom.xml b/harvesters/pom.xml index 102c03d0fa6..7a69abe98fa 100644 --- a/harvesters/pom.xml +++ b/harvesters/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/healthmonitor/pom.xml b/healthmonitor/pom.xml index c1f39172a40..6f71092a00f 100644 --- a/healthmonitor/pom.xml +++ b/healthmonitor/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/index/pom.xml b/index/pom.xml index 26b956850ad..ec7d47af0ea 100644 --- a/index/pom.xml +++ b/index/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 gn-index diff --git a/inspire-atom/pom.xml b/inspire-atom/pom.xml index 57ea2c898c7..7d4bf0cf74f 100644 --- a/inspire-atom/pom.xml +++ b/inspire-atom/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/jmeter/pom.xml b/jmeter/pom.xml index 42346c7ed0d..f1906b9d728 100644 --- a/jmeter/pom.xml +++ b/jmeter/pom.xml @@ -29,7 +29,7 @@ org.geonetwork-opensource geonetwork - 4.4.6-0 + 4.4.7-SNAPSHOT diff --git a/listeners/pom.xml b/listeners/pom.xml index 94f7edbc7a8..082cf9bad29 100644 --- a/listeners/pom.xml +++ b/listeners/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT GeoNetwork Events diff --git a/messaging/pom.xml b/messaging/pom.xml index 6b116a55563..f9261e43932 100644 --- a/messaging/pom.xml +++ b/messaging/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/oaipmh/pom.xml b/oaipmh/pom.xml index c8152568527..9ebbe0674c9 100644 --- a/oaipmh/pom.xml +++ b/oaipmh/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 4.4.6-0 + 4.4.7-SNAPSHOT diff --git a/pom.xml b/pom.xml index 99add4b006a..4a790d9c1c0 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.geonetwork-opensource geonetwork pom - 4.4.6-0 + 4.4.7-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 16583ca779b..d730f4f0d03 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.6 -subVersion=0 +version=4.4.7 +subVersion=SNAPSHOT # Java runtime properties javaVersion=11 javaDisplayVersion=11 -jreUrl=https://adoptium.net/en-GB/temurin/releases/?version=4.4.6 +jreUrl=https://adoptium.net/en-GB/temurin/releases/?version=4.4.7 jreName=AdoptOpenJDK diff --git a/release/pom.xml b/release/pom.xml index ca09f8fa404..b63014f0f57 100644 --- a/release/pom.xml +++ b/release/pom.xml @@ -7,7 +7,7 @@ org.geonetwork-opensource geonetwork - 4.4.6-0 + 4.4.7-SNAPSHOT gn-release diff --git a/schemas-test/pom.xml b/schemas-test/pom.xml index 9b145639c0a..60a6f0c668c 100644 --- a/schemas-test/pom.xml +++ b/schemas-test/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 jar diff --git a/schemas/csw-record/pom.xml b/schemas/csw-record/pom.xml index b8868c7c3e0..ce6076582ee 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.6-0 + 4.4.7-SNAPSHOT 4.0.0 gn-schema-csw-record diff --git a/schemas/dublin-core/pom.xml b/schemas/dublin-core/pom.xml index 8349faa21e9..af227811303 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.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/schemas/iso19110/pom.xml b/schemas/iso19110/pom.xml index be93d6bce66..c9525e27ec3 100644 --- a/schemas/iso19110/pom.xml +++ b/schemas/iso19110/pom.xml @@ -28,7 +28,7 @@ gn-schemas org.geonetwork-opensource.schemas - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/schemas/iso19115-3.2018/pom.xml b/schemas/iso19115-3.2018/pom.xml index bc930a1455b..9ad98d3ba19 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.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/schemas/iso19139/pom.xml b/schemas/iso19139/pom.xml index 53bafa78567..303647a36c4 100644 --- a/schemas/iso19139/pom.xml +++ b/schemas/iso19139/pom.xml @@ -5,7 +5,7 @@ gn-schemas org.geonetwork-opensource.schemas - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/schemas/pom.xml b/schemas/pom.xml index 802cff783ba..72102569662 100644 --- a/schemas/pom.xml +++ b/schemas/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/schemas/schema-core/pom.xml b/schemas/schema-core/pom.xml index f8c34b57283..de7242be335 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.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/sde/pom.xml b/sde/pom.xml index 99c504d98ee..2b30169e4ef 100644 --- a/sde/pom.xml +++ b/sde/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 4.4.6-0 + 4.4.7-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index c8187aa5fd3..0c563cb2c8a 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/slave/pom.xml b/slave/pom.xml index 3cf5709d62a..be933f19224 100644 --- a/slave/pom.xml +++ b/slave/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT GeoNetwork Slave diff --git a/translationproviders/pom.xml b/translationproviders/pom.xml index 457438a3e1d..8064003ccc9 100644 --- a/translationproviders/pom.xml +++ b/translationproviders/pom.xml @@ -6,7 +6,7 @@ org.geonetwork-opensource geonetwork - 4.4.6-0 + 4.4.7-SNAPSHOT gn-translationproviders diff --git a/web-ui/pom.xml b/web-ui/pom.xml index a1c1a705eaf..7f07b81a5c8 100644 --- a/web-ui/pom.xml +++ b/web-ui/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 4.4.6-0 + 4.4.7-SNAPSHOT org.geonetwork-opensource diff --git a/web-ui/src/main/resources/catalog/components/search/mdview/partials/keywordBadges.html b/web-ui/src/main/resources/catalog/components/search/mdview/partials/keywordBadges.html index f27b4b445bf..0bd8c3e2e99 100644 --- a/web-ui/src/main/resources/catalog/components/search/mdview/partials/keywordBadges.html +++ b/web-ui/src/main/resources/catalog/components/search/mdview/partials/keywordBadges.html @@ -16,9 +16,7 @@ gn-popover-placement="bottom" class="pull-left" > - +
diff --git a/web/pom.xml b/web/pom.xml index feb7ee4c3cd..802d0f10586 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 4.4.6-0 + 4.4.7-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 38de48bb7c0..aa87fe9adcb 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 @@ -400,5 +400,10 @@ WEB-INF/classes/setup/sql/migrate/v446/migrate- + + + WEB-INF/classes/setup/sql/migrate/v447/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 8bb03368e89..3720a1cc46e 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.6', 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.7', 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/v447/migrate-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v447/migrate-default.sql new file mode 100644 index 00000000000..0a97404565b --- /dev/null +++ b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v447/migrate-default.sql @@ -0,0 +1,2 @@ +UPDATE Settings SET value='4.4.7' 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 44117377b4c..80eef98c055 100644 --- a/workers/camelPeriodicProducer/pom.xml +++ b/workers/camelPeriodicProducer/pom.xml @@ -5,7 +5,7 @@ gn-workers org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/workers/pom.xml b/workers/pom.xml index a08432ae2cd..83ebdb8853c 100644 --- a/workers/pom.xml +++ b/workers/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/workers/wfsfeature-harvester/pom.xml b/workers/wfsfeature-harvester/pom.xml index a867c6182ed..43c09a3151b 100644 --- a/workers/wfsfeature-harvester/pom.xml +++ b/workers/wfsfeature-harvester/pom.xml @@ -28,7 +28,7 @@ gn-workers org.geonetwork-opensource - 4.4.6-0 + 4.4.7-SNAPSHOT 4.0.0 diff --git a/wro4j/pom.xml b/wro4j/pom.xml index b31767f9ed9..9f7948c9ebf 100644 --- a/wro4j/pom.xml +++ b/wro4j/pom.xml @@ -7,7 +7,7 @@ org.geonetwork-opensource geonetwork - 4.4.6-0 + 4.4.7-SNAPSHOT