Merge pull request #147 from IQSS/133-upgrade-4.17

Here we go.
gdcc · Jan 23, 2020 · d7f63fa · d7f63fa
2 parents d5fa615 + 911a79f
commit d7f63fa
Show file tree

Hide file tree

Showing 12 changed files with 20 additions and 20 deletions.
diff --git a/README.rst b/README.rst
@@ -26,7 +26,7 @@ for details.
 
 
 
-.. |Dataverse badge| image:: https://img.shields.io/badge/Dataverse-v4.16-important.svg
+.. |Dataverse badge| image:: https://img.shields.io/badge/Dataverse-v4.17-important.svg
    :target: https://dataverse.org
 .. |Validation badge| image:: https://jenkins.dataverse.org/job/dataverse-k8s/job/Kubeval%20Linting/job/master/badge/icon?subject=kubeval&status=valid&color=purple
    :target: https://jenkins.dataverse.org/blue/organizations/jenkins/dataverse-k8s%2FKubeval%20Linting/activity?branch=master

diff --git a/dataverse b/dataverse
diff --git a/docs/conf.py b/docs/conf.py
@@ -25,7 +25,7 @@
 author = u'Oliver Bertuch'
 
 # The short X.Y version
-version = u'4.16'
+version = u'4.17'
 # The full version, including alpha/beta/rc tags
 release = version
 

diff --git a/docs/images/build.rst b/docs/images/build.rst
@@ -19,8 +19,8 @@ Simple with Docker (or Podman) after cloning the project and accessing the sourc
 
 .. code-block:: shell
 
-  docker build -t iqss/dataverse-k8s:4.16 -f docker/dataverse-k8s/glassfish/Dockerfile .
-  docker build -t iqss/solr-k8s:4.16 docker/solr-k8s
+  docker build -t iqss/dataverse-k8s:4.17 -f docker/dataverse-k8s/glassfish/Dockerfile .
+  docker build -t iqss/solr-k8s:4.17 docker/solr-k8s
 
 
 *Please remember to change the tag above as appropriate. You should be*

diff --git a/docs/images/dataverse-k8s.md b/docs/images/dataverse-k8s.md
@@ -1,6 +1,6 @@
 # Image "dataverse-k8s"
 
-[![Upstream](https://img.shields.io/badge/Dataverse-v4.16-important.svg)](https://github.com/IQSS/dataverse/releases/v4.16)
+[![Upstream](https://img.shields.io/badge/Dataverse-v4.17-important.svg)](https://github.com/IQSS/dataverse/releases/v4.17)
 [![Hub](https://img.shields.io/static/v1.svg?label=image&message=dataverse-k8s&logo=docker)](https://hub.docker.com/r/iqss/dataverse-k8s)
 ![Pulls](https://img.shields.io/docker/pulls/iqss/dataverse-k8s)
 [![RTD](https://img.shields.io/readthedocs/dataverse-k8s)](https://dataverse-k8s.readthedocs.io)
@@ -17,11 +17,11 @@ like [Docker](https://docker.io) or [podman](https://podman.io).
 
 - `latest`: master branch based build ([`Dockerfile`](https://github.com/IQSS/dataverse-kubernetes/blob/master/docker/dataverse-k8s/glassfish/Dockerfile))
 - `build-cache`: a maven cache image to speedup dev builds, refreshed every night based on latest upstream `develop`. ([`Dockerfile`](https://github.com/IQSS/dataverse-kubernetes/blob/master/docker/dataverse-k8s/build-cache/Dockerfile), [`Jenkinsfile`](https://github.com/IQSS/dataverse-kubernetes/blob/master/docker/dataverse-k8s/build-cache/Jenkinsfile))
-- `4.16`, ..., `4.15.1`, ..., `4.11`: stable (tagged) releases
+- `4.17`, ..., `4.15.1`, ..., `4.11`: stable (tagged) releases
   - Using [upstream release schema](https://github.com/IQSS/dataverse/releases/) down to `4.11`.
   - See also [list on Docker Hub](https://hub.docker.com/r/iqss/dataverse-k8s/tags?page=1&ordering=last_updated&name=4.)
     for releases
-  - Last stable tag ([`Dockerfile`](https://github.com/IQSS/dataverse-kubernetes/blob/v4.16/docker/dataverse-k8s/glassfish/Dockerfile))
+  - Last stable tag ([`Dockerfile`](https://github.com/IQSS/dataverse-kubernetes/blob/v4.17/docker/dataverse-k8s/glassfish/Dockerfile))
 
 ## Quick reference
 

diff --git a/docs/images/solr-k8s.md b/docs/images/solr-k8s.md
@@ -1,6 +1,6 @@
 # Image "solr-k8s"
 
-[![Upstream](https://img.shields.io/badge/Dataverse-v4.16-important.svg)](https://github.com/IQSS/dataverse/releases/v4.16)
+[![Upstream](https://img.shields.io/badge/Dataverse-v4.17-important.svg)](https://github.com/IQSS/dataverse/releases/v4.17)
 [![Hub](https://img.shields.io/static/v1.svg?label=image&message=solr-k8s&logo=docker)](https://hub.docker.com/r/iqss/solr-k8s)
 [![Solr](https://img.shields.io/static/v1.svg?label=upstream&message=7.3.1&logo=docker)](https://hub.docker.com/_/solr)
 ![Pulls](https://img.shields.io/docker/pulls/iqss/solr-k8s)
@@ -10,7 +10,7 @@
 This container image includes a dependency service to run [Dataverse](https://dataverse.org), a
 Java EE based web application for research data management, on a container platform.
 It is derived from [upstream Solr images](https://hub.docker.com/_/solr), [using the
-required version](http://guides.dataverse.org/en/4.16/installation/prerequisites.html#solr).
+required version](http://guides.dataverse.org/en/4.17/installation/prerequisites.html#solr).
 
 It is primarily targeted to be used in production on [Kubernetes](https://kubernetes.io),
 but if you follow the same conventions, you should be able to use it with other tools
@@ -19,11 +19,11 @@ like [Docker](https://docker.io) or [podman](https://podman.io).
 ## Supported tags
 
 - `latest`: master branch based build ([`Dockerfile`](https://github.com/IQSS/dataverse-kubernetes/blob/master/docker/dataverse-k8s/glassfish/Dockerfile))
-- `4.16`, ..., `4.15.1`, ..., `4.11`: stable (tagged) releases
+- `4.17`, ..., `4.15.1`, ..., `4.11`: stable (tagged) releases
   - Using [upstream release schema](https://github.com/IQSS/dataverse/releases/) down to `4.11`.
   - See also [list on Docker Hub](https://hub.docker.com/r/iqss/dataverse-k8s/tags?page=1&ordering=last_updated&name=4.)
     for releases
-  - Last stable tag ([`Dockerfile`](https://github.com/IQSS/dataverse-kubernetes/blob/v4.16/docker/solr-k8s/Dockerfile))
+  - Last stable tag ([`Dockerfile`](https://github.com/IQSS/dataverse-kubernetes/blob/v4.17/docker/solr-k8s/Dockerfile))
 
 ## Quick reference
 
@@ -55,7 +55,7 @@ to this user on any volumes used for the below directories.
 
   Please read the detailed docs about Solr schema provisioning:
    - [Upstream: updating Solr schema](http://guides.dataverse.org/en/4.17/admin/metadatacustomization.html#updating-the-solr-schema).
-   - [Kubernetes `Job`s for Search Index](https://dataverse-k8s.rtfd.io/en/4.16/day2/job-index.html)
+   - [Kubernetes `Job`s for Search Index](https://dataverse-k8s.rtfd.io/en/4.17/day2/job-index.html)
 - **/scripts** <br />
   A collection of scripts for init containers and sidecars. See guide for more
   information on those scripts. Also available as `$SCRIPT_DIR`.

diff --git a/k8s/dataverse/deployment.yaml b/k8s/dataverse/deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   name: dataverse
   labels:
     app.kubernetes.io/name: dataverse
-    app.kubernetes.io/version: "4.16"
+    app.kubernetes.io/version: "4.17"
     app.kubernetes.io/component: appserver
     app.kubernetes.io/part-of: dataverse
     app.kubernetes.io/managed-by: kubectl

diff --git a/k8s/dataverse/kustomization.yaml b/k8s/dataverse/kustomization.yaml
@@ -9,4 +9,4 @@ resources:
 
 images:
   - name: iqss/dataverse-k8s
-    newTag: "4.16"
+    newTag: "4.17"
diff --git a/k8s/kustomization.yaml b/k8s/kustomization.yaml
@@ -7,6 +7,6 @@ bases:
 
 images:
   - name: iqss/dataverse-k8s
-    newTag: "4.16"
+    newTag: "4.17"
   - name: iqss/solr-k8s
-    newTag: "4.16"
+    newTag: "4.17"
diff --git a/k8s/solr/deployment.yaml b/k8s/solr/deployment.yaml
@@ -5,7 +5,7 @@ metadata:
   name: solr
   labels:
     app.kubernetes.io/name: solr
-    app.kubernetes.io/version: "4.16"
+    app.kubernetes.io/version: "4.17"
     app.kubernetes.io/component: searchindex
     app.kubernetes.io/part-of: dataverse
     app.kubernetes.io/managed-by: kubectl

diff --git a/k8s/solr/kustomization.yaml b/k8s/solr/kustomization.yaml
@@ -8,4 +8,4 @@ resources:
 
 images:
   - name: iqss/solr-k8s
-    newTag: "4.16"
+    newTag: "4.17"
diff --git a/prepare-release.sh b/prepare-release.sh
@@ -12,7 +12,7 @@ CURRENT=`echo "${2:-$(git describe --tag --abbrev=0)}" | tr -d "v"`
 NEW=`echo ${1:-${CURRENT}} | tr -d "v"`
 
 # find all relevant files and replace inline with sed
-find ./*.md ./*.yaml ./docs ./k8s ./docker -type f \
+find ./*.rst ./*.yaml ./docs ./k8s ./docker -type f \
     -not -path "./docs/release-notes/*" \
     -not -iname "*.svg" \
     -exec sed -i -e "s#${CURRENT}#${NEW}#g" {} \;
+29 −5		doc/release-notes/4.17-release-notes.md
+3 −1		doc/sphinx-guides/source/api/external-tools.rst
+13 −0		doc/sphinx-guides/source/api/native-api.rst
+2 −2		doc/sphinx-guides/source/conf.py
+1 −1		doc/sphinx-guides/source/developers/sql-upgrade-scripts.rst
+1 −1		doc/sphinx-guides/source/installation/advanced.rst
+2 −0		doc/sphinx-guides/source/installation/config.rst
+11 −2		doc/sphinx-guides/source/user/dataverse-management.rst
+2 −1		doc/sphinx-guides/source/versions.rst
+1 −1		pom.xml
+5 −5		scripts/api/data/metadatablocks/citation.tsv
+1 −1		scripts/tests/ec2-memory-benchmark/README.md
+1 −1		src/main/java/edu/harvard/iq/dataverse/ConfigureFragmentBean.java
+1 −1		src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
+12 −4		src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
+30 −2		src/main/java/edu/harvard/iq/dataverse/DataverseTheme.java
+2 −1		src/main/java/edu/harvard/iq/dataverse/FileDownloadServiceBean.java
+68 −4		src/main/java/edu/harvard/iq/dataverse/ThemeWidgetFragment.java
+128 −1		src/main/java/edu/harvard/iq/dataverse/api/Admin.java
+2 −2		src/main/java/edu/harvard/iq/dataverse/api/TestApi.java
+50 −23		src/main/java/edu/harvard/iq/dataverse/engine/command/impl/UpdateDataverseThemeCommand.java
+2 −1		src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalTool.java
+11 −2		src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalToolHandler.java
+3 −0		src/main/java/edu/harvard/iq/dataverse/externaltools/ExternalToolServiceBean.java
+4 −7		src/main/java/propertyFiles/Bundle.properties
+4 −0		src/main/resources/db/migration/V4.16.0.3__6156-FooterImageforSub-Dataverse.sql
+9 −0		src/main/webapp/dataverse_footer.xhtml
+4 −0		src/main/webapp/resources/css/structure.css
+59 −5		src/main/webapp/themeAndWidgetsFragment.xhtml
+100 −7		src/test/java/edu/harvard/iq/dataverse/api/AdminIT.java
+2 −0		src/test/java/edu/harvard/iq/dataverse/api/ExternalToolsIT.java
+17 −3		src/test/java/edu/harvard/iq/dataverse/api/UtilIT.java
+30 −7		src/test/java/edu/harvard/iq/dataverse/externaltools/ExternalToolHandlerTest.java
+16 −10		src/test/java/edu/harvard/iq/dataverse/externaltools/ExternalToolServiceBeanTest.java