Skip to content

Commit 6b3d3be

Browse files
authored
fix(version): update spring-boot-dependencies to 2.4.5 (#296)
* fix(version): update spring-boot-dependencies to 2.4.5 * fix: add junit-vintage-engine to build * fix: reference to assertThat is ambiguous * fix(travis): disable download progress
1 parent abd50be commit 6b3d3be

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
language: java
22
sudo: required
33

4+
env:
5+
- MAVEN_OPT=-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
6+
47
jdk:
58
- openjdk8
69
- openjdk11

graphql-jpa-query-build/pom.xml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<dependency>
3636
<groupId>org.springframework.boot</groupId>
3737
<artifactId>spring-boot-dependencies</artifactId>
38-
<version>2.3.1.RELEASE</version>
38+
<version>2.4.5</version>
3939
<type>pom</type>
4040
<scope>import</scope>
4141
</dependency>
@@ -69,6 +69,18 @@
6969
<scope>test</scope>
7070
</dependency>
7171

72+
<dependency>
73+
<groupId>org.junit.vintage</groupId>
74+
<artifactId>junit-vintage-engine</artifactId>
75+
<scope>test</scope>
76+
<exclusions>
77+
<exclusion>
78+
<groupId>org.hamcrest</groupId>
79+
<artifactId>hamcrest-core</artifactId>
80+
</exclusion>
81+
</exclusions>
82+
</dependency>
83+
7284
<dependency>
7385
<groupId>org.projectlombok</groupId>
7486
<artifactId>lombok</artifactId>
@@ -83,4 +95,4 @@
8395

8496
</dependencies>
8597

86-
</project>
98+
</project>

graphql-jpa-query-introspection/src/test/java/com/introproventures/graphql/jpa/query/introspection/ArrayUtilTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public void testIndexOfObject() {
5353

5454
@Test
5555
public void testAddAll() {
56-
assertThat(ArrayUtil.addAll(null, null)).isNull();
56+
assertThat((boolean[][]) ArrayUtil.addAll(null, null)).isNull();
5757
assertThat(ArrayUtil.addAll(null, new String[] {})).isEqualTo(new String[] {});
5858
assertThat(ArrayUtil.addAll(new String[] {}, null)).isEqualTo(new String[] {});
5959
assertThat(ArrayUtil.addAll(new String[] {}, new String[] {})).isEqualTo(new String[] {});

0 commit comments

Comments
 (0)