diff --git a/README.md b/README.md index 0ab852df2..9e6cf554d 100755 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Metacat: Data Preservation and Discovery System -Version: 2.16.1 Release +Version: 2.16.2 Release Send feedback and bugs to: metacat-dev@ecoinformatics.org http://github.com/NCEAS/metacat @@ -67,6 +67,10 @@ for the next release. ## Release Notes +### Release Notes for 2.16.2 +Bugs fixed in this release: +* Upgrade some library jar files to fix severe security vulnerabilities + ### Release Notes for 2.16.1 Bugs fixed in this release: * Upgrade some library jar files to fix severe security vulnerabilities diff --git a/build.properties b/build.properties index 27f886169..7b0e92550 100755 --- a/build.properties +++ b/build.properties @@ -2,7 +2,7 @@ #Version of this build. This needs to be a dotted numeric version. For #instance 1.9.1 is okay. 1.9.1_rc1 is not. -metacat.version=2.16.1 +metacat.version=2.16.2 #This is for packaging purposes. leave it blank for final production release. metacat.releaseCandidate= diff --git a/lib/metacat.properties b/lib/metacat.properties index dfa873ce7..31a25cebb 100755 --- a/lib/metacat.properties +++ b/lib/metacat.properties @@ -34,7 +34,7 @@ server.internalPort=80 ############### Application Values ############ ## one of the few places where we use ANT tokens -application.metacatVersion=2.16.1 +application.metacatVersion=2.16.2 application.metacatReleaseInfo=-1 application.readOnlyMode=false @@ -137,6 +137,7 @@ database.upgradeVersion.2.15.0=upgrade-db-to-2.15.0 database.upgradeVersion.2.15.1=upgrade-db-to-2.15.1 database.upgradeVersion.2.16.0=upgrade-db-to-2.16.0 database.upgradeVersion.2.16.1=upgrade-db-to-2.16.1 +database.upgradeVersion.2.16.2=upgrade-db-to-2.16.2 ## for running java-based utilities database.upgradeUtility.1.5.0=edu.ucsb.nceas.metacat.admin.upgrade.Upgrade1_5_0 @@ -548,8 +549,8 @@ Crosswalks.eml-2.1.1=edu.ucsb.nceas.metacat.oaipmh.provider.server.crosswalk.Eml ######## Spatial section ######################################### -spatial.runSpatialOption=true -spatial.regenerateCacheOnRestart=true +spatial.runSpatialOption=false +spatial.regenerateCacheOnRestart=false # Comma-seperated list of schemas containing spatial bounding boxes # name corresponds to the docname stored in xml_documents table spatial.spatialDocnameList=eml,fgdc,metadata diff --git a/metacat-common/pom.xml b/metacat-common/pom.xml index 48770bc69..5f11f57e2 100644 --- a/metacat-common/pom.xml +++ b/metacat-common/pom.xml @@ -4,7 +4,7 @@ edu.ucsb.nceas.metacat.common metacat-common jar - 2.16.1 + 2.16.2 metacat-common http://maven.apache.org @@ -219,17 +219,17 @@ org.apache.logging.log4j log4j-1.2-api - 2.17.0 + 2.17.1 org.apache.logging.log4j log4j-core - 2.17.0 + 2.17.1 org.apache.logging.log4j log4j-jcl - 2.17.0 + 2.17.1 commons-logging diff --git a/metacat-index/pom.xml b/metacat-index/pom.xml index 0c6c86668..260905489 100644 --- a/metacat-index/pom.xml +++ b/metacat-index/pom.xml @@ -4,13 +4,13 @@ edu.ucsb.nceas.metacat.index metacat-index war - 2.16.1 + 2.16.2 metacat-index http://maven.apache.org 2.3.14 - 2.16.1 + 2.16.2 diff --git a/pom.xml b/pom.xml index 898a1ae85..22214618c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.ecoinformatics metacat - 2.16.1 + 2.16.2 metacat war http://maven.apache.org @@ -12,7 +12,7 @@ UTF-8 2.3.1 2.3.2 - 2.16.1 + 2.16.2 diff --git a/src/loaddtdschema-postgres.sql b/src/loaddtdschema-postgres.sql index be2d515ab..cfbcc1f2f 100755 --- a/src/loaddtdschema-postgres.sql +++ b/src/loaddtdschema-postgres.sql @@ -217,4 +217,4 @@ INSERT INTO xml_catalog (entry_type, public_id, system_id) SELECT 'Schema', 'htt INSERT INTO xml_catalog (entry_type, public_id, format_id) SELECT 'NonXML', 'science-on-schema.org/Dataset;ld+json', 'science-on-schema.org/Dataset;ld+json' WHERE NOT EXISTS (SELECT * FROM xml_catalog WHERE public_id='science-on-schema.org/Dataset;ld+json'); INSERT INTO db_version (version, status, date_created) - VALUES ('2.16.1',1,CURRENT_DATE); + VALUES ('2.16.2',1,CURRENT_DATE); diff --git a/src/upgrade-db-to-2.16.2-postgres.sql b/src/upgrade-db-to-2.16.2-postgres.sql new file mode 100644 index 000000000..db2b552ec --- /dev/null +++ b/src/upgrade-db-to-2.16.2-postgres.sql @@ -0,0 +1,13 @@ +/* + * Ensure xml_catalog sequence is at table max + */ + +SELECT setval('xml_catalog_id_seq', (SELECT max(catalog_id) from xml_catalog)); + +/* + * update the database version + */ +UPDATE db_version SET status=0; + +INSERT INTO db_version (version, status, date_created) + VALUES ('2.16.2', 1, CURRENT_DATE);