Skip to content

Commit e624906

Browse files
authored
Merge branch 'main' into feat/streaming-raw-requests
2 parents ba305be + cc51890 commit e624906

5 files changed

Lines changed: 14 additions & 14 deletions

File tree

.github/workflows/main.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
cache: gradle
3232

3333
- name: Set up Gradle
34-
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
34+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
3535

3636
- name: Test and Build with Gradle
3737
run: ./gradlew build test-integration
@@ -63,10 +63,10 @@ jobs:
6363
distribution: "temurin"
6464

6565
- name: Validate Gradle wrapper
66-
uses: gradle/actions/wrapper-validation@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
66+
uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
6767

6868
- name: Setup Gradle
69-
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
69+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
7070

7171
# Tasks created by https://github.com/gradle-nexus/publish-plugin
7272
- name: Publish package
@@ -96,10 +96,10 @@ jobs:
9696
distribution: "temurin"
9797

9898
- name: Validate Gradle wrapper
99-
uses: gradle/actions/wrapper-validation@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
99+
uses: gradle/actions/wrapper-validation@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
100100

101101
- name: Setup Gradle
102-
uses: gradle/actions/setup-gradle@f29f5a9d7b09a7c6b29859002d29d24e1674c884 # v5.0.1
102+
uses: gradle/actions/setup-gradle@0723195856401067f7a2779048b490ace7a47d7c # v5.0.2
103103

104104
# Tasks created by https://docs.gradle.org/current/userguide/publishing_maven.html
105105
- name: Publish package

.github/workflows/scorecard.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6565
# format to the repository Actions tab.
6666
- name: "Upload artifact"
67-
uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
67+
uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
6868
with:
6969
name: SARIF file
7070
path: results.sarif

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jacocoTestReport {
5555
}
5656

5757
ext {
58-
jackson_version = "2.21.0"
58+
jackson_version = "2.21.1"
5959
}
6060

6161
dependencies {
@@ -80,8 +80,8 @@ testing {
8080
useJUnitJupiter()
8181
dependencies {
8282
implementation 'org.assertj:assertj-core:3.27.7'
83-
implementation 'org.mockito:mockito-core:5.21.0'
84-
implementation 'org.junit.jupiter:junit-jupiter:5.14.2'
83+
implementation 'org.mockito:mockito-core:5.22.0'
84+
implementation 'org.junit.jupiter:junit-jupiter:5.14.3'
8585
implementation 'org.wiremock:wiremock:3.13.2'
8686

8787
runtimeOnly 'org.junit.platform:junit-platform-launcher'

examples/basic-examples/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
plugins {
22
id 'application'
33
id 'com.diffplug.spotless' version '8.0.0'
4-
id 'org.jetbrains.kotlin.jvm' version '2.3.0'
4+
id 'org.jetbrains.kotlin.jvm' version '2.3.10'
55
}
66

77
application {
@@ -30,7 +30,7 @@ dependencies {
3030
implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
3131
implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
3232
implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion")
33-
implementation("org.openapitools:jackson-databind-nullable:0.2.8")
33+
implementation("org.openapitools:jackson-databind-nullable:0.2.9")
3434

3535
// Kotlin
3636
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"

examples/opentelemetry/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ repositories {
7575

7676
ext {
7777
fgaSdkVersion = "0.9.6"
78-
openTelemetryVersion = "1.58.0"
79-
openTelemetryAlphaVersion = "1.58.0-alpha"
78+
openTelemetryVersion = "1.59.0"
79+
openTelemetryAlphaVersion = "1.59.0-alpha"
8080
}
8181

8282
dependencies {
@@ -96,7 +96,7 @@ dependencies {
9696
implementation("io.opentelemetry:opentelemetry-exporter-prometheus:$openTelemetryAlphaVersion")
9797
implementation("io.opentelemetry:opentelemetry-exporter-otlp:$openTelemetryVersion")
9898
implementation("io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:$openTelemetryVersion")
99-
implementation("io.opentelemetry.semconv:opentelemetry-semconv:1.39.0")
99+
implementation("io.opentelemetry.semconv:opentelemetry-semconv:1.40.0")
100100

101101
// Environment variables for this example
102102
implementation("io.github.cdimascio:dotenv-java:3.2.0")

0 commit comments

Comments
 (0)