Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/docker/handle-occurrence-service/…
Browse files Browse the repository at this point in the history
…amazoncorretto-bc45b73
  • Loading branch information
big-andy-coates authored Sep 16, 2024
2 parents 8234815 + 0b504b7 commit 1f9f68e
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3.2.0
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
- name: Set up JDK
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
with:
java-version: '17'
distribution: 'adopt'
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
if: (!startsWith(github.ref, 'refs/tags/'))
run: git fetch --tag --unshallow
- name: Set up JDK
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
with:
java-version: '17'
distribution: 'adopt'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ jobs:
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v3.2.0

- name: Initialize CodeQL
uses: github/codeql-action/init@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
with:
languages: ${{ matrix.language }}

- name: Set up JDK
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
with:
java-version: '17'
distribution: 'adopt'
Expand All @@ -47,4 +47,4 @@ jobs:
run: ./gradlew test

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@eb055d739abdc2e8de2e5f4ba1a8b246daa779aa # v3.26.0
uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
2 changes: 1 addition & 1 deletion .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
with:
fetch-depth: 0 # need full history to get page last modified times
- name: Setup Ruby
uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.0
uses: ruby/setup-ruby@52753b7da854d5c07df37391a986c76ab4615999 # v1.191.0
with:
ruby-version: '3.1'
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-scripts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
- name: Install zsh
run: sudo apt install zsh
- name: Set up Java
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v3.9.0
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v3.9.0
with:
java-version: '17'
distribution: 'adopt'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Fetch version history
run: git fetch --tags --unshallow
- name: Set up JDK
uses: actions/setup-java@6a0805fcefea3d4657a47ac4c165951e33482018 # v4.2.2
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
with:
java-version: '17'
distribution: 'adopt'
Expand Down
8 changes: 4 additions & 4 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
`module-convention` apply false
`coverage-convention`
`publishing-convention` apply false
id("pl.allegro.tech.build.axion-release") version "1.18.3" // https://plugins.gradle.org/plugin/pl.allegro.tech.build.axion-release
id("pl.allegro.tech.build.axion-release") version "1.18.8" // https://plugins.gradle.org/plugin/pl.allegro.tech.build.axion-release
id("com.bmuschko.docker-remote-api") version "9.4.0" apply false
}

Expand Down Expand Up @@ -36,12 +36,12 @@ subprojects {
set("creekVersion", "0.4.1") // https://mvnrepository.com/artifact/org.creekservice
set("kafkaVersion", "3.7.1") // https://mvnrepository.com/artifact/org.apache.kafka/kafka-clients
set("spotBugsVersion", "4.4.2") // https://mvnrepository.com/artifact/com.github.spotbugs/spotbugs-annotations
set("guavaVersion", "33.2.1-jre") // https://mvnrepository.com/artifact/com.google.guava/guava
set("guavaVersion", "33.3.0-jre") // https://mvnrepository.com/artifact/com.google.guava/guava
set("log4jVersion", "2.23.1") // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core

set("junitVersion", "5.10.3") // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
set("junitVersion", "5.11.0") // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
set("junitPioneerVersion", "2.2.0") // https://mvnrepository.com/artifact/org.junit-pioneer/junit-pioneer
set("mockitoVersion", "5.12.0") // https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
set("mockitoVersion", "5.13.0") // https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
set("hamcrestVersion", "3.0") // https://mvnrepository.com/artifact/org.hamcrest/hamcrest-core
}

Expand Down

0 comments on commit 1f9f68e

Please sign in to comment.