diff --git a/.github/actions/assemble-test-reports/action.yml b/.github/actions/assemble-test-reports/action.yml index 211aba105cf0..18487db72381 100644 --- a/.github/actions/assemble-test-reports/action.yml +++ b/.github/actions/assemble-test-reports/action.yml @@ -16,7 +16,7 @@ runs: using: "composite" steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 with: fetch-depth: 1 @@ -54,13 +54,13 @@ runs: ./codecov -t ${{ inputs.CODECOV_TOKEN }} -R ${{ github.workspace }}/hapi-fhir-jacoco/target/site/jacoco-aggregate/ - name: Publish test results - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: junit-test-results path: './**/TEST-*.xml' - name: Publish code coverage report - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: code-coverage path: ${{ github.workspace }}/hapi-fhir-jacoco/target/site/jacoco-aggregate/jacoco.xml diff --git a/.github/actions/build-cache/action.yml b/.github/actions/build-cache/action.yml index b2cbf9bfdc1c..0e054c722269 100644 --- a/.github/actions/build-cache/action.yml +++ b/.github/actions/build-cache/action.yml @@ -14,7 +14,7 @@ runs: using: "composite" steps: - name: Set up JDK ${{ inputs.java-version }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: ${{ inputs.java-version }} distribution: "temurin" diff --git a/.github/actions/build-module/action.yml b/.github/actions/build-module/action.yml index c1e58f8bc5e1..e6c37229be73 100644 --- a/.github/actions/build-module/action.yml +++ b/.github/actions/build-module/action.yml @@ -20,7 +20,7 @@ runs: fetch-depth: 1 - name: Set up Java 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: '17' diff --git a/.github/actions/checkstyle-validation/action.yml b/.github/actions/checkstyle-validation/action.yml index 0f717dd4d21d..0a1c83d024c3 100644 --- a/.github/actions/checkstyle-validation/action.yml +++ b/.github/actions/checkstyle-validation/action.yml @@ -32,7 +32,7 @@ runs: key: ${{ inputs.hapi-cache-key }} - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: ${{ inputs.java-version }} diff --git a/.github/actions/generate-module-list/action.yml b/.github/actions/generate-module-list/action.yml index 497ed3ced0ce..7e75846946dd 100644 --- a/.github/actions/generate-module-list/action.yml +++ b/.github/actions/generate-module-list/action.yml @@ -16,7 +16,7 @@ runs: uses: actions/checkout@v4 - name: Set up JDK 17 - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'adopt' java-version: '17' diff --git a/.github/actions/run-tests-and-archive-results/action.yml b/.github/actions/run-tests-and-archive-results/action.yml index 9bb968488091..e0f660a3708f 100644 --- a/.github/actions/run-tests-and-archive-results/action.yml +++ b/.github/actions/run-tests-and-archive-results/action.yml @@ -18,7 +18,7 @@ runs: using: "composite" steps: - name: Set up JDK ${{ inputs.java-version }} - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: java-version: ${{ inputs.java-version }} distribution: 'temurin' @@ -59,7 +59,7 @@ runs: echo "sanitized_name=$sanitized_name" >> $GITHUB_ENV - name: Upload target Directory - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v5 with: name: ${{ env.sanitized_name }} path: '**/target/**' diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 13d066b9e179..1f326bde2afb 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v6 with: # We must fetch at least the immediate parents so that if this is # a pull request then we can checkout the head. @@ -25,7 +25,7 @@ jobs: if: ${{ github.event_name == 'pull_request' }} - name: Setup java - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: distribution: zulu java-version: 17 diff --git a/.github/workflows/compile_against_cdr.yml b/.github/workflows/compile_against_cdr.yml index 0bf3ac09f8d0..89f5e617ee11 100644 --- a/.github/workflows/compile_against_cdr.yml +++ b/.github/workflows/compile_against_cdr.yml @@ -18,7 +18,7 @@ jobs: if: ${{ github.event.pull_request.head.repo.full_name != github.repository }} run: echo "Skipping CDR compilation for fork - this is expected and safe" - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} name: Checkout - name: Install poetry @@ -26,9 +26,9 @@ jobs: run: pipx install poetry - name: Setup Python if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} - uses: actions/setup-python@v4.6.0 + uses: actions/setup-python@v6 with: - python-version: '3.10' + python-version: '3.14' - run: poetry install if: ${{ github.event.pull_request.head.repo.full_name == github.repository }} name: Install Dependencies diff --git a/.github/workflows/parallel-pipeline-build.yml b/.github/workflows/parallel-pipeline-build.yml index 2cf71ea0d3b4..f14863b866c0 100644 --- a/.github/workflows/parallel-pipeline-build.yml +++ b/.github/workflows/parallel-pipeline-build.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Build the Maven cache id: cache-maven @@ -32,7 +32,7 @@ jobs: continue-on-error: true steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Run Checkstyle Validation uses: ./.github/actions/checkstyle-validation @@ -50,7 +50,7 @@ jobs: modules_list: ${{ steps.format-modules.outputs.modules_list }} steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Generate Modules List id: generate_list @@ -82,7 +82,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Run Tests and Archive Results uses: ./.github/actions/run-tests-and-archive-results @@ -99,7 +99,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Assemble Reports uses: ./.github/actions/assemble-test-reports diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index 95b4a29a659c..79d2f2da7251 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -12,11 +12,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Install yq run: | - sudo wget https://github.com/mikefarah/yq/releases/download/v4.40.5/yq_linux_amd64 -O /usr/bin/yq + sudo wget https://github.com/mikefarah/yq/releases/download/v4.49.1/yq_linux_amd64 -O /usr/bin/yq sudo chmod +x /usr/bin/yq - name: Load ignored modules from config diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 211fceff8a62..cd5847334010 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -12,10 +12,10 @@ jobs: steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v6 - name: Set up JDK - uses: actions/setup-java@v4 + uses: actions/setup-java@v5 with: distribution: 'temurin' java-version: '17' @@ -45,11 +45,11 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@v6 - name: Load ignored modules from config id: load_config - uses: mikefarah/yq@v4.40.5 + uses: mikefarah/yq@v4.49.1 with: cmd: > echo "ignored_modules=$(yq '.ignored_modules' .github/config/ignored-modules.yml | tr -d '"')" >> $GITHUB_OUTPUT diff --git a/.github/workflows/spotless.yml b/.github/workflows/spotless.yml index ef21114c4b3f..4f64329a750f 100644 --- a/.github/workflows/spotless.yml +++ b/.github/workflows/spotless.yml @@ -11,9 +11,9 @@ jobs: permissions: pull-requests: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v6 - name: Set up JDK 17 - uses: actions/setup-java@v3 + uses: actions/setup-java@v5 with: java-version: '17' distribution: 'temurin' diff --git a/hapi-fhir-android/.gitignore b/hapi-fhir-android/.gitignore index e69de29bb2d1..8b137891791f 100644 --- a/hapi-fhir-android/.gitignore +++ b/hapi-fhir-android/.gitignore @@ -0,0 +1 @@ + diff --git a/hapi-fhir-jpaserver-uhnfhirtest/.gitignore b/hapi-fhir-jpaserver-uhnfhirtest/.gitignore index be49b6ec8ff5..2b54f7948860 100644 --- a/hapi-fhir-jpaserver-uhnfhirtest/.gitignore +++ b/hapi-fhir-jpaserver-uhnfhirtest/.gitignore @@ -127,4 +127,3 @@ local.properties # TeXlipse plugin .texlipse - diff --git a/hapi-tinder-plugin/.gitignore b/hapi-tinder-plugin/.gitignore index 4c86414cde70..baa523c33a2e 100644 --- a/hapi-tinder-plugin/.gitignore +++ b/hapi-tinder-plugin/.gitignore @@ -1,128 +1,127 @@ -target/ -/bin - -# Created by https://www.gitignore.io - -### Java ### -*.class - -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - -# Package Files # -*.jar -*.war -*.ear - -# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml -hs_err_pid* - - -### Maven ### -target/ -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next -release.properties -dependency-reduced-pom.xml -buildNumber.properties - - -### Vim ### -[._]*.s[a-w][a-z] -[._]s[a-w][a-z] -*.un~ -Session.vim -.netrwhist -*~ - - -### Intellij ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm - -*.iml - -## Directory-based project format: -.idea/ -# if you remove the above rule, at least ignore the following: - -# User-specific stuff: -# .idea/workspace.xml -# .idea/tasks.xml -# .idea/dictionaries - -# Sensitive or high-churn files: -# .idea/dataSources.ids -# .idea/dataSources.xml -# .idea/sqlDataSources.xml -# .idea/dynamic.xml -# .idea/uiDesigner.xml - -# Gradle: -# .idea/gradle.xml -# .idea/libraries - -# Mongo Explorer plugin: -# .idea/mongoSettings.xml - -## File-based project format: -*.ipr -*.iws - -## Plugin-specific files: - -# IntelliJ -/out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties - - - -### Eclipse ### -*.pydevproject -.metadata -.gradle -bin/ -tmp/ -*.tmp -*.bak -*.swp -*~.nib -local.properties -.settings/ -.loadpath - -# Eclipse Core -.project - -# External tool builders -.externalToolBuilders/ - -# Locally stored "Eclipse launch configurations" -*.launch - -# CDT-specific -.cproject - -# JDT-specific (Eclipse Java Development Tools) -.classpath - -# PDT-specific -.buildpath - -# sbteclipse plugin -.target - -# TeXlipse plugin -.texlipse - +target/ +/bin + +# Created by https://www.gitignore.io + +### Java ### +*.class + +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + +# Package Files # +*.jar +*.war +*.ear + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + + +### Maven ### +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties + + +### Vim ### +[._]*.s[a-w][a-z] +[._]s[a-w][a-z] +*.un~ +Session.vim +.netrwhist +*~ + + +### Intellij ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm + +*.iml + +## Directory-based project format: +.idea/ +# if you remove the above rule, at least ignore the following: + +# User-specific stuff: +# .idea/workspace.xml +# .idea/tasks.xml +# .idea/dictionaries + +# Sensitive or high-churn files: +# .idea/dataSources.ids +# .idea/dataSources.xml +# .idea/sqlDataSources.xml +# .idea/dynamic.xml +# .idea/uiDesigner.xml + +# Gradle: +# .idea/gradle.xml +# .idea/libraries + +# Mongo Explorer plugin: +# .idea/mongoSettings.xml + +## File-based project format: +*.ipr +*.iws + +## Plugin-specific files: + +# IntelliJ +/out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties + + + +### Eclipse ### +*.pydevproject +.metadata +.gradle +bin/ +tmp/ +*.tmp +*.bak +*.swp +*~.nib +local.properties +.settings/ +.loadpath + +# Eclipse Core +.project + +# External tool builders +.externalToolBuilders/ + +# Locally stored "Eclipse launch configurations" +*.launch + +# CDT-specific +.cproject + +# JDT-specific (Eclipse Java Development Tools) +.classpath + +# PDT-specific +.buildpath + +# sbteclipse plugin +.target + +# TeXlipse plugin +.texlipse diff --git a/hapi-tinder-test/.gitignore b/hapi-tinder-test/.gitignore index 48875ee9bfb6..05dc0fec6f14 100644 --- a/hapi-tinder-test/.gitignore +++ b/hapi-tinder-test/.gitignore @@ -126,4 +126,3 @@ local.properties # TeXlipse plugin .texlipse - diff --git a/pom.xml b/pom.xml index f5858a17d999..dd8b821df1ab 100644 --- a/pom.xml +++ b/pom.xml @@ -991,10 +991,10 @@ 6.6.7 - 2.41.1 + 2.46.1 **/test/**/*.java -Dfile.encoding=UTF-8 -Xmx2048m - 3.5.2 + 3.5.4 @@ -1012,8 +1012,8 @@ 3.1.8 10.21.1 2.12.1 - 1.15 - 1.26.0 + 1.20.0 + 1.28.0 7.2.1.Final @@ -1053,8 +1053,8 @@ 8.0.0.Final 4.4.16 4.5.14 - 2.20.0 - 2.20.0 + 2.20.1 + 2.20.1 2.20 5.4.3 5.3.1 @@ -1078,7 +1078,7 @@ 9.8.0-15 1.2_5 2.2.30 - 2.0.16 + 2.0.17 2.24.1 6.2.12 2024.0.5 @@ -1112,9 +1112,9 @@ 3.3.0 3.2.1 - 0.8.12 + 0.8.14 3.7.1 - 2.5.0 + 2.7.0 3.5.0 3.6.0 @@ -2532,12 +2532,12 @@ org.apache.maven.plugins maven-clean-plugin - 3.4.0 + 3.5.0 org.apache.maven.plugins maven-compiler-plugin - 3.14.0 + 3.14.1 UTF-8 true @@ -2548,12 +2548,12 @@ org.apache.maven.plugins maven-dependency-plugin - 3.8.1 + 3.9.0 org.sonatype.central central-publishing-maven-plugin - 0.8.0 + 0.9.0 org.apache.maven.plugins @@ -2568,7 +2568,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.2.0 + 3.5.0 org.apache.maven.plugins @@ -2600,7 +2600,7 @@ org.apache.maven.plugins maven-shade-plugin - 3.6.0 + 3.6.1 org.apache.maven.plugins @@ -2631,12 +2631,12 @@ org.apache.maven.plugins maven-war-plugin - 3.4.0 + 3.5.0 org.codehaus.mojo build-helper-maven-plugin - 3.6.0 + 3.6.1 org.codehaus.mojo diff --git a/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml b/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml index 9da7c662cbfe..cdfeaf96784c 100644 --- a/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml +++ b/tests/hapi-fhir-base-test-jaxrsserver-kotlin/pom.xml @@ -172,6 +172,6 @@ - 1.9.23 + 2.2.21