Merge remote-tracking branch 'IQSS/develop' into DANS-performance

doc/sphinx-guides/source/conf.py

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

doc/sphinx-guides/source/versions.rst

@@ -7,7 +7,8 @@ Dataverse Software Documentation Versions
 This list provides a way to refer to the documentation for previous and future versions of the Dataverse Software. In order to learn more about the updates delivered from one version to another, visit the `Releases <https://github.com/IQSS/dataverse/releases>`__ page in our GitHub repo.
 
 - pre-release `HTML (not final!) <http://preview.guides.gdcc.io/en/develop/>`__ and `PDF (experimental!) <http://preview.guides.gdcc.io/_/downloads/en/develop/pdf/>`__ built from the :doc:`develop </developers/version-control>` branch :doc:`(how to contribute!) </contributor/documentation>`
-- 6.4
+- 6.5
+- `6.4 </en/6.4/>`__
 - `6.3 </en/6.3/>`__
 - `6.2 </en/6.2/>`__
 - `6.1 </en/6.1/>`__

modules/dataverse-parent/pom.xml

@@ -446,8 +446,8 @@
                     Once the release has been made (tag created), change this back to "${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}"
                     (These properties are provided by the build-helper plugin below.)
                 -->
-                <base.image.version>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}</base.image.version>
-                <!--<base.image.version>${revision}</base.image.version>-->
+                <!--<base.image.version>${parsedVersion.majorVersion}.${parsedVersion.nextMinorVersion}</base.image.version>-->
+                <base.image.version>${revision}</base.image.version>
             </properties>
 
             <build>