test with java 21

.circleci/config.yml

@@ -298,10 +298,10 @@ parameters:
     default: false
   java-tag:
     type: string
-    default: "17.0.4-browsers"
+    default: "17.0.5-browsers"
   postgres-tag:
     type: string
-    default: "16.1"
+    default: "16.4"
   python-tag:
     type: string
     default: "3.11"
@@ -461,6 +461,20 @@ commands:
           command: |
             sudo apt-get update -y
             sudo apt-get -o Acquire::Retries=3 install libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb -yq
+#      - run:
+#          name: Swap node versions
+#          command: |
+#            #  https://support.circleci.com/hc/en-us/articles/360051656632-Swap-Node-Version-on-CircleCI-Convenience-Image
+#            set +e
+#            wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.1/install.sh | bash
+#            export NVM_DIR="$HOME/.nvm"
+#            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+#            [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+#            nvm install 18
+#            nvm alias default node
+#
+#            echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV
+#            echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
   setup_integration_test:
     parameters:
       db_dump:
@@ -510,6 +524,20 @@ commands:
   install_ui_dependencies:
     steps:
       - restore_dep_cache
+#      - run:
+#          name: Swap node versions
+#          command: |
+#            #  https://support.circleci.com/hc/en-us/articles/360051656632-Swap-Node-Version-on-CircleCI-Convenience-Image
+#            set +e
+#            wget -qO- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.1/install.sh | bash
+#            export NVM_DIR="$HOME/.nvm"
+#            [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+#            [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
+#            nvm install 18
+#            nvm alias default node
+#
+#            echo 'export NVM_DIR="$HOME/.nvm"' >> $BASH_ENV
+#            echo '[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
       - run:
           name: Install dependencies
           #Only run 'npm ci' if node_modules was not restored from cache
@@ -545,15 +573,15 @@ commands:
           name: Install nginx
           command: sudo apt install -y nginx || true
       - run:
-          name: Prepapre nginx config
+          name: Prepare nginx config
           command: sed "s%REPLACEME%`pwd`%" .circleci/nginx.conf.tmpl > .circleci/nginx.conf
       - run:
           name: Run nginx
           command: sudo nginx -c `pwd`/.circleci/nginx.conf
           background: true
       - run:
           name: Run webservice
-          command: java -jar dockstore-webservice.jar server test/web.yml 1>/dev/null
+          command: java -jar dockstore-webservice.jar server test/web.yml # 1>/dev/null
           background: true
       - run:
           name: Wait for services

.github/workflows/accessibility_test.yml

@@ -46,8 +46,8 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v4
         with:
-          java-version: '17.0.4+8'
-          distribution: 'adopt'
+          java-version: '21.0.4+7'
+          distribution: 'temurin'
 
       - name: Install npm
         uses: actions/setup-node@v4

scripts/wait-for.sh

@@ -3,6 +3,6 @@ set -o errexit
 set -o pipefail
 set -o nounset
 set -o xtrace
-wget --output-document /dev/null --waitretry=5 --tries=10 --retry-connrefused localhost:4200 || true
-wget --output-document /dev/null --waitretry=5 --tries=10 --retry-connrefused localhost:8080 || true
-wget --output-document /dev/null --waitretry=5 --tries=10 --retry-connrefused localhost:9200 || true
+wget --output-document /dev/null --waitretry=10 --tries=20 --retry-connrefused localhost:4200 || true
+wget --output-document /dev/null --waitretry=10 --tries=20 --retry-connrefused localhost:8080 || true
+wget --output-document /dev/null --waitretry=10 --tries=20 --retry-connrefused localhost:9200 || true

test/web.yml

@@ -42,6 +42,14 @@ esconfiguration:
 
 authenticationCachePolicy: maximumSize=10000, expireAfterAccess=10s
 
+localCloudWatchMetrics: true
+
+logging:
+  level: INFO
+  appenders:
+    - type: console
+      logFormat: "%-5p [%d{ISO8601,UTC}] %c: %replace(%msg){'[\\n]','→'}%n%rEx"
+
 database:
   # the name of your JDBC driver
   driverClass: org.postgresql.Driver