Merge pull request #152 from IQSS/151-upgrade-4.18.1

Upgrade to v4.18.1 with images, docs and submodule ref
gdcc · Jan 23, 2020 · 37f674f · 37f674f
2 parents 4f82681 + 543f5a5
commit 37f674f
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 22 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.18-important.svg
+.. |Dataverse badge| image:: https://img.shields.io/badge/Dataverse-v4.18.1-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/docker/dataverse-k8s/glassfish/Dockerfile b/docker/dataverse-k8s/glassfish/Dockerfile
@@ -10,7 +10,7 @@ LABEL maintainer="FDM FZJ <forschungsdaten@fz-juelich.de>"
 
 ARG TINI_VERSION=v0.18.0
 ARG JMX_EXPORTER_VERSION=0.12.0
-ARG VERSION=4.18
+ARG VERSION=4.18.1
 ARG DOMAIN=domain1
 
 ENV HOME_DIR=/opt/dataverse\

diff --git a/docker/solr-k8s/Dockerfile b/docker/solr-k8s/Dockerfile
@@ -10,7 +10,7 @@ LABEL maintainer="FDM FZJ <forschungsdaten@fz-juelich.de>"
 
 ARG WEBHOOK_VERSION=2.6.11
 ARG TINI_VERSION=v0.18.0
-ARG VERSION=4.18
+ARG VERSION=4.18.1
 ARG COLLECTION=collection1
 ENV SOLR_OPTS="-Dsolr.jetty.request.header.size=102400"\
     COLLECTION_DIR=/opt/solr/server/solr/${COLLECTION}\

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.18'
+version = u'4.18.1'
 # 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.18 -f docker/dataverse-k8s/glassfish/Dockerfile .
-  docker build -t iqss/solr-k8s:4.18 docker/solr-k8s
+  docker build -t iqss/dataverse-k8s:4.18.1 -f docker/dataverse-k8s/glassfish/Dockerfile .
+  docker build -t iqss/solr-k8s:4.18.1 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.18-important.svg)](https://github.com/IQSS/dataverse/releases/v4.18)
+[![Upstream](https://img.shields.io/badge/Dataverse-v4.18.1-important.svg)](https://github.com/IQSS/dataverse/releases/v4.18.1)
 [![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.18`, ..., `4.15.1`, ..., `4.11`: stable (tagged) releases
+- `4.18.1`, ..., `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.18/docker/dataverse-k8s/glassfish/Dockerfile))
+  - Last stable tag ([`Dockerfile`](https://github.com/IQSS/dataverse-kubernetes/blob/v4.18.1/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.18-important.svg)](https://github.com/IQSS/dataverse/releases/v4.18)
+[![Upstream](https://img.shields.io/badge/Dataverse-v4.18.1-important.svg)](https://github.com/IQSS/dataverse/releases/v4.18.1)
 [![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.18/installation/prerequisites.html#solr).
+required version](http://guides.dataverse.org/en/4.18.1/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.18`, ..., `4.15.1`, ..., `4.11`: stable (tagged) releases
+- `4.18.1`, ..., `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.18/docker/solr-k8s/Dockerfile))
+  - Last stable tag ([`Dockerfile`](https://github.com/IQSS/dataverse-kubernetes/blob/v4.18.1/docker/solr-k8s/Dockerfile))
 
 ## Quick reference
 
@@ -54,8 +54,8 @@ to this user on any volumes used for the below directories.
   Also available as `$SCHEMA_DIR`
 
   Please read the detailed docs about Solr schema provisioning:
-   - [Upstream: updating Solr schema](http://guides.dataverse.org/en/4.18/admin/metadatacustomization.html#updating-the-solr-schema).
-   - [Kubernetes `Job`s for Search Index](https://dataverse-k8s.rtfd.io/en/4.18/day2/job-index.html)
+   - [Upstream: updating Solr schema](http://guides.dataverse.org/en/4.18.1/admin/metadatacustomization.html#updating-the-solr-schema).
+   - [Kubernetes `Job`s for Search Index](https://dataverse-k8s.rtfd.io/en/4.18.1/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.18"
+    app.kubernetes.io/version: "4.18.1"
     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.18"
+    newTag: "4.18.1"
diff --git a/k8s/kustomization.yaml b/k8s/kustomization.yaml
@@ -7,6 +7,6 @@ bases:
 
 images:
   - name: iqss/dataverse-k8s
-    newTag: "4.18"
+    newTag: "4.18.1"
   - name: iqss/solr-k8s
-    newTag: "4.18"
+    newTag: "4.18.1"
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.18"
+    app.kubernetes.io/version: "4.18.1"
     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.18"
+    newTag: "4.18.1"
+5 −1		doc/release-notes/4.18-release-notes.md
+45 −0		doc/release-notes/4.18.1-release-notes.md
+10 −19		doc/sphinx-guides/source/admin/harvestclients.rst
+2 −2		doc/sphinx-guides/source/conf.py
+2 −1		doc/sphinx-guides/source/versions.rst
+1 −1		pom.xml
+30 −1		src/main/java/edu/harvard/iq/dataverse/ApiTokenPage.java
+10 −0		src/main/java/edu/harvard/iq/dataverse/EditDatafilesPage.java
+1 −1		src/main/java/edu/harvard/iq/dataverse/authorization/AuthenticationServiceBean.java
+5 −1		src/main/java/propertyFiles/Bundle.properties
+1 −1		src/main/webapp/dataset.xhtml
+2 −2		src/main/webapp/datasetFieldForEditFragment.xhtml
+29 −12		src/main/webapp/dataverseuser.xhtml
+18 −0		src/main/webapp/editdatafiles.xhtml
+8 −10		src/main/webapp/metadataFragment.xhtml
+1 −1		src/main/webapp/resources/css/structure.css
+3 −1		tests/jenkins/ec2/Jenkinsfile