Merge pull request 'Release v24.09' (!347) from release_24.09 into ma…

…ster
intranda · Oct 1, 2024 · 0a03dc9 · 0a03dc9
2 parents af91139 + 7136390
commit 0a03dc9
Show file tree

Hide file tree

Showing 76 changed files with 6,464 additions and 1,780 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -28,6 +28,7 @@ pipeline {
             branch 'master'
             branch 'release_*'
             branch 'hotfix_release_*'
+            branch 'sonar_*'
             allOf {
               branch 'PR-*'
               expression { env.CHANGE_BRANCH.startsWith("release_") }
@@ -55,6 +56,14 @@ pipeline {
         sh 'mvn clean verify -U -P release-build'
       }
     }
+    stage('build-sonar') {
+      when {
+        branch 'sonar_*'
+      }
+      steps {
+        sh 'mvn clean verify -U -P sonar-build'
+      }
+    }
     stage('sonarcloud') {
       when {
         anyOf {
@@ -77,9 +86,9 @@ pipeline {
     stage('deploy') {
       when {
         anyOf {
-        branch 'master'
-        branch 'develop'
-        branch 'hotfix_release_*'
+          branch 'master'
+          branch 'develop'
+          branch 'hotfix_release_*'
         }
       }
       steps {

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -32,7 +32,7 @@ services:
       MYSQL_PASSWORD: goobi
     volumes:
       - type: bind
-        source: ./Goobi/install/db/goobi_blank.sql
+        source: ./install/db/goobi_blank.sql
         target: /docker-entrypoint-initdb.d/goobi_blank.sql
       - type: volume
         source: goobi_dbdata

diff --git a/install/config/goobi_mail.xml b/install/config/goobi_mail.xml
@@ -2,6 +2,7 @@
 <goobiMail>
     <configuration enabled="false">
         <smtpServer>example.com</smtpServer>
+         <smtpPort>25</smtpPort>
         <smtpUser>CHANGEME@example.com</smtpUser>
         <smtpPassword>CHANGEME</smtpPassword>
         <smtpUseStartTls>false</smtpUseStartTls>