Merge pull request flipkart-incubator#85 from LouizFC/junit5

Upgraded JUnit to version 5.3.1
holograph · Jan 14, 2019 · 04e0330 · 04e0330
2 parents 8cd80ed + 3b799ac
commit 04e0330
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,7 +7,7 @@ jobs:
  build:
  docker:
  # specify the version you desire here
- - image: circleci/openjdk:8-jdk
+ - image: circleci/openjdk:11.0.1-jdk
 
  # Specify service dependencies here if necessary
  # CircleCI maintains a library of pre-built images

diff --git a/pom.xml b/pom.xml
@@ -36,22 +36,39 @@
 
  <properties>
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <compileSource>1.6</compileSource>
+ <testCompileSource>1.8</testCompileSource>
+
  <jackson.version>2.9.7</jackson.version>
+ <junit.version>5.3.1</junit.version>
  </properties>
 
  <build>
  <plugins>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-compiler-plugin</artifactId>
- <version>2.3.1</version>
+ <version>3.8.0</version>
  <configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>${compileSource}</source>
+ <target>${compileSource}</target>
+ <testSource>${testCompileSource}</testSource>
+ <testTarget>${testCompileSource}</testTarget>
  <showDeprecation>true</showDeprecation>
  <showWarnings>true</showWarnings>
  </configuration>
  </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.1</version>
+ <configuration>
+ <forkCount>3</forkCount>
+ <reuseForks>true</reuseForks>
+ <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
+ </configuration>
+ </plugin>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-source-plugin</artifactId>
@@ -139,10 +156,22 @@
  <version>2.4</version>
  </dependency>
  <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.vintage</groupId>
+ <artifactId>junit-vintage-engine</artifactId>
+ <version>${junit.version}</version>
  <scope>test</scope>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.12</version>
  </dependency>
  </dependencies>
  <distributionManagement>
@@ -155,4 +184,4 @@
  <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
  </repository>
  </distributionManagement>
-</project>
+</project>