Merge pull request #569 from informatici/master

Update develop with latest release changes

Author: mwithi

.github/workflows/maven.yml

@@ -3,7 +3,11 @@
 
 name: Java CI with Maven
 
-on: [push, pull_request]
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
 
 env:
   MAVEN_ARGS: '-B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
@@ -27,8 +31,14 @@ jobs:
       - name: Determine PR source branch and fork repository
         id: vars
         run: |
+          # Skip tag pushes entirely
+          if [[ "$GITHUB_EVENT_NAME" == "push" && "$GITHUB_REF" != refs/heads/* ]]; then
+            echo "Not a branch push ($GITHUB_REF). Exiting."
+            exit 0
+          fi
+
           # Set default FORK_REPO and BRANCH_NAME values.
-          BRANCH_NAME="${GITHUB_HEAD_REF:-${GITHUB_REF##*/}}"
+          BRANCH_NAME="${GITHUB_HEAD_REF:-$GITHUB_REF_NAME}"
           
           if [[ "$GITHUB_EVENT_NAME" == "push" && "$GITHUB_REPOSITORY" == "informatici/openhospital-api" ]]; then
             # For pushes to the main repository, default to the main core repo

pom.xml

@@ -18,7 +18,7 @@
 
     <properties>
         <packaging.type>jar</packaging.type>
-        <oh-core.version>1.14.2-SNAPSHOT</oh-core.version>
+        <oh-core.version>1.15.0</oh-core.version>
         <java.version>17</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <license.maven.plugin.version>5.0.0</license.maven.plugin.version>

rsc/log4j2-spring.properties.dist

@@ -13,8 +13,8 @@ appender.console.layout.pattern = [%d{dd/MMM/yyyy HH:mm:ss}] [%X{OHUserGroup}:%X
 # File Appender (with classes), daily rotation
 appender.rolling.type = RollingFile
 appender.rolling.name = RollingFile
-appender.rolling.fileName= LOG_DEST/openhospital.log
-appender.rolling.filePattern= LOG_DEST/openhospital.log.%d{yyyy-MM-dd}
+appender.rolling.fileName= LOG_DEST
+appender.rolling.filePattern= LOG_DEST.%d{yyyy-MM-dd}
 appender.rolling.layout.type = PatternLayout
 appender.rolling.layout.pattern = [%d{dd/MMM/yyyy HH:mm:ss}] [%X{OHUserGroup}:%X{OHUser}] %-p - %m (%l)%n
 appender.rolling.policies.type = Policies