Skip to content

Commit cb2ac9d

Browse files
committed
Merge master
2 parents b5578a2 + fc30fa5 commit cb2ac9d

4 files changed

Lines changed: 9 additions & 7 deletions

File tree

.github/workflows/build-and-test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ jobs:
1515
with:
1616
distribution: temurin
1717
java-version: 8
18+
1819
- name: Set up Gradle
1920
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
2021

.github/workflows/gradle-wrapper-validation.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ jobs:
66
name: "validation/gradlew"
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v3
10-
- uses: gradle/wrapper-validation-action@8d49e559aae34d3e0eb16cde532684bc9702762b # pin@1.0.6
9+
- uses: actions/checkout@v4
10+
- uses: gradle/actions/wrapper-validation@v4

.github/workflows/rl-secure.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@ jobs:
4242
distribution: temurin
4343
java-version: ${{ inputs.java-version }}
4444

45-
- name: Build with Gradle
45+
- name: Set up Gradle
4646
uses: gradle/actions/setup-gradle@06832c7b30a0129d7fb559bcc6e43d26f6374244 # v4.3.1
47-
with:
48-
arguments: assemble apiDiff check jacocoTestReport --continue --console=plain
47+
48+
- name: Test and Assemble and ApiDiff with Gradle
49+
run: ./gradlew assemble apiDiff check jacocoTestReport --continue --console=plain
4950

5051
- name: Get Artifact Version
5152
id: get_version

build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ ext {
117117

118118
dependencies {
119119
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version:'2.15.0'
120-
implementation (group: 'com.google.guava', name: 'guava', version:'32.1.1-jre') {
120+
implementation (group: 'com.google.guava', name: 'guava', version:'32.1.2-jre') {
121121
// needed due to https://github.com/google/guava/issues/6654
122122
exclude group: "org.mockito", module: "mockito-core"
123123
}
@@ -135,4 +135,4 @@ sourceSets.all {
135135
configurations.getByName(compileClasspathConfigurationName) {
136136
attributes.attribute(Attribute.of("org.gradle.jvm.environment", String), "standard-jvm")
137137
}
138-
}
138+
}

0 commit comments

Comments
 (0)