[maven-debian-helper] 02/21: Fix simple deprecations

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch maven-debian-helper-2.0
in repository maven-debian-helper.

commit 8d584fd9ac46c233d2ae15edafce9035409f54ce
Author: Andrew Schurman <arcticwaters at gmail.com>
Date:   Fri Sep 5 19:30:36 2014 -0700

    Fix simple deprecations
---
 .../org/debian/maven/plugin/DirectoryUtilsTest.java     |  4 ++--
 .../java/org/debian/maven/plugin/InstallMojoTest.java   | 17 ++++++-----------
 .../org/debian/maven/packager/interaction/Question.java |  1 -
 .../util/GetPackageContainingPatternResultTest.java     |  4 ++--
 .../maven/packager/util/GetPackageResultTest.java       |  4 ++--
 .../packager/util/GetPackageVersionResultTest.java      |  4 ++--
 6 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/debian-maven-plugin/src/test/java/org/debian/maven/plugin/DirectoryUtilsTest.java b/debian-maven-plugin/src/test/java/org/debian/maven/plugin/DirectoryUtilsTest.java
index 23cf13b..a43cb59 100644
--- a/debian-maven-plugin/src/test/java/org/debian/maven/plugin/DirectoryUtilsTest.java
+++ b/debian-maven-plugin/src/test/java/org/debian/maven/plugin/DirectoryUtilsTest.java
@@ -16,9 +16,9 @@
 
 package org.debian.maven.plugin;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
-import static junit.framework.Assert.assertEquals;
+import org.junit.Test;
 
 public class DirectoryUtilsTest {
 
diff --git a/debian-maven-plugin/src/test/java/org/debian/maven/plugin/InstallMojoTest.java b/debian-maven-plugin/src/test/java/org/debian/maven/plugin/InstallMojoTest.java
index d7b1136..e1e754f 100644
--- a/debian-maven-plugin/src/test/java/org/debian/maven/plugin/InstallMojoTest.java
+++ b/debian-maven-plugin/src/test/java/org/debian/maven/plugin/InstallMojoTest.java
@@ -16,26 +16,21 @@
 
 package org.debian.maven.plugin;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
 import java.io.IOException;
-import java.io.Reader;
 import java.net.URISyntaxException;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
 import org.apache.commons.io.FileUtils;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
 
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
 
 public class InstallMojoTest {
-
     private File testDir = new File("tmp");
     private InstallMojo mojo;
 
diff --git a/maven-packager-utils/src/main/java/org/debian/maven/packager/interaction/Question.java b/maven-packager-utils/src/main/java/org/debian/maven/packager/interaction/Question.java
index 351af54..752f67f 100644
--- a/maven-packager-utils/src/main/java/org/debian/maven/packager/interaction/Question.java
+++ b/maven-packager-utils/src/main/java/org/debian/maven/packager/interaction/Question.java
@@ -19,7 +19,6 @@ package org.debian.maven.packager.interaction;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
-import java.io.PrintStream;
 import java.io.PrintWriter;
 
 /**
diff --git a/maven-packager-utils/src/test/java/org/debian/maven/packager/util/GetPackageContainingPatternResultTest.java b/maven-packager-utils/src/test/java/org/debian/maven/packager/util/GetPackageContainingPatternResultTest.java
index d8be7c8..e140f6f 100644
--- a/maven-packager-utils/src/test/java/org/debian/maven/packager/util/GetPackageContainingPatternResultTest.java
+++ b/maven-packager-utils/src/test/java/org/debian/maven/packager/util/GetPackageContainingPatternResultTest.java
@@ -16,12 +16,12 @@
 
 package org.debian.maven.packager.util;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static junit.framework.Assert.assertEquals;
+import org.junit.Test;
 
 public class GetPackageContainingPatternResultTest {
 
diff --git a/maven-packager-utils/src/test/java/org/debian/maven/packager/util/GetPackageResultTest.java b/maven-packager-utils/src/test/java/org/debian/maven/packager/util/GetPackageResultTest.java
index ea87b4b..716e1ce 100644
--- a/maven-packager-utils/src/test/java/org/debian/maven/packager/util/GetPackageResultTest.java
+++ b/maven-packager-utils/src/test/java/org/debian/maven/packager/util/GetPackageResultTest.java
@@ -16,12 +16,12 @@
 
 package org.debian.maven.packager.util;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static junit.framework.Assert.assertEquals;
+import org.junit.Test;
 
 public class GetPackageResultTest {
 
diff --git a/maven-packager-utils/src/test/java/org/debian/maven/packager/util/GetPackageVersionResultTest.java b/maven-packager-utils/src/test/java/org/debian/maven/packager/util/GetPackageVersionResultTest.java
index cd6701d..16856a1 100644
--- a/maven-packager-utils/src/test/java/org/debian/maven/packager/util/GetPackageVersionResultTest.java
+++ b/maven-packager-utils/src/test/java/org/debian/maven/packager/util/GetPackageVersionResultTest.java
@@ -16,12 +16,12 @@
 
 package org.debian.maven.packager.util;
 
-import org.junit.Test;
+import static org.junit.Assert.assertEquals;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import static junit.framework.Assert.assertEquals;
+import org.junit.Test;
 
 public class GetPackageVersionResultTest {
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-debian-helper.git