Merge pull request #1550 from NCEAS/develop

First merge for 2.16.2 from develop to main

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: [email protected]
                            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

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=

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

metacat-common/pom.xml

@@ -4,7 +4,7 @@
 	<groupId>edu.ucsb.nceas.metacat.common</groupId>
 	<artifactId>metacat-common</artifactId>
 	<packaging>jar</packaging>
-	<version>2.16.1</version>
+	<version>2.16.2</version>
 	<name>metacat-common</name>
 	<url>http://maven.apache.org</url>
 	<properties>
@@ -219,17 +219,17 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-1.2-api</artifactId>
-            <version>2.17.0</version>
+            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.17.0</version>
+            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-jcl</artifactId>
-            <version>2.17.0</version>
+            <version>2.17.1</version>
         </dependency>
         <dependency>
             <groupId>commons-logging</groupId>

metacat-index/pom.xml

@@ -4,13 +4,13 @@
 	<groupId>edu.ucsb.nceas.metacat.index</groupId>
 	<artifactId>metacat-index</artifactId>
 	<packaging>war</packaging>
-	<version>2.16.1</version>
+	<version>2.16.2</version>
 	<name>metacat-index</name>
 	<url>http://maven.apache.org</url>
 
 	<properties>
         <d1_cn_index_processor_version>2.3.14</d1_cn_index_processor_version>
-        <metacat_common_version>2.16.1</metacat_common_version>
+        <metacat_common_version>2.16.2</metacat_common_version>
     </properties>
 
 	<repositories>

pom.xml

@@ -4,15 +4,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.ecoinformatics</groupId>
     <artifactId>metacat</artifactId>
-    <version>2.16.1</version>
+    <version>2.16.2</version>
     <name>metacat</name>
     <packaging>war</packaging>
     <url>http://maven.apache.org</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <d1_libclient_version>2.3.1</d1_libclient_version>
         <d1_portal_version>2.3.2</d1_portal_version>
-        <metacat_common_version>2.16.1</metacat_common_version>
+        <metacat_common_version>2.16.2</metacat_common_version>
     </properties>
     <repositories>
         <repository>

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);

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);