Skip to content

Commit

Permalink
Merge pull request #795 from commercetools/renovate/all
Browse files Browse the repository at this point in the history
fix(deps): update all dependencies
  • Loading branch information
kodiakhq[bot] authored Feb 4, 2025
2 parents 51aa295 + 9170b86 commit cfd494e
Show file tree
Hide file tree
Showing 24 changed files with 72 additions and 72 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ jobs:
if: github.event_name == 'push' && github.ref != 'refs/heads/main'
run: ./gradlew spotlessApply

- uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
- uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
id: commit_style_fix
if: github.event_name == 'push' && github.ref != 'refs/heads/main'
with:
Expand All @@ -75,7 +75,7 @@ jobs:
env:
HASH: ${{steps.commit_style_fix.outputs.commit_hash}}

- uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
- uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
id: commit_rev_ignore
if: github.event_name == 'push' && github.ref != 'refs/heads/main'
with:
Expand All @@ -94,7 +94,7 @@ jobs:
if: ${{ failure() }}
run: cat licenses/dependencies-without-allowed-license.json

- uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
- uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
id: commit_license_change
if: github.event_name == 'push' && github.ref != 'refs/heads/main'
with:
Expand Down Expand Up @@ -190,6 +190,6 @@ jobs:
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
- name: Generate and submit dependency graph
if: github.event_name == 'workflow_dispatch' || github.event_name == 'push' && github.ref == 'refs/heads/main'
uses: gradle/actions/dependency-submission@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
uses: gradle/actions/dependency-submission@94baf225fe0a508e581a564467443d0e2379123b # v4.3.0
with:
github-token: ${{ steps.generate_github_token.outputs.token }}
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
uses: github/codeql-action/init@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -68,7 +68,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
uses: github/codeql-action/autobuild@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -81,6 +81,6 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
uses: github/codeql-action/analyze@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
with:
category: "/language:${{matrix.language}}"
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:

- run: rsync -r sdk/build/docs/javadoc/ doc/javadoc

- uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
- uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
with:
repository: doc
commit_message: "Update javadoc"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ jobs:
run: rm -rf reference.txt
continue-on-error: true

- uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
- uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
with:
branch: after-release
commit_message: "TASK: Updating version in README"
Expand Down Expand Up @@ -161,7 +161,7 @@ jobs:

- run: rsync -r sdk/build/docs/javadoc/ doc/javadoc

- uses: stefanzweifel/git-auto-commit-action@8621497c8c39c72f3e2a999a26b4ca1b5058a842 # v5.0.1
- uses: stefanzweifel/git-auto-commit-action@e348103e9026cc0eee72ae06630dbe30c8bf7a79 # v5.1.0
with:
repository: doc
commit_message: "Update javadoc"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/scorecard.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@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.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@48ab28a6f5dbc2a99bf1e0131198dd8f1df78169 # v3.28.0
uses: github/codeql-action/upload-sarif@dd746615b3b9d728a6a37ca2045b68ca76d4841a # v3.28.8
with:
sarif_file: results.sarif
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ plugins {
id 'io.github.gradle-nexus.publish-plugin' version '1.3.0'
id 'com.github.jk1.dependency-license-report' version '2.0'

id "me.champeau.jmh" version "0.7.2"
id "me.champeau.jmh" version "0.7.3"
id "jacoco"

id "versioning"
Expand Down Expand Up @@ -66,7 +66,7 @@ allprojects {

configurations {
taglet {
resolutionStrategy.force("net.sourceforge.plantuml:plantuml:1.2024.8")
resolutionStrategy.force("net.sourceforge.plantuml:plantuml:1.2025.0")
}
}

Expand Down
4 changes: 2 additions & 2 deletions commercetools/commercetools-apachehttp-client/build.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

dependencies {
api project(":rmf:rmf-java-base")
api "org.apache.httpcomponents.client5:httpclient5:5.4.1" version {
api "org.apache.httpcomponents.client5:httpclient5:5.4.2" version {
strictly "[5.4.1,6.0["
prefer "5.4.1"
prefer "5.4.2"
}

api commons.io version commons.io_version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ public class SolutionInfoTest {
public void version() {
String version = new ApacheHttpClientSolutionInfo().getVersion();

Assertions.assertThat(version).isEqualTo("5.4.1");
Assertions.assertThat(version).startsWith("5.4.");
}
}
10 changes: 5 additions & 5 deletions commercetools/commercetools-async-http-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ dependencies {
api project(":rmf:rmf-java-base")
api "org.asynchttpclient:async-http-client:2.12.4"
api commons.io version commons.io_version
api "io.netty:netty-codec:4.1.116.Final"
api "io.netty:netty-codec-http:4.1.116.Final"
api "io.netty:netty-codec-socks:4.1.116.Final"
api "io.netty:netty-handler-proxy:4.1.116.Final"
api "io.netty:netty-handler:4.1.116.Final"
api "io.netty:netty-codec:4.1.117.Final"
api "io.netty:netty-codec-http:4.1.117.Final"
api "io.netty:netty-codec-socks:4.1.117.Final"
api "io.netty:netty-handler-proxy:4.1.117.Final"
api "io.netty:netty-handler:4.1.117.Final"
implementation javax.validation
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ public class SolutionInfoTest {
public void version() {
String version = new AsyncHttpClientSolutionInfo().getVersion();

Assertions.assertThat(version).isEqualTo("2.12.4");
Assertions.assertThat(version).startsWith("2.12.");
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

dependencies {
api project(":rmf:rmf-java-base")
implementation 'com.newrelic.agent.java:newrelic-api:8.17.0'
implementation 'com.newrelic.agent.java:newrelic-api:8.18.0'

testImplementation project(":commercetools:commercetools-sdk-java-api")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

dependencies {
api project(":rmf:rmf-java-base")
implementation 'io.opentelemetry:opentelemetry-api:1.45.0'
implementation 'io.opentelemetry:opentelemetry-api:1.46.0'

testImplementation project(":commercetools:commercetools-sdk-java-api")
}
Expand Down
2 changes: 1 addition & 1 deletion commercetools/commercetools-okhttp-client3/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jmh {
dependencies {
api project(":rmf:rmf-java-base")

implementation "com.squareup.okio:okio:3.9.1"
implementation "com.squareup.okio:okio:3.10.2"
api "com.squareup.okhttp3:okhttp:3.14.9" version {
strictly "[3.0,4.0["
prefer "3.14.9"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ public class SolutionInfoTest {
public void version() {
String version = new OkHttpClientSolutionInfo().getVersion();

Assertions.assertThat(version).isEqualTo("3.14.9");
Assertions.assertThat(version).startsWith("3.14.");
}
}
2 changes: 1 addition & 1 deletion commercetools/commercetools-okhttp-client4/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ dependencies {
strictly '[4.0,5.0['
prefer "4.12.0"
}
implementation "com.squareup.okio:okio:3.9.1"
implementation "com.squareup.okio:okio:3.10.2"

implementation javax.validation
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ public class SolutionInfoTest {
public void version() {
String version = new OkHttpClientSolutionInfo().getVersion();

Assertions.assertThat(version).isEqualTo("4.12.0");
Assertions.assertThat(version).startsWith("4.12.");
}
}
4 changes: 2 additions & 2 deletions commercetools/commercetools-reactornetty-client/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
dependencies {
api project(":rmf:rmf-java-base")

api "io.projectreactor.netty:reactor-netty-http:1.2.1"
api "io.projectreactor.netty:reactor-netty-core:1.2.1"
api "io.projectreactor.netty:reactor-netty-http:1.2.2"
api "io.projectreactor.netty:reactor-netty-core:1.2.2"

implementation javax.validation
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ public class SolutionInfoTest {
public void version() {
String version = new NettyHttpClientSolutionInfo().getVersion();

Assertions.assertThat(version).isEqualTo("1.2.1");
Assertions.assertThat(version).startsWith("1.2.");
}
}
4 changes: 2 additions & 2 deletions commercetools/commercetools-sdk-compat-v1/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ dependencies {
api project(':commercetools:commercetools-sdk-java-api')
api ctsdkv1.client version ctsdkv1.version
api ctsdkv1.models version ctsdkv1.version
api "io.netty:netty-codec:4.1.116.Final"
api "io.netty:netty-codec-http:4.1.116.Final"
api "io.netty:netty-codec:4.1.117.Final"
api "io.netty:netty-codec-http:4.1.117.Final"

jmhImplementation project(':commercetools:commercetools-async-http-client')
jmhImplementation project(':commercetools:commercetools-apachehttp-client')
Expand Down
4 changes: 2 additions & 2 deletions common-plugins/build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
plugins {
id 'java-gradle-plugin'
id 'idea'
id 'org.jetbrains.kotlin.jvm' version "2.1.0"
id 'org.jetbrains.kotlin.jvm' version "2.1.10"
}

repositories {
Expand Down Expand Up @@ -30,7 +30,7 @@ gradlePlugin {

dependencies {
implementation project(path: ':javaparser', configuration: 'shadow')
implementation "com.google.code.gson:gson:2.11.0"
implementation "com.google.code.gson:gson:2.12.1"
implementation 'com.squareup:javapoet:1.13.0'
implementation 'com.google.guava:guava:33.4.0-jre'
}
6 changes: 3 additions & 3 deletions gradle-scripts/extensions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ ext {

google = [
findbugs: 'com.google.code.findbugs:jsr305:3.0.2',
gson: 'com.google.code.gson:gson:2.11.0',
gson: 'com.google.code.gson:gson:2.12.1',
]

graphql = [
Expand All @@ -47,14 +47,14 @@ ext {
]

javax = [
validation: 'jakarta.validation:jakarta.validation-api:3.1.0',
validation: 'jakarta.validation:jakarta.validation-api:3.1.1',
]

junit = [
junit: 'org.junit.jupiter:junit-jupiter:5.11.4',
dataprovider: 'com.tngtech.junit.dataprovider:junit-jupiter-dataprovider:2.10',
jsonassert: 'org.skyscreamer:jsonassert:1.5.3',
assertj: 'org.assertj:assertj-core:3.27.2'
assertj: 'org.assertj:assertj-core:3.27.3'
]

mockito = [
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"packageManager": "[email protected]",
"dependencies": {
"husky": "9.1.7",
"lint-staged": "15.3.0"
"lint-staged": "15.4.3"
},
"scripts": {
"postinstall": "husky install",
Expand Down
Loading

0 comments on commit cfd494e

Please sign in to comment.