From 001a037102050517e1020a0e0c00dc629ddbfaa4 Mon Sep 17 00:00:00 2001
From: tc25898 <740419913@qq.com>
Date: Tue, 27 Feb 2018 10:56:43 -0800
Subject: [PATCH 1/2] junit dependency fix

---
 pom.xml                                    | 16 ++++++++++------
 src/main/java/unittest/StudentDaoTest.java |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index d889f77..1ac640b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,12 +68,6 @@
 			<groupId>org.glassfish.jersey.media</groupId>
 			<artifactId>jersey-media-json-binding</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>4.8.1</version>
-			<scope>test</scope>
-		</dependency>
 
 		<!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-core -->
 		<dependency>
@@ -88,6 +82,16 @@
 			<artifactId>hibernate-validator</artifactId>
 			<version>5.4.0.Final</version>
 		</dependency>
+		<dependency>
+			<groupId>org.testng</groupId>
+			<artifactId>testng</artifactId>
+			<version>RELEASE</version>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+		</dependency>
 
 
 	</dependencies>
diff --git a/src/main/java/unittest/StudentDaoTest.java b/src/main/java/unittest/StudentDaoTest.java
index 0615b56..b2e96b2 100644
--- a/src/main/java/unittest/StudentDaoTest.java
+++ b/src/main/java/unittest/StudentDaoTest.java
@@ -3,7 +3,7 @@
 import org.junit.Test;
 import org.mehaexample.asdDemo.model.Student;
 import java.sql.SQLException;
-import junit.framework.Assert;
+import org.junit.Assert;
 import utils.StudentDaoJdbc;
 
 public class StudentDaoTest {

From 38b72b75ab3ecb08763e6f66d7ba047d3a894511 Mon Sep 17 00:00:00 2001
From: tc25898 <740419913@qq.com>
Date: Tue, 27 Feb 2018 10:58:52 -0800
Subject: [PATCH 2/2] junit dependency fix

---
 pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1ac640b..4ac8b08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -82,11 +82,6 @@
 			<artifactId>hibernate-validator</artifactId>
 			<version>5.4.0.Final</version>
 		</dependency>
-		<dependency>
-			<groupId>org.testng</groupId>
-			<artifactId>testng</artifactId>
-			<version>RELEASE</version>
-		</dependency>
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>