SHRINKRES-169 Class imports cleanup

shrinkwrap · Feb 12, 2014 · 7f424e8 · 7f424e8
1 parent e3e5014
commit 7f424e8
Show file tree

Hide file tree

Showing 18 changed files with 20 additions and 43 deletions.
diff --git a/...n/java/org/jboss/shrinkwrap/resolver/api/maven/MavenResolveWithRangeSupportStageBase.java b/...n/java/org/jboss/shrinkwrap/resolver/api/maven/MavenResolveWithRangeSupportStageBase.java
@@ -16,8 +16,6 @@
  */
 package org.jboss.shrinkwrap.resolver.api.maven;
 
-import org.jboss.shrinkwrap.resolver.api.ResolveWithRangeSupportStage;
-import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenCoordinate;
 
 /**
  * {@link org.jboss.shrinkwrap.resolver.api.ResolveWithRangeSupportStage} for Maven

diff --git a/...a/org/jboss/shrinkwrap/resolver/impl/maven/archive/importer/JarMavenImporterTestCase.java b/...a/org/jboss/shrinkwrap/resolver/impl/maven/archive/importer/JarMavenImporterTestCase.java
@@ -16,15 +16,9 @@
  */
 package org.jboss.shrinkwrap.resolver.impl.maven.archive.importer;
 
-import static org.hamcrest.CoreMatchers.not;
-import static org.jboss.shrinkwrap.resolver.impl.maven.archive.importer.ArchiveContentMatchers.contains;
-import static org.jboss.shrinkwrap.resolver.impl.maven.archive.importer.ArchiveContentMatchers.size;
-import static org.junit.Assert.assertThat;
-
 import java.io.File;
 import java.io.IOException;
 
-import org.codehaus.plexus.util.SelectorUtils;
 import org.jboss.shrinkwrap.api.Archive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -33,6 +27,12 @@
 import org.junit.Before;
 import org.junit.Test;
 
+import static org.hamcrest.CoreMatchers.not;
+import static org.jboss.shrinkwrap.resolver.impl.maven.archive.importer.ArchiveContentMatchers.contains;
+import static org.jboss.shrinkwrap.resolver.impl.maven.archive.importer.ArchiveContentMatchers.size;
+
+import static org.junit.Assert.assertThat;
+
 /**
  * JAR import test case
  *

diff --git a/...va/org/jboss/shrinkwrap/resolver/impl/maven/archive/usecases/ShrinkWrapMavenTestCase.java b/...va/org/jboss/shrinkwrap/resolver/impl/maven/archive/usecases/ShrinkWrapMavenTestCase.java
@@ -16,10 +16,10 @@
  */
 package org.jboss.shrinkwrap.resolver.impl.maven.archive.usecases;
 
-import junit.framework.Assert;
 
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**

diff --git a/...n/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/PomlessResolveStageBaseImpl.java b/...n/src/main/java/org/jboss/shrinkwrap/resolver/impl/maven/PomlessResolveStageBaseImpl.java
@@ -16,19 +16,16 @@
  */
 package org.jboss.shrinkwrap.resolver.impl.maven;
 
+import java.io.File;
+
 import org.jboss.shrinkwrap.resolver.api.InvalidConfigurationFileException;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenFormatStage;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenStrategyStageBase;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenWorkingSession;
 import org.jboss.shrinkwrap.resolver.api.maven.PomEquippedResolveStageBase;
 import org.jboss.shrinkwrap.resolver.api.maven.PomlessResolveStage;
 import org.jboss.shrinkwrap.resolver.api.maven.PomlessResolveStageBase;
-import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenCoordinate;
-import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenCoordinates;
 import org.jboss.shrinkwrap.resolver.impl.maven.task.LoadPomTask;
-import org.jboss.shrinkwrap.resolver.impl.maven.util.Validate;
-
-import java.io.File;
 
 /**
  * Base support for implementations of a {@link PomlessResolveStage}

diff --git a/.../main/java/org/jboss/shrinkwrap/resolver/impl/maven/logging/LogModelProblemCollector.java b/.../main/java/org/jboss/shrinkwrap/resolver/impl/maven/logging/LogModelProblemCollector.java
@@ -18,8 +18,6 @@
 
 import java.util.logging.Logger;
 
-import org.apache.maven.model.InputLocation;
-import org.apache.maven.model.building.ModelProblem.Severity;
 import org.apache.maven.model.building.ModelProblemCollector;
 import org.apache.maven.model.building.ModelProblemCollectorRequest;
 

diff --git a/...ain/java/org/jboss/shrinkwrap/resolver/impl/maven/task/ConfigureSettingsFromFileTask.java b/...ain/java/org/jboss/shrinkwrap/resolver/impl/maven/task/ConfigureSettingsFromFileTask.java
@@ -18,8 +18,6 @@
 
 import java.io.File;
 
-import org.apache.maven.settings.building.DefaultSettingsBuildingRequest;
-import org.apache.maven.settings.building.SettingsBuildingRequest;
 import org.jboss.shrinkwrap.resolver.api.InvalidConfigurationFileException;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenWorkingSession;
 import org.jboss.shrinkwrap.resolver.impl.maven.util.Validate;

diff --git a/...ava/org/jboss/shrinkwrap/resolver/api/maven/coordinate/MavenCoordinateParserTestCase.java b/...ava/org/jboss/shrinkwrap/resolver/api/maven/coordinate/MavenCoordinateParserTestCase.java
@@ -16,12 +16,11 @@
  */
 package org.jboss.shrinkwrap.resolver.api.maven.coordinate;
 
-import junit.framework.Assert;
-
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.DefaultArtifact;
 import org.jboss.shrinkwrap.resolver.api.CoordinateParseException;
 import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenCoordinates.MavenCoordinateParser;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**

diff --git a/...src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/MavenRepositorySystemTestCase.java b/...src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/MavenRepositorySystemTestCase.java
@@ -16,10 +16,10 @@
  */
 package org.jboss.shrinkwrap.resolver.impl.maven;
 
-import junit.framework.Assert;
 
 import org.jboss.shrinkwrap.resolver.api.Resolvers;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenResolverSystem;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**

diff --git a/...rc/test/java/org/jboss/shrinkwrap/resolver/impl/maven/WorkingSessionChainingTestCase.java b/...rc/test/java/org/jboss/shrinkwrap/resolver/impl/maven/WorkingSessionChainingTestCase.java
@@ -1,11 +1,11 @@
 package org.jboss.shrinkwrap.resolver.impl.maven;
 
-import junit.framework.Assert;
 
 import org.jboss.shrinkwrap.resolver.api.ResolutionException;
 import org.jboss.shrinkwrap.resolver.api.Resolvers;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenResolverSystem;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenStrategyStage;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**

diff --git a/.../org/jboss/shrinkwrap/resolver/impl/maven/bootstrap/SystemPropertyPrecedenceTestCase.java b/.../org/jboss/shrinkwrap/resolver/impl/maven/bootstrap/SystemPropertyPrecedenceTestCase.java
@@ -18,11 +18,10 @@
 
 import java.io.File;
 
-import junit.framework.Assert;
-
 import org.jboss.shrinkwrap.resolver.api.NoResolvedResultException;
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.jboss.shrinkwrap.resolver.impl.maven.util.ValidationUtil;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

diff --git a/...c/test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/ClassifiersTestCase.java b/...c/test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/ClassifiersTestCase.java
@@ -21,10 +21,9 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-import junit.framework.Assert;
-
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.jboss.shrinkwrap.resolver.impl.maven.util.ValidationUtil;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**

diff --git a/...st/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/DependencyDepthTestCase.java b/...st/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/DependencyDepthTestCase.java
@@ -19,8 +19,6 @@
 import java.io.File;
 import java.util.List;
 
-import junit.framework.Assert;
-
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenDependency;
 import org.jboss.shrinkwrap.resolver.api.maven.filter.MavenResolutionFilter;
@@ -30,6 +28,7 @@
 import org.jboss.shrinkwrap.resolver.impl.maven.bootstrap.MavenSettingsBuilder;
 import org.jboss.shrinkwrap.resolver.impl.maven.util.ValidationUtil;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

diff --git a/...t/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/DependencyScopesTestCase.java b/...t/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/DependencyScopesTestCase.java
@@ -24,14 +24,11 @@
 import org.jboss.shrinkwrap.resolver.api.maven.MavenFormatStage;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenResolvedArtifact;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenStrategyStage;
-import org.jboss.shrinkwrap.resolver.api.maven.MavenWorkingSession;
 import org.jboss.shrinkwrap.resolver.api.maven.ScopeType;
-import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenDependency;
 import org.jboss.shrinkwrap.resolver.api.maven.filter.MavenResolutionFilter;
 import org.jboss.shrinkwrap.resolver.api.maven.filter.NonTransitiveFilter;
 import org.jboss.shrinkwrap.resolver.api.maven.strategy.MavenResolutionStrategy;
 import org.jboss.shrinkwrap.resolver.api.maven.strategy.TransitiveExclusionPolicy;
-import org.jboss.shrinkwrap.resolver.impl.maven.MavenWorkingSessionContainer;
 import org.jboss.shrinkwrap.resolver.impl.maven.util.ValidationUtil;
 import org.junit.Assert;
 import org.junit.Test;

diff --git a/...est/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/ExclusionsUnitTestCase.java b/...est/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/ExclusionsUnitTestCase.java
@@ -18,11 +18,7 @@
 
 import java.io.File;
 
-import junit.framework.Assert;
-
 import org.jboss.shrinkwrap.resolver.api.Resolvers;
-import org.jboss.shrinkwrap.resolver.api.maven.Maven;
-import org.jboss.shrinkwrap.resolver.api.maven.MavenResolvedArtifact;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenResolverSystem;
 import org.jboss.shrinkwrap.resolver.api.maven.ScopeType;
 import org.jboss.shrinkwrap.resolver.api.maven.coordinate.MavenDependencies;
@@ -32,6 +28,7 @@
 import org.jboss.shrinkwrap.resolver.impl.maven.bootstrap.MavenSettingsBuilder;
 import org.jboss.shrinkwrap.resolver.impl.maven.util.ValidationUtil;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

diff --git a/...en/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/MirrorTestCase.java b/...en/src/test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/MirrorTestCase.java
@@ -2,9 +2,8 @@
 
 import java.io.File;
 
-import junit.framework.Assert;
-
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**

diff --git a/.../java/org/jboss/shrinkwrap/resolver/impl/maven/integration/OfflineRepositoryTestCase.java b/.../java/org/jboss/shrinkwrap/resolver/impl/maven/integration/OfflineRepositoryTestCase.java
@@ -31,14 +31,13 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import junit.framework.Assert;
-
 import org.jboss.shrinkwrap.resolver.api.NoResolvedResultException;
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.jboss.shrinkwrap.resolver.api.maven.ScopeType;
 import org.jboss.shrinkwrap.resolver.impl.maven.bootstrap.MavenSettingsBuilder;
 import org.jboss.shrinkwrap.resolver.impl.maven.util.TestFileUtil;
 import org.jboss.shrinkwrap.resolver.impl.maven.util.ValidationUtil;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Rule;

diff --git a/...ava/org/jboss/shrinkwrap/resolver/impl/maven/integration/PomDependenciesUnitTestCase.java b/...ava/org/jboss/shrinkwrap/resolver/impl/maven/integration/PomDependenciesUnitTestCase.java
@@ -18,8 +18,6 @@
 
 import java.io.File;
 
-import junit.framework.Assert;
-
 import org.jboss.shrinkwrap.resolver.api.Resolvers;
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenResolverSystem;
@@ -29,6 +27,7 @@
 import org.jboss.shrinkwrap.resolver.impl.maven.bootstrap.MavenSettingsBuilder;
 import org.jboss.shrinkwrap.resolver.impl.maven.util.ValidationUtil;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 

diff --git a/.../test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/ProfilesUnitTestCase.java b/.../test/java/org/jboss/shrinkwrap/resolver/impl/maven/integration/ProfilesUnitTestCase.java
@@ -18,14 +18,13 @@
 
 import java.io.File;
 
-import junit.framework.Assert;
-
 import org.jboss.shrinkwrap.resolver.api.NoResolvedResultException;
 import org.jboss.shrinkwrap.resolver.api.Resolvers;
 import org.jboss.shrinkwrap.resolver.api.maven.Maven;
 import org.jboss.shrinkwrap.resolver.api.maven.MavenResolverSystem;
 import org.jboss.shrinkwrap.resolver.impl.maven.bootstrap.MavenSettingsBuilder;
 import org.jboss.shrinkwrap.resolver.impl.maven.util.ValidationUtil;
+import org.junit.Assert;
 import org.junit.Test;
 
 /**