Skip to content

Commit d25073c

Browse files
author
TheSnoozer
authored
Merge pull request #372 from TheSnoozer/master
update dependencies + adding oraclejdk10 to tests
2 parents 88c876a + 532af7b commit d25073c

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ stages:
88
- Integration Test
99

1010
jdk:
11+
- oraclejdk10
1112
- oraclejdk9
1213
- oraclejdk8
1314
- openjdk7
@@ -28,7 +29,7 @@ matrix:
2829
- jdk: oraclejdk9
2930
env: CUSTOM_MVN_VERION="3.5.0"
3031
- jdk: oraclejdk9
31-
env: CUSTOM_MVN_VERION="3.5.2"
32+
env: CUSTOM_MVN_VERION="3.5.4"
3233
- stage: checkstyle
3334
jdk: oraclejdk9
3435
script: mvn clean verify -Pcheckstyle -Dcheckstyle.version=8.2 -Dmaven.test.skip=true -B

pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
<jgit.version>4.5.4.201711221230-r</jgit.version>
6161
<junit.version>4.12</junit.version>
62-
<mockito.version>2.12.0</mockito.version>
62+
<mockito.version>2.19.0</mockito.version>
6363

6464
<fest-assert.version>1.4</fest-assert.version>
6565
</properties>
@@ -88,14 +88,14 @@
8888
<dependency>
8989
<groupId>com.fasterxml.jackson.core</groupId>
9090
<artifactId>jackson-databind</artifactId>
91-
<version>2.9.2</version>
91+
<version>2.9.6</version>
9292
</dependency>
9393

9494
<!-- Joda Time -->
9595
<dependency>
9696
<groupId>joda-time</groupId>
9797
<artifactId>joda-time</artifactId>
98-
<version>2.9.9</version>
98+
<version>2.10</version>
9999
</dependency>
100100

101101
<!-- Guava -->
@@ -166,15 +166,15 @@
166166
<dependency>
167167
<groupId>com.github.stefanbirkner</groupId>
168168
<artifactId>system-rules</artifactId>
169-
<version>1.17.0</version>
169+
<version>1.18.0</version>
170170
<scope>test</scope>
171171
</dependency>
172172

173173
<!--to avoid complaints during tests-->
174174
<dependency>
175175
<groupId>org.slf4j</groupId>
176176
<artifactId>slf4j-simple</artifactId>
177-
<version>1.7.13</version>
177+
<version>1.7.25</version>
178178
<scope>test</scope>
179179
</dependency>
180180
</dependencies>

0 commit comments

Comments
 (0)