Skip to content

Commit

Permalink
chore(appserver): update to Payara 5.2021.3 IQSS#7700
Browse files Browse the repository at this point in the history
  • Loading branch information
poikilotherm committed May 17, 2021
1 parent 541a645 commit 2fb09ea
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions conf/docker-aio/0prep_deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ if [ ! -d dv/deps ]; then
fi
wdir=`pwd`

if [ ! -e dv/deps/payara-5.2021.2.zip ]; then
if [ ! -e dv/deps/payara-5.2021.3.zip ]; then
echo "payara dependency prep"
# no more fiddly patching :)
wget https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2021.2/payara-5.2021.2.zip -O dv/deps/payara-5.2021.2.zip
wget https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2021.3/payara-5.2021.3.zip -O dv/deps/payara-5.2021.3.zip
fi

if [ ! -e dv/deps/solr-8.8.1dv.tgz ]; then
Expand Down
2 changes: 1 addition & 1 deletion conf/docker-aio/c8.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,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-8.8.1dv.tgz
RUN cd /opt ; unzip /tmp/dv/deps/payara-5.2021.2.zip ; ln -s /opt/payara5 /opt/glassfish4
RUN cd /opt ; unzip /tmp/dv/deps/payara-5.2021.3.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`
# this dies under Java 11, do we keep it?
Expand Down
6 changes: 3 additions & 3 deletions doc/release-notes/7700-upgrade-payara.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
### Payara 5.2021.2 (or Higher) Required
### Payara 5.2021.3 (or Higher) Required

Some changes in this release require an upgrade to Payara 5.2021.2 or higher.
Some changes in this release require an upgrade to Payara 5.2021.3 or higher.

Instructions on how to update can be found in the
[Payara documentation](https://docs.payara.fish/community/docs/5.2021.2/documentation/user-guides/upgrade-payara.html)
[Payara documentation](https://docs.payara.fish/community/docs/5.2021.3/documentation/user-guides/upgrade-payara.html)

It would likely be safer to upgrade Payara first, while still running Dataverse 5.4, and then proceed with the steps
below. Upgrading from an earlier version of Payara should be a straightforward process:
Expand Down
4 changes: 2 additions & 2 deletions doc/sphinx-guides/source/developers/dev-environment.rst
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,9 @@ To install Payara, run the following commands:

``cd /usr/local``

``sudo curl -O -L https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2021.2/payara-5.2021.2.zip``
``sudo curl -O -L https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2021.3/payara-5.2021.3.zip``

``sudo unzip payara-5.2021.2.zip``
``sudo unzip payara-5.2021.3.zip``

``sudo chown -R $USER /usr/local/payara5``

Expand Down
6 changes: 3 additions & 3 deletions doc/sphinx-guides/source/installation/prerequisites.rst
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ On RHEL/derivative you can make Java 11 the default with the ``alternatives`` co
Payara
------

Payara 5.2021.2 is recommended. Newer versions might work fine, regular updates are recommended.
Payara 5.2021.3 is recommended. Newer versions might work fine, regular updates are recommended.

Installing Payara
=================
Expand All @@ -55,8 +55,8 @@ Installing Payara

- Download and install Payara (installed in ``/usr/local/payara5`` in the example commands below)::

# wget https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2021.2/payara-5.2021.2.zip
# unzip payara-5.2021.2.zip
# wget https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2021.3/payara-5.2021.3.zip
# unzip payara-5.2021.3.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:
Expand Down
2 changes: 1 addition & 1 deletion downloads/download.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh
curl -L -O https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2021.2/payara-5.2021.2.zip
curl -L -O https://s3-eu-west-1.amazonaws.com/payara.fish/Payara+Downloads/5.2021.3/payara-5.2021.3.zip
curl -L -O https://archive.apache.org/dist/lucene/solr/8.8.1/solr-8.8.1.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
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
<skipUnitTests>false</skipUnitTests>

<jakartaee-api.version>8.0.0</jakartaee-api.version>
<payara.version>5.2021.2</payara.version>
<payara.version>5.2021.3</payara.version>
<postgresql.version>42.2.19</postgresql.version>
<aws.version>1.11.762</aws.version>
<commons.logging.version>1.2</commons.logging.version>
Expand Down
2 changes: 1 addition & 1 deletion scripts/vagrant/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ SOLR_USER=solr
echo "Ensuring Unix user '$SOLR_USER' exists"
useradd $SOLR_USER || :
DOWNLOAD_DIR='/dataverse/downloads'
PAYARA_ZIP="$DOWNLOAD_DIR/payara-5.2021.2.zip"
PAYARA_ZIP="$DOWNLOAD_DIR/payara-5.2021.3.zip"
SOLR_TGZ="$DOWNLOAD_DIR/solr-8.8.1.tgz"
if [ ! -f $PAYARA_ZIP ] || [ ! -f $SOLR_TGZ ]; then
echo "Couldn't find $PAYARA_ZIP or $SOLR_TGZ! Running download script...."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
//})
//
// ... but at this time we don't think we need any. The full list
// of properties can be found at https://docs.payara.fish/community/docs/5.2021.2/documentation/payara-server/jdbc/advanced-connection-pool-properties.html#full-list-of-properties
// of properties can be found at https://docs.payara.fish/community/docs/5.2021.3/documentation/payara-server/jdbc/advanced-connection-pool-properties.html#full-list-of-properties
//
// All these properties cannot be configured via MPCONFIG as Payara doesn't support this (yet). To be enhanced.
// See also https://github.com/payara/Payara/issues/5024
Expand Down

0 comments on commit 2fb09ea

Please sign in to comment.