Skip to content

Commit 3ad699d

Browse files
authored
Merge branch 'main' into sideshowcoder/remove-fork-non-reuse-add-mockito-javaagent
2 parents 8222ef7 + 3a58838 commit 3ad699d

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

.github/workflows/pullrequest.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
cache: maven
3333

3434
- name: Initialize CodeQL
35-
uses: github/codeql-action/init@956c56734d31557279f2769a3368010c321bb452
35+
uses: github/codeql-action/init@ae78991f558bb4195cb8a727cb6679c362b9cf24
3636
with:
3737
languages: java
3838

@@ -58,4 +58,4 @@ jobs:
5858
verbose: true # optional (default = false)
5959

6060
- name: Perform CodeQL Analysis
61-
uses: github/codeql-action/analyze@956c56734d31557279f2769a3368010c321bb452
61+
uses: github/codeql-action/analyze@ae78991f558bb4195cb8a727cb6679c362b9cf24

.github/workflows/static-code-scanning.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ jobs:
3333

3434
# Initializes the CodeQL tools for scanning.
3535
- name: Initialize CodeQL
36-
uses: github/codeql-action/init@956c56734d31557279f2769a3368010c321bb452
36+
uses: github/codeql-action/init@ae78991f558bb4195cb8a727cb6679c362b9cf24
3737
with:
3838
languages: java
3939

4040
- name: Autobuild
41-
uses: github/codeql-action/autobuild@956c56734d31557279f2769a3368010c321bb452
41+
uses: github/codeql-action/autobuild@ae78991f558bb4195cb8a727cb6679c362b9cf24
4242

4343
- name: Perform CodeQL Analysis
44-
uses: github/codeql-action/analyze@956c56734d31557279f2769a3368010c321bb452
44+
uses: github/codeql-action/analyze@ae78991f558bb4195cb8a727cb6679c362b9cf24

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<maven.compiler.source>11</maven.compiler.source>
1414
<maven.compiler.target>${maven.compiler.source}</maven.compiler.target>
1515
<org.mockito.version>5.20.0</org.mockito.version>
16-
<com.vmlens.version>1.2.20</com.vmlens.version>
16+
<com.vmlens.version>1.2.21</com.vmlens.version>
1717
<!-- exclusion expression for e2e tests -->
1818
<testExclusions>**/e2e/*.java</testExclusions>
1919
<module-name>${project.groupId}.${project.artifactId}</module-name>

0 commit comments

Comments
 (0)