Merge pull request #516 from SORMAS-Foundation/HSP-4886-hotfix-versio…

…n-sormas-1-84-0

Hsp 4886 hotfix version sormas 1 84 0

.env

@@ -1,9 +1,9 @@
 SORMAS_POSTGRES_PASSWORD=password
 SORMAS_POSTGRES_USER=sormas_user
 
-SORMAS_DOCKER_VERSION=2.44.0-rc1
-SORMAS_VERSION=1.83.1
-SORMAS_DEMIS_VERSION=1.28.0
+SORMAS_DOCKER_VERSION=2.45.0-rc1
+SORMAS_VERSION=1.84.0
+SORMAS_DEMIS_VERSION=1.29.0
 
 SORMAS_SERVER_URL=sormas-docker-test.com
 SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/

.github/workflows/pre-release.yml

@@ -31,4 +31,4 @@ jobs:
             DEMIS: ${{ env.DEMIS_VERSION }}
 
             ## Application release notes
-            https://github.com/hzi-braunschweig/SORMAS-Project/releases/tag/v${{ env.SORMAS_VERSION }}
+            https://github.com/sormas-foundation/SORMAS-Project/releases/tag/v${{ env.SORMAS_VERSION }}

.github/workflows/release.yml

@@ -31,4 +31,4 @@ jobs:
             DEMIS: ${{ env.DEMIS_VERSION }}
 
             ## Application release notes
-            https://github.com/hzi-braunschweig/SORMAS-Project/releases/tag/v${{ env.SORMAS_VERSION }}
+            https://github.com/sormas-foundation/SORMAS-Project/releases/tag/v${{ env.SORMAS_VERSION }}

Jenkinsfile

@@ -5,13 +5,13 @@ node {
 
 
     stage('checkout') {
-        git branch: '${BRANCH}', url: 'https://github.com/hzi-braunschweig/SORMAS-Docker.git'
+        git branch: '${BRANCH}', url: 'https://github.com/sormas-foundation/SORMAS-Docker.git'
     }
 
     stage('set variables') {
         echo 'Setting variables'
         SORMAS_VERSION_NIGHTLY= sh (
-        	script: 'curl -s https://raw.githubusercontent.com/hzi-braunschweig/SORMAS-Project/development/sormas-base/pom.xml | grep SNAPSHOT | sed s/\\<version\\>// | sed s/\\<\\\\/version\\>// | sed \'s/[[:space:]]//g\'', 
+        	script: 'curl -s https://raw.githubusercontent.com/sormas-foundation/SORMAS-Project/development/sormas-base/pom.xml | grep SNAPSHOT | sed s/\\<version\\>// | sed s/\\<\\\\/version\\>// | sed \'s/[[:space:]]//g\'', 
         	returnStdout: true
         ).trim()
         if (params.BUILD_NIGHTLY != null && params.BUILD_NIGHTLY) {

Jenkinsfile_pgdump-only

@@ -3,7 +3,7 @@ node {
     def SORMAS_VERSION=''
 
     stage('checkout') {
-        git branch: '${BRANCH}', url: 'https://github.com/hzi-braunschweig/SORMAS-Docker.git'
+        git branch: '${BRANCH}', url: 'https://github.com/sormas-foundation/SORMAS-Docker.git'
     }
 
     stage('set variables') {
@@ -12,7 +12,7 @@ node {
 	sh "sed -i 's,SORMAS_DOCKER_VERSION=.*\$,SORMAS_DOCKER_VERSION=DEVOPS,' ./.env"
 	sh "sed -i '/^GEO_TEMPLATE/d ' ./.env"
         SORMAS_VERSION= sh (
-          script: 'curl -s https://raw.githubusercontent.com/hzi-braunschweig/SORMAS-Project/development/sormas-base/pom.xml | grep SNAPSHOT | sed s/\\<version\\>// | sed s/\\<\\\\/version\\>// | sed \'s/[[:space:]]//g\'',
+          script: 'curl -s https://raw.githubusercontent.com/sormas-foundation/SORMAS-Project/development/sormas-base/pom.xml | grep SNAPSHOT | sed s/\\<version\\>// | sed s/\\<\\\\/version\\>// | sed \'s/[[:space:]]//g\'',
           returnStdout: true
         ).trim()
         echo "${SORMAS_VERSION}"

Jenkinsfile_pushContainer

@@ -1,7 +1,7 @@
 node { 
 
     stage('checkout') {
-        git branch: '${BRANCH}', url: 'https://github.com/hzi-braunschweig/SORMAS-Docker.git'
+        git branch: '${BRANCH}', url: 'https://github.com/sormas-foundation/SORMAS-Docker.git'
     }
 
 

README.md

@@ -22,7 +22,7 @@ For production usage, ONLY checkout from the release tags, because only these co
 **SORMAS** (Surveillance Outbreak Response Management and Analysis System) is an open source eHealth system - consisting of separate web and mobile apps - that is geared towards optimizing the processes used in monitoring the spread of infectious diseases and responding to outbreak situations.
 
 ## Project Objectives
-This project aims to build docker images for the SORMAS application (https://github.com/hzi-braunschweig/SORMAS-Project)
+This project aims to build docker images for the SORMAS application (https://github.com/sormas-foundation/SORMAS-Project)
 
 ## Firewall
 
@@ -58,11 +58,11 @@ name: admin
 pw: sadmin
 
 All default users are listed here:
-https://github.com/hzi-braunschweig/SORMAS-Project/blob/master/docs/SERVER_UPDATE.md#default-logins
+https://github.com/sormas-foundation/SORMAS-Project/blob/master/docs/SERVER_UPDATE.md#default-logins
 
 If you wish to provide a demologin page, copy the demologin.html to the custom folder (this page uses the default logins):
 ```
-wget https://raw.githubusercontent.com/hzi-braunschweig/SORMAS-Project/master/sormas-base/setup/demologinmain.html -P /srv/dockerdata/sormas/custom
+wget https://raw.githubusercontent.com/sormas-foundation/SORMAS-Project/master/sormas-base/setup/demologinmain.html -P /srv/dockerdata/sormas/custom
 ```
 
 ## Advanced Installation
@@ -89,7 +89,7 @@ These Options are available to customize the installation:
 ### SORMAS
 **SORMAS_VERSION** Version of SORMAS that should be installed (Dockerimages are provided starting from the Version 1.33.0)
 
-**SORMAS_DOCKER_VERSION** Version of dockerimages (see https://github.com/hzi-braunschweig/SORMAS-Docker/releases for all release)
+**SORMAS_DOCKER_VERSION** Version of dockerimages (see https://github.com/sormas-foundation/SORMAS-Docker/releases for all release)
 
 **SORMAS_SERVER_URL** URL under which the SORMAS installation should be accessed
 

apache2/Dockerfile

@@ -1,11 +1,11 @@
 FROM httpd:2.4-alpine as build
 ARG SORMAS_SERVER_URL
 
-ARG SORMAS_VERSION=1.83.1
+ARG SORMAS_VERSION=1.84.0
 ARG MOD_AUTH_OPENIDC_VERSION=2.4.11.3
 
 ENV SORMAS_VERSION=$SORMAS_VERSION
-ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/
+ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/
 
 
 
@@ -36,11 +36,11 @@ RUN cd /usr/src/apache2/mod_auth_openidc-${MOD_AUTH_OPENIDC_VERSION}/ && ls -la
 
 FROM httpd:2.4-alpine
 ARG SORMAS_SERVER_URL
-ARG SORMAS_VERSION=1.83.1
+ARG SORMAS_VERSION=1.84.0
 
 
 ENV SORMAS_VERSION=$SORMAS_VERSION
-ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/
+ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/
 
 RUN apk update --no-cache && \
     apk upgrade --no-cache && \

build_lbds.Jenkinsfile

@@ -5,7 +5,7 @@ node {
 
 
     stage('checkout') {
-        git branch: '${BRANCH}', url: 'https://github.com/hzi-braunschweig/SORMAS-Docker.git'
+        git branch: '${BRANCH}', url: 'https://github.com/sormas-foundation/SORMAS-Docker.git'
     }
 
 

build_polling_github.Jenkinsfile

@@ -1,7 +1,7 @@
 node {
 
     stage('checkout') {
-        git branch: '${BRANCH}', url: 'https://github.com/hzi-braunschweig/SORMAS-Docker.git'
+        git branch: '${BRANCH}', url: 'https://github.com/sormas-foundation/SORMAS-Docker.git'
     }
 
     stage('set variables') {

keycloak/Dockerfile

@@ -4,7 +4,7 @@ USER root
 RUN microdnf update && microdnf install -y wget unzip
 
 ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/
-ARG SORMAS_VERSION=1.83.1
+ARG SORMAS_VERSION=1.84.0
 
 RUN cd /tmp && \
     wget ${SORMAS_URL}v${SORMAS_VERSION}/sormas_${SORMAS_VERSION}.zip -O sormas.zip && \

keycloak/README.md

@@ -80,7 +80,7 @@ After deploy the following configurations have to be done from the Keycloak Admi
 
 ### Keycloak Configuration Upgrade
 
-Keycloak configurations changes usually are part of the [SORMAS.json](https://github.com/hzi-braunschweig/SORMAS-Project/blob/development/sormas-base/setup/keycloak/SORMAS.json) file.
+Keycloak configurations changes usually are part of the [SORMAS.json](https://github.com/sormas-foundation/SORMAS-Project/blob/development/sormas-base/setup/keycloak/SORMAS.json) file.
 
 The SORMAS Keycloak image automatically adds any new realm resources by running the [update-realm.sh](update-realm.sh) script at startup.
 This only imports new resources and doesn't remove/update existing resources.

lbds/Jenkinsfile

@@ -2,7 +2,7 @@ node {
 
 
     stage('checkout') {
-        git branch: '${BRANCH}', url: 'https://github.com/hzi-braunschweig/SORMAS-Docker.git'
+        git branch: '${BRANCH}', url: 'https://github.com/sormas-foundation/SORMAS-Docker.git'
     }
 
     stage('Build') {

letsencrypt/Dockerfile

@@ -3,9 +3,9 @@ FROM lsiobase/nginx:3.11
 # set version label
 
 ARG CERTBOT_VERSION=1.3.0
-ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/
+ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/
 
-ARG SORMAS_VERSION=1.83.1
+ARG SORMAS_VERSION=1.84.0
 
 
 ENV SORMAS_VERSION=$SORMAS_VERSION

payara/Dockerfile

@@ -11,4 +11,4 @@ RUN wget --no-check-certificate -O /tmp/payara-5.2021.10.zip "https://search.mav
   && rm /tmp/payara-5.2021.10.zip
 
 # remove this below patch after upgraded Payara to higher than 5.2021.10 once (No valid EE environment) is FIXED
-RUN wget --no-check-certificate -O /opt/payara5/glassfish/modules/weld-integration.jar "https://raw.githubusercontent.com/hzi-braunschweig/SORMAS-Project/development/sormas-base/setup/glassfish-modules/weld-integration.jar"
+RUN wget --no-check-certificate -O /opt/payara5/glassfish/modules/weld-integration.jar "https://raw.githubusercontent.com/sormas-foundation/SORMAS-Project/development/sormas-base/setup/glassfish-modules/weld-integration.jar"

sormas/Dockerfile

@@ -11,10 +11,10 @@ ARG DB_NAME_AUDIT=sormas_audit
 ARG MAIL_HOST=localhost
 ARG MAIL_FROM=sormas@localhost
 ARG JVM_MAX=4096m
-ARG SORMAS_URL=https://github.com/hzi-braunschweig/SORMAS-Project/releases/download/
+ARG SORMAS_URL=https://github.com/sormas-foundation/SORMAS-Project/releases/download/
 EXPOSE 6080
 
-ARG SORMAS_VERSION=1.83.1
+ARG SORMAS_VERSION=1.84.0
 
 
 ENV SORMAS_VERSION=$SORMAS_VERSION

sormas/start-server.sh

@@ -151,7 +151,7 @@ set -e
 
 ${ASADMIN} create-javamail-resource --mailhost ${MAIL_HOST} --mailuser ${EMAIL_SENDER_NAME} --fromaddress ${EMAIL_SENDER_ADDRESS} --auth ${SMTP_AUTH_ENABLED} --enabled ${EMAIL_NOTIFICATION_ENABLED} --property  "mail.smtp.port=${SMTP_PORT}:mail.smtp.auth=${SMTP_AUTH_ENABLED}" mail/MailSession
 
-# Fix for https://github.com/hzi-braunschweig/SORMAS-Project/issues/1759
+# Fix for https://github.com/sormas-foundation/SORMAS-Project/issues/1759
 ${ASADMIN} set configs.config.server-config.thread-pools.thread-pool.http-thread-pool.max-thread-pool-size=500
 # set FQDN for sormas domain
 ${ASADMIN} set configs.config.server-config.http-service.virtual-server.server.hosts=${SORMAS_SERVER_URL}