diff --git a/cachingxslt/pom.xml b/cachingxslt/pom.xml index 264e0f69ba7..863f6061841 100644 --- a/cachingxslt/pom.xml +++ b/cachingxslt/pom.xml @@ -31,7 +31,7 @@ org.geonetwork-opensource geonetwork - 3.8.1-0 + 3.8.2-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index 89a60b53eb8..17ae9b3d355 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -31,7 +31,7 @@ org.geonetwork-opensource geonetwork - 3.8.1-0 + 3.8.2-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 0f10086f4c8..c5ee892496f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 4.0.0 diff --git a/csw-server/pom.xml b/csw-server/pom.xml index e076b5d7e30..793d05f50ef 100644 --- a/csw-server/pom.xml +++ b/csw-server/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 4.0.0 diff --git a/docs/pom.xml b/docs/pom.xml index e53b55f252a..629699ac6df 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 4.0.0 docs diff --git a/doi/pom.xml b/doi/pom.xml index 0224f35600c..d8d87add0ef 100644 --- a/doi/pom.xml +++ b/doi/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 4.0.0 diff --git a/domain/pom.xml b/domain/pom.xml index 9116eecac17..9b355e0bdc3 100644 --- a/domain/pom.xml +++ b/domain/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 4.0.0 diff --git a/es/es-core/pom.xml b/es/es-core/pom.xml index 160e536a6b1..93c72fc7835 100644 --- a/es/es-core/pom.xml +++ b/es/es-core/pom.xml @@ -5,7 +5,7 @@ es org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 4.0.0 es-core diff --git a/es/es-dashboards/pom.xml b/es/es-dashboards/pom.xml index 93c6a1359c4..f6a279143a1 100644 --- a/es/es-dashboards/pom.xml +++ b/es/es-dashboards/pom.xml @@ -28,7 +28,7 @@ es org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT diff --git a/es/pom.xml b/es/pom.xml index edeb6d6920f..3dfb0eb4a88 100644 --- a/es/pom.xml +++ b/es/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 4.0.0 es diff --git a/events/pom.xml b/events/pom.xml index a99b67fac8d..8cd7248f664 100644 --- a/events/pom.xml +++ b/events/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT GeoNetwork Events diff --git a/harvesters/pom.xml b/harvesters/pom.xml index 7f13c39534e..2a6c56c220d 100644 --- a/harvesters/pom.xml +++ b/harvesters/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 4.0.0 diff --git a/healthmonitor/pom.xml b/healthmonitor/pom.xml index 21817ff1d4f..2e64e76c39d 100644 --- a/healthmonitor/pom.xml +++ b/healthmonitor/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 4.0.0 diff --git a/inspire-atom/pom.xml b/inspire-atom/pom.xml index 4a273df530b..51472b19db9 100644 --- a/inspire-atom/pom.xml +++ b/inspire-atom/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 4.0.0 diff --git a/installer/build.xml b/installer/build.xml index 21a0d491114..f7453ec54b8 100644 --- a/installer/build.xml +++ b/installer/build.xml @@ -44,8 +44,8 @@ - - + + diff --git a/jmeter/pom.xml b/jmeter/pom.xml index 5622df606ab..0d75d458191 100644 --- a/jmeter/pom.xml +++ b/jmeter/pom.xml @@ -29,7 +29,7 @@ org.geonetwork-opensource geonetwork - 3.8.1-0 + 3.8.2-SNAPSHOT diff --git a/listeners/pom.xml b/listeners/pom.xml index 394fe5a46a1..b5ae1899691 100644 --- a/listeners/pom.xml +++ b/listeners/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT GeoNetwork Events diff --git a/messaging/pom.xml b/messaging/pom.xml index ad0dd313b6b..88bcf3c2e06 100644 --- a/messaging/pom.xml +++ b/messaging/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 4.0.0 diff --git a/oaipmh/pom.xml b/oaipmh/pom.xml index 4a2690b8a5f..7b1ef88bfa8 100644 --- a/oaipmh/pom.xml +++ b/oaipmh/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 3.8.1-0 + 3.8.2-SNAPSHOT diff --git a/pom.xml b/pom.xml index c2364485e2b..b941eb38f5b 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.geonetwork-opensource geonetwork pom - 3.8.1-0 + 3.8.2-SNAPSHOT GeoNetwork opensource GeoNetwork opensource is a standards based, Free and Open Source catalog application to manage spatially referenced diff --git a/release/pom.xml b/release/pom.xml index 16e1fcedb2f..a936e4135db 100644 --- a/release/pom.xml +++ b/release/pom.xml @@ -7,7 +7,7 @@ org.geonetwork-opensource geonetwork - 3.8.1-0 + 3.8.2-SNAPSHOT release diff --git a/schemas-test/pom.xml b/schemas-test/pom.xml index c74bf224311..7a44dcd17e3 100644 --- a/schemas-test/pom.xml +++ b/schemas-test/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 4.0.0 jar diff --git a/schemas/pom.xml b/schemas/pom.xml index 52a2c066572..36fbebbb57d 100644 --- a/schemas/pom.xml +++ b/schemas/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 3.7 @@ -55,7 +55,7 @@ ../.. - 3.8.1-0 + 3.8.2-SNAPSHOT diff --git a/sde/pom.xml b/sde/pom.xml index a20e04d7a14..a838a79daca 100644 --- a/sde/pom.xml +++ b/sde/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 3.8.1-0 + 3.8.2-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index e1741ea7d20..5479b9b5b24 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 4.0.0 diff --git a/slave/pom.xml b/slave/pom.xml index f00ee9411e6..6abcf35d7a4 100644 --- a/slave/pom.xml +++ b/slave/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT GeoNetwork Slave diff --git a/web-ui-docs/pom.xml b/web-ui-docs/pom.xml index acd6d7ff884..f7762760d47 100644 --- a/web-ui-docs/pom.xml +++ b/web-ui-docs/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 4.0.0 diff --git a/web-ui/pom.xml b/web-ui/pom.xml index ad20b3b7689..a3c3fdfb73c 100644 --- a/web-ui/pom.xml +++ b/web-ui/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 3.8.1-0 + 3.8.2-SNAPSHOT org.geonetwork-opensource diff --git a/web/pom.xml b/web/pom.xml index 66ea678a457..d428df3737c 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 3.8.1-0 + 3.8.2-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 e0dbb1314f8..5b9d7724d62 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 @@ -231,5 +231,10 @@ WEB-INF/classes/setup/sql/migrate/v381/migrate- + + + WEB-INF/classes/setup/sql/migrate/v382/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 726747b747d..8a712056ffd 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 @@ -573,8 +573,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', '3.8.1', 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', '3.8.2', 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'); INSERT INTO Settings (name, value, datatype, position, internal) VALUES ('system/server/protocol', 'http', 0, 220, 'n'); diff --git a/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v382/migrate-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v382/migrate-default.sql new file mode 100644 index 00000000000..49124ff7231 --- /dev/null +++ b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v382/migrate-default.sql @@ -0,0 +1,2 @@ +UPDATE Settings SET value='3.8.2' WHERE name='system/platform/version'; +UPDATE Settings SET value='SNAPSHOT' WHERE name='system/platform/subVersion'; diff --git a/web/src/main/webapp/WEB-INF/server.prop b/web/src/main/webapp/WEB-INF/server.prop index 97e328b07e8..a5798fa96bf 100644 --- a/web/src/main/webapp/WEB-INF/server.prop +++ b/web/src/main/webapp/WEB-INF/server.prop @@ -1,5 +1,5 @@ #GeoNetwork opensource properties. These are also used by geonetwork at runtime -#Wed, 25 Sep 2019 06:19:58 +0000 +#Wed, 25 Sep 2019 06:33:27 +0000 version=3.8.1 subVersion=0 @@ -7,8 +7,8 @@ release=3.8.1 javaVersion=1.8.0 jre_url=http\://openjdk.java.net/ ant.build.javac.target=1.8 -buildDate=2019-09-25T06\:19\:58+0000 -date=1919250619 +buildDate=2019-09-25T06\:33\:27+0000 +date=1933250633 day=25-9-2019 OS=Compiled on Linux (unix) debugOn=on diff --git a/workers/pom.xml b/workers/pom.xml index 242da5a9fea..69d3afeb930 100644 --- a/workers/pom.xml +++ b/workers/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 4.0.0 diff --git a/workers/wfsfeature-harvester/pom.xml b/workers/wfsfeature-harvester/pom.xml index 40de6b41289..44e4f5104f7 100644 --- a/workers/wfsfeature-harvester/pom.xml +++ b/workers/wfsfeature-harvester/pom.xml @@ -28,7 +28,7 @@ workers org.geonetwork-opensource - 3.8.1-0 + 3.8.2-SNAPSHOT 4.0.0 diff --git a/wro4j/pom.xml b/wro4j/pom.xml index d9de82d69c7..fd6dc9b2c4d 100644 --- a/wro4j/pom.xml +++ b/wro4j/pom.xml @@ -7,7 +7,7 @@ org.geonetwork-opensource geonetwork - 3.8.1-0 + 3.8.2-SNAPSHOT