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 Nov 3, 2024
2 parents f6a2aa1 + ee99544 commit b0d69cc
Show file tree
Hide file tree
Showing 11 changed files with 41 additions and 41 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-examples.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
build-examples:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: gradle/wrapper-validation-action@88425854a36845f9c881450d9660b5fd46bee142 # v3.4.2
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
- name: Set up JDK
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
with:
java-version: '17'
distribution: 'adopt'
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ jobs:
- kafka_version: 3.7.0
publish: true
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: gradle/wrapper-validation-action@88425854a36845f9c881450d9660b5fd46bee142 # v3.4.2
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
- name: Fetch version history
# Do NOT want to fetch all tags if building a specific tag.
# Doing so could result in code published with wrong version, if newer tags have been pushed
if: (!startsWith(github.ref, 'refs/tags/'))
run: git fetch --tag --unshallow
- name: Set up JDK
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.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@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: reports-linux-${{ matrix.kafka_version }}
path: '**/build/reports/**/*.xml'
retention-days: 5
- name: Upload Test Results
if: failure()
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: test-results-linux-${{ matrix.kafka_version }}
path: '**/build/test-results/**/*.xml'
Expand Down Expand Up @@ -94,10 +94,10 @@ jobs:
build_windows:
runs-on: windows-latest
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: gradle/wrapper-validation-action@88425854a36845f9c881450d9660b5fd46bee142 # v3.4.2
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
- name: Set up JDK
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.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@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: reports-win
path: '**/build/reports/**/*.xml'
retention-days: 5
- name: Upload Test Results
if: failure()
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
with:
name: test-results-win
path: '**/build/test-results/**/*.xml'
Expand All @@ -129,7 +129,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3.0.0
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.0.0
- name: Create GitHut Release
uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87 # v0.1.15
with:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2

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

- name: Set up JDK
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.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@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
uses: github/codeql-action/analyze@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
6 changes: 3 additions & 3 deletions .github/workflows/dependencies.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ jobs:
contents: write # required to submit dependencies report
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: gradle/wrapper-validation-action@88425854a36845f9c881450d9660b5fd46bee142 # v3.4.2
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: gradle/wrapper-validation-action@f9c9c575b8b21b6485636a91ffecd10e558c62f6 # v3.5.0
- name: Set up JDK
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
with:
java-version: '17'
distribution: 'adopt'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ jobs:
BUNDLE_GEMFILE: ${{ github.workspace }}/docs/Gemfile
steps:
- name: Checkout
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v3.4.0
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v3.4.0
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@7d3497fd78c07c0d84ebafa58d8dac60cd1f0763 # v1.199.0
with:
ruby-version: '3.1'
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/main'
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
token: ${{ secrets.TRIGGER_GITHUB_TOKEN }}
- name: Fetch version history
run: git fetch --tags --unshallow
- name: Set up JDK
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
with:
java-version: '17'
distribution: 'adopt'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:

steps:
- name: "Checkout code"
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false

Expand All @@ -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@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
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@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
uses: github/codeql-action/upload-sarif@662472033e021d55d94146f66f6058822b0b39fd # v3.27.0
with:
sarif_file: results.sarif
4 changes: 2 additions & 2 deletions .github/workflows/version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ jobs:
if: github.ref == 'refs/heads/main'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
token: ${{ secrets.TRIGGER_GITHUB_TOKEN }}
- name: Fetch version history
run: git fetch --tags --unshallow
- name: Set up JDK
uses: actions/setup-java@2dfa2011c5b2a0f1489bf9e433881c92c1631f88 # v4.3.0
uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.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.18.7" // https://plugins.gradle.org/plugin/pl.allegro.tech.build.axion-release
id("pl.allegro.tech.build.axion-release") version "1.18.9" // 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,16 +68,16 @@ 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.2") // https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-annotations
set("jacksonVersion", "2.18.0") // 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.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("log4jVersion", "2.24.1") // https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core
set("guavaVersion", "33.3.1-jre") // https://mvnrepository.com/artifact/com.google.guava/guava
set("junitVersion", "5.11.1") // 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.13.0") // https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
set("mockitoVersion", "5.14.1") // 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
set("confluentVersion", "7.7.1") // https://packages.confluent.io/maven/io/confluent/kafka-schema-registry-client
set("testContainersVersion", "1.19.8") // https://mvnrepository.com/artifact/org.testcontainers/testcontainers
}

Expand Down
6 changes: 3 additions & 3 deletions docs-examples/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ dependencies {
// begin-snippet: streams-test
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.11.0")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.0")
testImplementation("org.hamcrest:hamcrest-core:3.0")
testImplementation("org.junit.jupiter:junit-jupiter-api:5.11.3")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.11.3")
}

// begin-snippet: resolution-strategy
Expand Down
2 changes: 1 addition & 1 deletion json-serde/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ dependencies {
implementation("io.confluent:kafka-schema-registry-client:$confluentVersion")
implementation("io.confluent:kafka-json-schema-provider:$confluentVersion")
constraints {
implementation("org.scala-lang:scala-library:2.13.14") {
implementation("org.scala-lang:scala-library:2.13.15") {
because("lower versions have security vulnerabilities")
}
}
Expand Down

0 comments on commit b0d69cc

Please sign in to comment.