Skip to content

Commit 7919531

Browse files
authored
run builds on java 17 and 18 (#239)
1 parent 79c87c1 commit 7919531

File tree

5 files changed

+15
-19
lines changed

5 files changed

+15
-19
lines changed

.github/workflows/main.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
java_version: ['8', '11', '14']
25+
java_version: ['8', '11', '17', '18']
2626
os: ['ubuntu-20.04']
2727
env:
2828
JAVA_OPTS: "-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
2929
steps:
30-
- uses: actions/checkout@v2
30+
- uses: actions/checkout@v3
3131
- name: Set up JDK
32-
uses: actions/setup-java@v2
32+
uses: actions/setup-java@v3
3333
with:
34-
distribution: "adopt"
34+
distribution: "temurin"
3535
java-version: ${{ matrix.java_version }}
3636
server-id: sonatype-nexus-snapshots
3737
server-username: CI_DEPLOY_USERNAME

.travis.yml

-11
This file was deleted.

datetime/src/test/java/com/fasterxml/jackson/datatype/jsr310/ser/ZonedDateTimeSerTest.java

+8-1
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,14 @@ public void testSerializationAsTimestamp01NegativeSecondsWithDefaults() throws E
114114
ZonedDateTime original = ZonedDateTime.parse("Apr 13 1969 05:05:38.599 UTC", dtf);
115115
String serialized = MAPPER.writeValueAsString(original);
116116
ZonedDateTime deserialized = MAPPER.readValue(serialized, ZonedDateTime.class);
117-
assertEquals("The value is not correct.", original, deserialized);
117+
assertEquals("The day is not correct.", original.getDayOfMonth(), deserialized.getDayOfMonth());
118+
assertEquals("The month is not correct.", original.getMonthValue(), deserialized.getMonthValue());
119+
assertEquals("The year is not correct.", original.getYear(), deserialized.getYear());
120+
assertEquals("The hour is not correct.", original.getHour(), deserialized.getHour());
121+
assertEquals("The minute is not correct.", original.getMinute(), deserialized.getMinute());
122+
assertEquals("The second is not correct.", original.getSecond(), deserialized.getSecond());
123+
assertEquals("The nano is not correct.", original.getNano(), deserialized.getNano());
124+
assertEquals("The time zone is not correct.", ZoneId.of("UTC").getRules(), deserialized.getZone().getRules());
118125
}
119126

120127
@Test

parameter-names/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ introspection of method/constructor parameter names, without having to add expli
2727
<packageVersion.package>${project.groupId}.paramnames</packageVersion.package>
2828

2929
<assertj-core.version>3.8.0</assertj-core.version>
30-
<mockito-core.version>1.10.19</mockito-core.version>
30+
<mockito-core.version>4.5.0</mockito-core.version>
3131
</properties>
3232

3333
<dependencies>

parameter-names/src/test/java/com/fasterxml/jackson/module/paramnames/ParameterNamesAnnotationIntrospectorTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
import org.junit.runner.RunWith;
1010
import org.mockito.BDDMockito;
1111
import org.mockito.Mock;
12-
import org.mockito.runners.MockitoJUnitRunner;
12+
import org.mockito.junit.MockitoJUnitRunner;
1313

1414
import java.lang.reflect.Constructor;
1515
import java.lang.reflect.MalformedParametersException;
1616
import java.lang.reflect.Method;
1717
import java.lang.reflect.Parameter;
1818

1919
import static org.assertj.core.api.BDDAssertions.then;
20+
import static org.mockito.ArgumentMatchers.any;
2021
import static org.mockito.BDDMockito.given;
21-
import static org.mockito.Matchers.any;
2222

2323
/**
2424
* @author Lovro Pandzic

0 commit comments

Comments
 (0)