Avoid deprecated junit.framework.Assert, use org.junit.Assert instead

core/src/test/java/hudson/model/DisplayNameListenerTest.java

@@ -23,8 +23,7 @@
  */
 package hudson.model;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.junit.Test;
 
 public class DisplayNameListenerTest {

maven-plugin/src/test/java/hudson/maven/MavenModuleTest.java

@@ -14,12 +14,11 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Plugin;
 import org.apache.maven.project.MavenProject;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

test/src/test/java/hudson/security/CliAuthenticationTest.java

@@ -7,10 +7,10 @@ import hudson.cli.LoginCommand;
 import hudson.cli.LogoutCommand;
 import jenkins.model.Jenkins;
 import org.acegisecurity.Authentication;
+import org.junit.Assert;
 import org.jvnet.hudson.test.For;
 import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.TestExtension;
-import junit.framework.Assert;
 
 /**
  * @author Kohsuke Kawaguchi

test/src/test/java/hudson/slaves/EnvironmentVariableNodePropertyTest.java

@@ -12,8 +12,7 @@ import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.jvnet.hudson.test.CaptureEnvironmentBuilder;
 import org.jvnet.hudson.test.HudsonTestCase;
 

test/src/test/java/hudson/slaves/NodeCanTakeTaskTest.java

@@ -39,8 +39,7 @@ import hudson.model.Queue.Task;
 import hudson.model.Slave;
 import hudson.model.queue.CauseOfBlockage;
 
-import junit.framework.Assert;
-
+import org.junit.Assert;
 import org.jvnet.hudson.test.HudsonTestCase;
 
 public class NodeCanTakeTaskTest extends HudsonTestCase {

test/src/test/java/hudson/tasks/MavenTest.java

@@ -56,8 +56,6 @@ import java.net.URL;
 import java.util.Collections;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.apache.maven.settings.building.FileSettingsSource;
 import org.jvnet.hudson.test.HudsonTestCase;
 
@@ -67,6 +65,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlButton;
 import hudson.EnvVars;
 import hudson.model.FreeStyleBuild;
 import hudson.model.PasswordParameterDefinition;
+import org.junit.Assert;
 import org.jvnet.hudson.test.Bug;
 import org.jvnet.hudson.test.ExtractResourceSCM;
 import org.jvnet.hudson.test.SingleFileSCM;

test/src/test/java/hudson/tools/ToolLocationNodePropertyTest.java

@@ -40,8 +40,8 @@ import hudson.maven.MavenModuleSet;
 import java.io.IOException;
 
 import jenkins.model.Jenkins;
-import junit.framework.Assert;
 
+import org.junit.Assert;
 import org.jvnet.hudson.test.HudsonTestCase;
 import org.jvnet.hudson.test.SingleFileSCM;
 import org.jvnet.hudson.test.ExtractResourceSCM;

test/src/test/java/jenkins/model/JenkinsTest.java

@@ -33,13 +33,13 @@ import hudson.model.RootAction;
 import hudson.model.UnprotectedRootAction;
 import hudson.security.FullControlOnceLoggedInAuthorizationStrategy;
 import hudson.util.HttpResponses;
-import junit.framework.Assert;
 import hudson.model.FreeStyleProject;
 import hudson.security.GlobalMatrixAuthorizationStrategy;
 import hudson.security.LegacySecurityRealm;
 import hudson.security.Permission;
 import hudson.util.FormValidation;
 
+import org.junit.Assert;
 import org.junit.Test;
 import org.jvnet.hudson.test.Bug;
 import org.jvnet.hudson.test.ExtractResourceSCM;