From 15100f4cc4a3dcb9785e650ddc6e417217838512 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Nov 2020 18:34:04 +0100 Subject: [PATCH 1/3] Update to Payara 5.2020.6. #7417 --- doc/release-notes/7417-payara-5.2020.6.md | 12 ++++++++++++ .../source/installation/prerequisites.rst | 6 +++--- pom.xml | 2 +- 3 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 doc/release-notes/7417-payara-5.2020.6.md diff --git a/doc/release-notes/7417-payara-5.2020.6.md b/doc/release-notes/7417-payara-5.2020.6.md new file mode 100644 index 00000000000..30c6fd178c8 --- /dev/null +++ b/doc/release-notes/7417-payara-5.2020.6.md @@ -0,0 +1,12 @@ +## Update to Payara Platform 5.2020.6 + +In contrast to good old Glassfish 4, the Payara application server +is a maintained product, receiving both feature and - more important - +security and dependent technology updates. You should update the +application server platform on a regular basis, as it is a key component +of a running Dataverse deployment. + + + +Instructions how to update can be found in the +[Payara documentation](https://docs.payara.fish/community/docs/5.2020.5/documentation/user-guides/upgrade-payara.html) diff --git a/doc/sphinx-guides/source/installation/prerequisites.rst b/doc/sphinx-guides/source/installation/prerequisites.rst index 3e9e2fa879e..c581306b143 100644 --- a/doc/sphinx-guides/source/installation/prerequisites.rst +++ b/doc/sphinx-guides/source/installation/prerequisites.rst @@ -47,7 +47,7 @@ If you don't want to be prompted, here is an example of the non-interactive invo Payara ------ -Payara 5.2020.2 is recommended. Newer versions might work fine. +Payara 5.2020.6 is recommended. Newer versions might work fine, regular updates are recommended. Installing Payara ================= @@ -58,8 +58,8 @@ Installing Payara - Download and install Payara (installed in ``/usr/local/payara5`` in the example commands below):: - # wget https://github.com/payara/Payara/releases/download/payara-server-5.2020.2/payara-5.2020.2.zip - # unzip payara-5.2020.2.zip + # wget https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2020.6/payara-5.2020.6.zip + # unzip payara-5.2020.6.zip # mv payara5 /usr/local If you intend to install and run Payara under a service account (and we hope you do), chown -R the Payara hierarchy to root to protect it but give the service account access to the below directories: diff --git a/pom.xml b/pom.xml index 37e78b30933..2f568926c78 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ false 8.0.0 - 5.2020.2 + 5.2020.6 1.11.762 1.2 4.5.5 From 7bdbb7c30fff98e709bf81e2f22fb70ea3ef681f Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Tue, 17 Nov 2020 19:58:40 +0100 Subject: [PATCH 2/3] Change more Payara 5.2020.2 to 5.2020.6. #7417 --- conf/docker-aio/0prep_deps.sh | 4 ++-- conf/docker-aio/c8.dockerfile | 2 +- doc/sphinx-guides/source/developers/dev-environment.rst | 4 ++-- downloads/download.sh | 2 +- scripts/vagrant/setup.sh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/docker-aio/0prep_deps.sh b/conf/docker-aio/0prep_deps.sh index 3255a8d35a6..71398f03a42 100755 --- a/conf/docker-aio/0prep_deps.sh +++ b/conf/docker-aio/0prep_deps.sh @@ -4,10 +4,10 @@ if [ ! -d dv/deps ]; then fi wdir=`pwd` -if [ ! -e dv/deps/payara-5.2020.2.zip ]; then +if [ ! -e dv/deps/payara-5.2020.6.zip ]; then echo "payara dependency prep" # no more fiddly patching :) - wget https://github.com/payara/Payara/releases/download/payara-server-5.2020.2/payara-5.2020.2.zip -O dv/deps/payara-5.2020.2.zip + wget https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2020.6/payara-5.2020.6.zip -O dv/deps/payara-5.2020.6.zip fi if [ ! -e dv/deps/solr-7.7.2dv.tgz ]; then diff --git a/conf/docker-aio/c8.dockerfile b/conf/docker-aio/c8.dockerfile index e5994dbcf95..15c27469988 100644 --- a/conf/docker-aio/c8.dockerfile +++ b/conf/docker-aio/c8.dockerfile @@ -18,7 +18,7 @@ COPY disableipv6.conf /etc/sysctl.d/ RUN rm /etc/httpd/conf/* COPY httpd.conf /etc/httpd/conf RUN cd /opt ; tar zxf /tmp/dv/deps/solr-7.7.2dv.tgz -RUN cd /opt ; unzip /tmp/dv/deps/payara-5.2020.2.zip ; ln -s /opt/payara5 /opt/glassfish4 +RUN cd /opt ; unzip /tmp/dv/deps/payara-5.2020.6.zip ; ln -s /opt/payara5 /opt/glassfish4 # this copy of domain.xml is the result of running `asadmin set server.monitoring-service.module-monitoring-levels.jvm=LOW` on a default glassfish installation (aka - enable the glassfish REST monitir endpoint for the jvm` COPY domain-restmonitor.xml /opt/payara5/glassfish/domains/domain1/config/domain.xml diff --git a/doc/sphinx-guides/source/developers/dev-environment.rst b/doc/sphinx-guides/source/developers/dev-environment.rst index 41ffecffa35..9abfd385c28 100755 --- a/doc/sphinx-guides/source/developers/dev-environment.rst +++ b/doc/sphinx-guides/source/developers/dev-environment.rst @@ -85,9 +85,9 @@ To install Payara, run the following commands: ``cd /usr/local`` -``sudo curl -O -L https://github.com/payara/Payara/releases/download/payara-server-5.2020.2/payara-5.2020.2.zip`` +``sudo curl -O -L https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2020.6/payara-5.2020.6.zip`` -``sudo unzip payara-5.2020.2.zip`` +``sudo unzip payara-5.2020.6.zip`` ``sudo chown -R $USER /usr/local/payara5`` diff --git a/downloads/download.sh b/downloads/download.sh index ef2bd712069..59bbcef9dc8 100755 --- a/downloads/download.sh +++ b/downloads/download.sh @@ -1,5 +1,5 @@ #!/bin/sh -curl -L -O https://github.com/payara/Payara/releases/download/payara-server-5.2020.2/payara-5.2020.2.zip +curl -L -O https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2020.6/payara-5.2020.6.zip curl -L -O https://archive.apache.org/dist/lucene/solr/7.7.2/solr-7.7.2.tgz curl -L -O https://search.maven.org/remotecontent?filepath=org/jboss/weld/weld-osgi-bundle/2.2.10.Final/weld-osgi-bundle-2.2.10.Final-glassfish4.jar curl -s -L http://sourceforge.net/projects/schemaspy/files/schemaspy/SchemaSpy%205.0.0/schemaSpy_5.0.0.jar/download > schemaSpy_5.0.0.jar diff --git a/scripts/vagrant/setup.sh b/scripts/vagrant/setup.sh index 6b74a9b3f9c..8cc2ad466eb 100644 --- a/scripts/vagrant/setup.sh +++ b/scripts/vagrant/setup.sh @@ -43,7 +43,7 @@ SOLR_USER=solr echo "Ensuring Unix user '$SOLR_USER' exists" useradd $SOLR_USER || : DOWNLOAD_DIR='/dataverse/downloads' -PAYARA_ZIP="$DOWNLOAD_DIR/payara-5.2020.2.zip" +PAYARA_ZIP="$DOWNLOAD_DIR/payara-5.2020.6.zip" SOLR_TGZ="$DOWNLOAD_DIR/solr-7.7.2.tgz" if [ ! -f $PAYARA_ZIP ] || [ ! -f $SOLR_TGZ ]; then echo "Couldn't find $PAYARA_ZIP or $SOLR_TGZ! Running download script...." From 40b0b4c7925d7c5bd810d44ba0e786ab8a389b37 Mon Sep 17 00:00:00 2001 From: Oliver Bertuch Date: Wed, 18 Nov 2020 18:08:25 +0100 Subject: [PATCH 3/3] Update doc/release-notes/7417-payara-5.2020.6.md Co-authored-by: Philip Durbin --- doc/release-notes/7417-payara-5.2020.6.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/release-notes/7417-payara-5.2020.6.md b/doc/release-notes/7417-payara-5.2020.6.md index 30c6fd178c8..8377e772b9f 100644 --- a/doc/release-notes/7417-payara-5.2020.6.md +++ b/doc/release-notes/7417-payara-5.2020.6.md @@ -9,4 +9,4 @@ of a running Dataverse deployment. Instructions how to update can be found in the -[Payara documentation](https://docs.payara.fish/community/docs/5.2020.5/documentation/user-guides/upgrade-payara.html) +[Payara documentation](https://docs.payara.fish/community/docs/5.2020.6/documentation/user-guides/upgrade-payara.html)