Fix build with JDK 14

GeorgH93 · Jul 29, 2020 · f39864c · f39864c
1 parent 4d369f0
commit f39864c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 43 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -26,3 +26,13 @@ jobs:
         java-version: 11
     - name: Build with Maven
       run: mvn -B -s .github/workflows/settings.xml clean package --file pom.xml
+  build-jdk14:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up JDK 14
+      uses: actions/setup-java@v1
+      with:
+        java-version: 14
+    - name: Build with Maven
+      run: mvn -B -s .github/workflows/settings.xml clean package --file pom.xml
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,10 @@
-sudo: false
+os: linux
 
 language: java
 jdk:
   - openjdk8
   - openjdk11
+  - openjdk14
 
 cache:
   directories:

diff --git a/MarriageMaster/pom.xml b/MarriageMaster/pom.xml
@@ -27,9 +27,7 @@
 		<releaseType>Normal</releaseType>
 		<updateChannel>Release</updateChannel>
 
-		<junit-platform.version>1.2.0</junit-platform.version>
-		<junit-jupiter.version>5.2.0</junit-jupiter.version>
-		<mockito.version>2.27.0</mockito.version>
+		<mockito.version>3.4.4</mockito.version>
 	</properties>
 
 	<repositories>
@@ -144,34 +142,10 @@
 		</dependency>
 		<!-- region unit test dependencies -->
 		<!-- region JUnit 5 -->
-		<dependency>
-			<groupId>org.junit.platform</groupId>
-			<artifactId>junit-platform-launcher</artifactId>
-			<version>${junit-platform.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.platform</groupId>
-			<artifactId>junit-platform-engine</artifactId>
-			<version>${junit-platform.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<version>${junit-jupiter.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
-			<version>${junit-jupiter.version}</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-params</artifactId>
-			<version>${junit-jupiter.version}</version>
+			<artifactId>junit-jupiter</artifactId>
+			<version>5.6.2</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- endregion -->
@@ -245,19 +219,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>2.22.0</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.junit.platform</groupId>
-						<artifactId>junit-platform-surefire-provider</artifactId>
-						<version>${junit-platform.version}</version>
-					</dependency>
-					<dependency>
-						<groupId>org.junit.jupiter</groupId>
-						<artifactId>junit-jupiter-engine</artifactId>
-						<version>${junit-jupiter.version}</version>
-					</dependency>
-				</dependencies>
+				<version>2.22.2</version>
 			</plugin>
 			<!-- Creates the coverage report -->
 			<!--<plugin>