Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/dependabot/fetch-m…
Browse files Browse the repository at this point in the history
…etadata-2.2.0
  • Loading branch information
big-andy-coates authored Sep 19, 2024
2 parents 01c201e + 3fd2e83 commit f6a2aa1
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: gradle/wrapper-validation-action@88425854a36845f9c881450d9660b5fd46bee142 # v3.4.2
- name: Set up JDK
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
with:
java-version: '17'
distribution: 'adopt'
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
if: (!startsWith(github.ref, 'refs/tags/'))
run: git fetch --tag --unshallow
- name: Set up JDK
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
with:
java-version: '17'
distribution: 'adopt'
Expand All @@ -57,14 +57,14 @@ jobs:
run: ./gradlew build coveralls
- name: Upload Reports
if: failure()
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: reports-linux-${{ matrix.kafka_version }}
path: '**/build/reports/**/*.xml'
retention-days: 5
- name: Upload Test Results
if: failure()
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: test-results-linux-${{ matrix.kafka_version }}
path: '**/build/test-results/**/*.xml'
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: gradle/wrapper-validation-action@88425854a36845f9c881450d9660b5fd46bee142 # v3.4.2
- name: Set up JDK
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
with:
java-version: '17'
distribution: 'adopt'
Expand All @@ -109,14 +109,14 @@ jobs:
run: ./gradlew.bat build -PexcludeContainerised
- name: Upload Reports
if: failure()
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: reports-win
path: '**/build/reports/**/*.xml'
retention-days: 5
- name: Upload Test Results
if: failure()
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: test-results-win
path: '**/build/test-results/**/*.xml'
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@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6

- name: Initialize CodeQL
uses: github/codeql-action/init@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
with:
languages: ${{ matrix.language }}

- name: Set up JDK
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
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@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
2 changes: 1 addition & 1 deletion .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: gradle/wrapper-validation-action@88425854a36845f9c881450d9660b5fd46bee142 # v3.4.2
- name: Set up JDK
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
with:
java-version: '17'
distribution: 'adopt'
Expand Down
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@0cde4689ba33c09f1b890c1725572ad96751a3fc # v1.178.0
uses: ruby/setup-ruby@a6e6f86333f0a2523ece813039b8b4be04560854 # v1.190.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/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Fetch version history
run: git fetch --tags --unshallow
- name: Set up JDK
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
with:
java-version: '17'
distribution: 'adopt'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,14 @@ jobs:
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
name: SARIF file
path: results.sarif
retention-days: 5

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@f079b8493333aace61c81488f8bd40919487bd9f # v3.25.7
uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Fetch version history
run: git fetch --tags --unshallow
- name: Set up JDK
uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
with:
java-version: '17'
distribution: 'adopt'
Expand Down
14 changes: 7 additions & 7 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ plugins {
`creek-coverage-convention`
`creek-publishing-convention` apply false
`creek-sonatype-publishing-convention`
id("pl.allegro.tech.build.axion-release") version "1.17.2" // https://plugins.gradle.org/plugin/pl.allegro.tech.build.axion-release
id("pl.allegro.tech.build.axion-release") version "1.18.7" // https://plugins.gradle.org/plugin/pl.allegro.tech.build.axion-release
id("com.bmuschko.docker-remote-api") version "9.4.0" apply false
id("org.creekservice.schema.json") version "0.4.2-SNAPSHOT" apply false
}
Expand Down Expand Up @@ -68,13 +68,13 @@ subprojects {
extra.apply {
set("creekVersion", "0.4.2-SNAPSHOT")
set("spotBugsVersion", "4.8.6") // https://mvnrepository.com/artifact/com.github.spotbugs/spotbugs-annotations
set("jacksonVersion", "2.17.1") // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations
set("slf4jVersion", "2.0.13") // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
set("jacksonVersion", "2.17.2") // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations
set("slf4jVersion", "2.0.16") // https://mvnrepository.com/artifact/org.slf4j/slf4j-api
set("log4jVersion", "2.23.1") // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
set("guavaVersion", "33.2.1-jre") // https://mvnrepository.com/artifact/com.google.guava/guava
set("junitVersion", "5.10.2") // https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
set("guavaVersion", "33.3.0-jre") // https://mvnrepository.com/artifact/com.google.guava/guava
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
// Update kafka_version in `.github/workflows/build.yml` when updating this version
set("kafkaVersion", "3.7.0") // https://mvnrepository.com/artifact/org.apache.kafka
set("confluentVersion", "7.6.1") // https://packages.confluent.io/maven/io/confluent/kafka-schema-registry-client
Expand Down Expand Up @@ -108,7 +108,7 @@ subprojects {

dependencies {
constraints {
implementation("org.apache.commons:commons-compress:1.26.2") {
implementation("org.apache.commons:commons-compress:1.27.1") {
because("earlier versions have a security vulnerabilities")
}
}
Expand Down
4 changes: 2 additions & 2 deletions docs-examples/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ dependencies {
testImplementation("org.creekservice:creek-kafka-streams-test:0.4.1")
// end-snippet
testImplementation("org.hamcrest:hamcrest-core:2.2")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.10.2")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.10.2")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.0")
}

// begin-snippet: resolution-strategy
Expand Down

0 comments on commit f6a2aa1

Please sign in to comment.