From 1b23496bf0374cef407fb638d7b34f8808150300 Mon Sep 17 00:00:00 2001 From: fxprunayre Date: Wed, 28 Sep 2016 09:27:02 +0200 Subject: [PATCH] Update version to 3.2.1-SNAPSHOT. --- cachingxslt/pom.xml | 2 +- common/pom.xml | 2 +- core/pom.xml | 2 +- csw-server/pom.xml | 2 +- docs/pom.xml | 4 ++-- domain/pom.xml | 2 +- e2e-tests/pom.xml | 2 +- events/pom.xml | 2 +- harvesters/pom.xml | 2 +- healthmonitor/pom.xml | 2 +- inspire-atom/pom.xml | 2 +- installer/build.xml | 4 ++-- jmeter/pom.xml | 2 +- messaging/pom.xml | 2 +- oaipmh/pom.xml | 2 +- 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/iso19139/pom.xml | 2 +- schemas/pom.xml | 2 +- schemas/schema-core/pom.xml | 2 +- sde/pom.xml | 2 +- services/pom.xml | 2 +- solr/pom.xml | 2 +- solr/solr-bridge/pom.xml | 2 +- solr/solr-config/pom.xml | 2 +- web-ui-docs/pom.xml | 2 +- web-ui/pom.xml | 2 +- web/pom.xml | 2 +- .../WEB-INF/classes/setup/sql/data/data-db-default.sql | 4 ++-- .../classes/setup/sql/migrate/v321/migrate-default.sql | 2 ++ web/src/main/webapp/WEB-INF/config-db/database_migration.xml | 5 +++++ workers/pom.xml | 2 +- workers/wfsfeature-harvester/pom.xml | 2 +- wro4j/pom.xml | 2 +- 37 files changed, 45 insertions(+), 38 deletions(-) create mode 100644 web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v321/migrate-default.sql diff --git a/cachingxslt/pom.xml b/cachingxslt/pom.xml index a5c9d02f82d..c12488eabc0 100644 --- a/cachingxslt/pom.xml +++ b/cachingxslt/pom.xml @@ -31,7 +31,7 @@ org.geonetwork-opensource geonetwork - 3.2.0-0 + 3.2.1-SNAPSHOT diff --git a/common/pom.xml b/common/pom.xml index fde5c170248..63f11cb6d6a 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -31,7 +31,7 @@ org.geonetwork-opensource geonetwork - 3.2.0-0 + 3.2.1-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index b6645258116..13691e49265 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/csw-server/pom.xml b/csw-server/pom.xml index c555c218577..5a55803dd55 100644 --- a/csw-server/pom.xml +++ b/csw-server/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/docs/pom.xml b/docs/pom.xml index a792314e9c0..efc5acaf62c 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -27,7 +27,7 @@ geonetwork org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 org.geonetwork-opensource @@ -35,7 +35,7 @@ Documentation module pom - 3.2.0-0 + 3.2.1-SNAPSHOT General Public License (GPL) diff --git a/domain/pom.xml b/domain/pom.xml index 9ed573ea417..5579f49b900 100644 --- a/domain/pom.xml +++ b/domain/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/e2e-tests/pom.xml b/e2e-tests/pom.xml index 74b0b910126..6f15db955dc 100644 --- a/e2e-tests/pom.xml +++ b/e2e-tests/pom.xml @@ -29,7 +29,7 @@ org.geonetwork-opensource geonetwork - 3.2.0-0 + 3.2.1-SNAPSHOT e2e-tests pom diff --git a/events/pom.xml b/events/pom.xml index 698ca1a5dab..2e95d9a4a4a 100644 --- a/events/pom.xml +++ b/events/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT GeoNetwork Events diff --git a/harvesters/pom.xml b/harvesters/pom.xml index 5837597b65a..9f05d42eceb 100644 --- a/harvesters/pom.xml +++ b/harvesters/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/healthmonitor/pom.xml b/healthmonitor/pom.xml index 0e83294e83b..2f42f0c902e 100644 --- a/healthmonitor/pom.xml +++ b/healthmonitor/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/inspire-atom/pom.xml b/inspire-atom/pom.xml index 73b8c4906a6..db14145637f 100644 --- a/inspire-atom/pom.xml +++ b/inspire-atom/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/installer/build.xml b/installer/build.xml index cf22a2ea920..ae2659ec224 100644 --- a/installer/build.xml +++ b/installer/build.xml @@ -44,8 +44,8 @@ - - + + diff --git a/jmeter/pom.xml b/jmeter/pom.xml index b2b4e907f91..2d6cbe5ed98 100644 --- a/jmeter/pom.xml +++ b/jmeter/pom.xml @@ -29,7 +29,7 @@ org.geonetwork-opensource geonetwork - 3.2.0-0 + 3.2.1-SNAPSHOT diff --git a/messaging/pom.xml b/messaging/pom.xml index ec18495825a..17d52a07dbc 100644 --- a/messaging/pom.xml +++ b/messaging/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/oaipmh/pom.xml b/oaipmh/pom.xml index d354accac0c..4c8cba95cb5 100644 --- a/oaipmh/pom.xml +++ b/oaipmh/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 3.2.0-0 + 3.2.1-SNAPSHOT diff --git a/pom.xml b/pom.xml index 815f0873c71..b91496904e2 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ org.geonetwork-opensource geonetwork pom - 3.2.0-0 + 3.2.1-SNAPSHOT GeoNetwork opensource GeoNetwork opensource is a standards based, Free and Open Source catalog application to manage spatially referenced diff --git a/schemas-test/pom.xml b/schemas-test/pom.xml index 23386b1c0cb..d93fbbe8bec 100644 --- a/schemas-test/pom.xml +++ b/schemas-test/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 jar diff --git a/schemas/csw-record/pom.xml b/schemas/csw-record/pom.xml index 07772a834dc..86ac5210c02 100644 --- a/schemas/csw-record/pom.xml +++ b/schemas/csw-record/pom.xml @@ -5,7 +5,7 @@ schemas org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 schema-csw-record diff --git a/schemas/dublin-core/pom.xml b/schemas/dublin-core/pom.xml index 27eb578761c..8aa1bdb60f0 100644 --- a/schemas/dublin-core/pom.xml +++ b/schemas/dublin-core/pom.xml @@ -5,7 +5,7 @@ schemas org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/schemas/iso19110/pom.xml b/schemas/iso19110/pom.xml index 0d613cc536e..5b98f26bb8a 100644 --- a/schemas/iso19110/pom.xml +++ b/schemas/iso19110/pom.xml @@ -28,7 +28,7 @@ schemas org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/schemas/iso19139/pom.xml b/schemas/iso19139/pom.xml index df05cc62846..b2f8dbaaf47 100644 --- a/schemas/iso19139/pom.xml +++ b/schemas/iso19139/pom.xml @@ -5,7 +5,7 @@ schemas org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/schemas/pom.xml b/schemas/pom.xml index b232bbbc555..7e48d8eb7a6 100644 --- a/schemas/pom.xml +++ b/schemas/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 schemas diff --git a/schemas/schema-core/pom.xml b/schemas/schema-core/pom.xml index fc1dda8a198..56fe300edff 100644 --- a/schemas/schema-core/pom.xml +++ b/schemas/schema-core/pom.xml @@ -28,7 +28,7 @@ schemas org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/sde/pom.xml b/sde/pom.xml index 4aa483845e2..6aadb5c2377 100644 --- a/sde/pom.xml +++ b/sde/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 3.2.0-0 + 3.2.1-SNAPSHOT diff --git a/services/pom.xml b/services/pom.xml index 4385ea987b8..224244be9ff 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/solr/pom.xml b/solr/pom.xml index 7d310206b5c..099f633a8c8 100644 --- a/solr/pom.xml +++ b/solr/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/solr/solr-bridge/pom.xml b/solr/solr-bridge/pom.xml index f03909fe100..4bea37d9ff2 100644 --- a/solr/solr-bridge/pom.xml +++ b/solr/solr-bridge/pom.xml @@ -5,7 +5,7 @@ solr org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/solr/solr-config/pom.xml b/solr/solr-config/pom.xml index 1811884637b..8cd322c83c4 100644 --- a/solr/solr-config/pom.xml +++ b/solr/solr-config/pom.xml @@ -5,7 +5,7 @@ solr org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/web-ui-docs/pom.xml b/web-ui-docs/pom.xml index 241b8024eb4..ead7918e9e7 100644 --- a/web-ui-docs/pom.xml +++ b/web-ui-docs/pom.xml @@ -5,7 +5,7 @@ geonetwork org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/web-ui/pom.xml b/web-ui/pom.xml index cfb92b3b92f..5018ebd4494 100644 --- a/web-ui/pom.xml +++ b/web-ui/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 3.2.0-0 + 3.2.1-SNAPSHOT org.geonetwork-opensource diff --git a/web/pom.xml b/web/pom.xml index 972fcd1b0bf..2ed0752821d 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -30,7 +30,7 @@ org.geonetwork-opensource geonetwork - 3.2.0-0 + 3.2.1-SNAPSHOT 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 f45270ca8ab..f44688d4435 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 @@ -553,8 +553,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.2.0', 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.2.1', 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/v321/migrate-default.sql b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v321/migrate-default.sql new file mode 100644 index 00000000000..1e2e885f91d --- /dev/null +++ b/web/src/main/webapp/WEB-INF/classes/setup/sql/migrate/v321/migrate-default.sql @@ -0,0 +1,2 @@ +UPDATE Settings SET value='3.2.1' WHERE name='system/platform/version'; +UPDATE Settings SET value='SNAPSHOT' WHERE name='system/platform/subVersion'; diff --git a/web/src/main/webapp/WEB-INF/config-db/database_migration.xml b/web/src/main/webapp/WEB-INF/config-db/database_migration.xml index 0ff78d0f601..cf1aa8a0ebe 100644 --- a/web/src/main/webapp/WEB-INF/config-db/database_migration.xml +++ b/web/src/main/webapp/WEB-INF/config-db/database_migration.xml @@ -166,5 +166,10 @@ WEB-INF/classes/setup/sql/migrate/v320/migrate- + + + WEB-INF/classes/setup/sql/migrate/v321/migrate- + + diff --git a/workers/pom.xml b/workers/pom.xml index 29c41fa7a3c..faf613154a7 100644 --- a/workers/pom.xml +++ b/workers/pom.xml @@ -28,7 +28,7 @@ geonetwork org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/workers/wfsfeature-harvester/pom.xml b/workers/wfsfeature-harvester/pom.xml index 18869ce2c6e..fb43d83cbd4 100644 --- a/workers/wfsfeature-harvester/pom.xml +++ b/workers/wfsfeature-harvester/pom.xml @@ -28,7 +28,7 @@ workers org.geonetwork-opensource - 3.2.0-0 + 3.2.1-SNAPSHOT 4.0.0 diff --git a/wro4j/pom.xml b/wro4j/pom.xml index e1337ed8a4d..5f934faa1c4 100644 --- a/wro4j/pom.xml +++ b/wro4j/pom.xml @@ -7,7 +7,7 @@ org.geonetwork-opensource geonetwork - 3.2.0-0 + 3.2.1-SNAPSHOT