Merge pull request #3523 from IQSS/3522-4.6-bump-and-sql

3522 4.6 bump and sql upgrade script consolidation

Author: kcondon

doc/sphinx-guides/source/conf.py

@@ -64,9 +64,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.5.1'
+version = '4.6'
 # The full version, including alpha/beta/rc tags.
-release = '4.5.1'
+release = '4.6'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/sphinx-guides/source/index.rst

@@ -3,10 +3,10 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Dataverse 4.5.1 Guides
-======================
+Dataverse 4.6 Guides
+====================
 
-These guides are for the most recent version of Dataverse. For the guides for **version 4.5** please go `here <http://guides.dataverse.org/en/4.5/>`_.
+These guides are for the most recent version of Dataverse. For the guides for **version 4.5.1** please go `here <http://guides.dataverse.org/en/4.5.1/>`_.
 
 .. toctree::
   :glob:

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>edu.harvard.iq</groupId>
     <artifactId>dataverse</artifactId>
-    <version>4.5.1</version>
+    <version>4.6</version>
     <packaging>war</packaging>
 
     <name>dataverse</name>

scripts/database/upgrades/3405-filemetadata-directory-label.sql

@@ -5,3 +5,4 @@ ALTER TABLE datafile ALTER COLUMN checksumtype SET NOT NULL;
 -- note that in the database we use "SHA1" (no hyphen) but the GUI will show "SHA-1"
 --UPDATE datafile SET checksumtype = 'SHA1';
 ALTER TABLE datafile RENAME md5 TO checksumvalue;
+ALTER TABLE filemetadata ADD COLUMN directorylabel character varying(255);