Skip to content

Commit 358231d

Browse files
authored
mockito 5.14.2 --> 5.16.0, to fix java23 build (#861)
* bump mockito, if that fixes bytebuddy + java23 issue * just run java tests continually on all branches * recover ci-java * bump jackson to force java23-compatible byte-buddy * bump lombok; 1.18.36 is what they say adds jdk23, support, although our current version is working
1 parent fec0881 commit 358231d

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

.github/workflows/ci-java-all.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ name: CI - java
99
on:
1010
push: # mainline + rc's only
1111
branches:
12+
- '**' # as of March 2025, I think worth doing for all branches
1213
- 'main'
1314
- 'rc-*'
1415

1516
jobs:
16-
1717
# Java 17 - supported until 30 Sept 2026; same as our default build as of Apr 2023
1818
ci_java17:
1919
uses: ./.github/workflows/build-java.yaml

.github/workflows/ci-java.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
name: CI - Java
22

3+
# deprecated, but still a required check in the repo - so leave for now although its redundant
4+
35
# CI for our project as a GitHub action
46
# see https://help.github.com/en/actions/language-and-framework-guides/building-and-testing-java-with-maven
57
on:

java/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
<properties>
1313
<revision>0.5.1</revision>
1414
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
15-
<dependency.lombok.version>1.18.30</dependency.lombok.version> <!-- 1.18.30 is min compatible with jdk 21+ -->
15+
<dependency.lombok.version>1.18.36</dependency.lombok.version> <!-- 1.18.30 is min compatible with jdk 21+ -->
1616
<dependency.dagger.version>2.40.5</dependency.dagger.version>
17-
<dependency.jackson.version>2.17.0</dependency.jackson.version>
17+
<dependency.jackson.version>2.18.3</dependency.jackson.version>
1818
<dependency.apache-commons-lang3.version>3.13.0</dependency.apache-commons-lang3.version> <!-- July 2023 release, doesn't actually have constants for java after 17 yet -->
1919
<dependency.apache-commons-csv.version>1.10.0</dependency.apache-commons-csv.version>
2020
<dependency.guava.version>32.0.1-jre</dependency.guava.version>
@@ -24,7 +24,7 @@
2424
<dependency.google-http-client.version>1.43.3</dependency.google-http-client.version>
2525
<dependency.google-auth-library-oauth2-http.version>1.18.0</dependency.google-auth-library-oauth2-http.version>
2626
<dependency.junit-jupiter.version>5.10.1</dependency.junit-jupiter.version>
27-
<dependency.mockito-junit-jupiter.version>5.14.2</dependency.mockito-junit-jupiter.version>
27+
<dependency.mockito-junit-jupiter.version>5.16.0</dependency.mockito-junit-jupiter.version>
2828
<dependency.json-path.version>2.9.0</dependency.json-path.version>
2929
<dependency.bettercloud-vault-java-driver>5.1.0</dependency.bettercloud-vault-java-driver>
3030
</properties>

0 commit comments

Comments
 (0)