Skip to content

Commit 04e0330

Browse files
authored
Merge pull request flipkart-incubator#85 from LouizFC/junit5
Upgraded JUnit to version 5.3.1
2 parents 8cd80ed + 3b799ac commit 04e0330

File tree

2 files changed

+37
-8
lines changed

2 files changed

+37
-8
lines changed

.circleci/config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
build:
88
docker:
99
# specify the version you desire here
10-
- image: circleci/openjdk:8-jdk
10+
- image: circleci/openjdk:11.0.1-jdk
1111

1212
# Specify service dependencies here if necessary
1313
# CircleCI maintains a library of pre-built images

pom.xml

+36-7
Original file line numberDiff line numberDiff line change
@@ -36,22 +36,39 @@
3636

3737
<properties>
3838
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
39+
40+
<compileSource>1.6</compileSource>
41+
<testCompileSource>1.8</testCompileSource>
42+
3943
<jackson.version>2.9.7</jackson.version>
44+
<junit.version>5.3.1</junit.version>
4045
</properties>
4146

4247
<build>
4348
<plugins>
4449
<plugin>
4550
<groupId>org.apache.maven.plugins</groupId>
4651
<artifactId>maven-compiler-plugin</artifactId>
47-
<version>2.3.1</version>
52+
<version>3.8.0</version>
4853
<configuration>
49-
<source>1.6</source>
50-
<target>1.6</target>
54+
<source>${compileSource}</source>
55+
<target>${compileSource}</target>
56+
<testSource>${testCompileSource}</testSource>
57+
<testTarget>${testCompileSource}</testTarget>
5158
<showDeprecation>true</showDeprecation>
5259
<showWarnings>true</showWarnings>
5360
</configuration>
5461
</plugin>
62+
<plugin>
63+
<groupId>org.apache.maven.plugins</groupId>
64+
<artifactId>maven-surefire-plugin</artifactId>
65+
<version>2.22.1</version>
66+
<configuration>
67+
<forkCount>3</forkCount>
68+
<reuseForks>true</reuseForks>
69+
<argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
70+
</configuration>
71+
</plugin>
5572
<plugin>
5673
<groupId>org.apache.maven.plugins</groupId>
5774
<artifactId>maven-source-plugin</artifactId>
@@ -139,10 +156,22 @@
139156
<version>2.4</version>
140157
</dependency>
141158
<dependency>
159+
<groupId>org.junit.jupiter</groupId>
160+
<artifactId>junit-jupiter-engine</artifactId>
161+
<version>${junit.version}</version>
162+
<scope>test</scope>
163+
</dependency>
164+
<dependency>
165+
<groupId>org.junit.jupiter</groupId>
166+
<artifactId>junit-jupiter-params</artifactId>
167+
<version>${junit.version}</version>
168+
<scope>test</scope>
169+
</dependency>
170+
<dependency>
171+
<groupId>org.junit.vintage</groupId>
172+
<artifactId>junit-vintage-engine</artifactId>
173+
<version>${junit.version}</version>
142174
<scope>test</scope>
143-
<groupId>junit</groupId>
144-
<artifactId>junit</artifactId>
145-
<version>4.12</version>
146175
</dependency>
147176
</dependencies>
148177
<distributionManagement>
@@ -155,4 +184,4 @@
155184
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
156185
</repository>
157186
</distributionManagement>
158-
</project>
187+
</project>

0 commit comments

Comments
 (0)