Fix a bunch of Eclipse warnings

Author: ctrueden

pom.xml

@@ -214,7 +214,6 @@ Institute of Molecular Cell Biology and Genetics, and KNIME GmbH.</license.copyr
 		<dependency>
 			<groupId>org.scijava</groupId>
 			<artifactId>scijava-common</artifactId>
-			<version>${scijava-common.version}</version>
 		</dependency>
 	</dependencies>
 

src/main/java/org/scijava/maven/plugin/BumpMojo.java

@@ -137,8 +137,7 @@ private String latestVersion(final String groupId, final String artifactId)
 			new DefaultArtifact(groupId, artifactId, null, "[0,)");
 		request.setArtifact(artifact);
 		makeImageJRepositoryKnown();
-		final List<RemoteRepository> repositories =
-			new ArrayList<RemoteRepository>();
+		final List<RemoteRepository> repositories = new ArrayList<>();
 		repositories.addAll(remoteRepositories);
 		request.setRepositories(repositories);
 		VersionRangeResult result;

src/main/java/org/scijava/maven/plugin/DependencyUtils.java

@@ -157,15 +157,15 @@ public static List<MavenProject> findEffectiveReactor(
 		final MavenProject baseProject, final MavenProjectBuilder projectBuilder,
 		final ArtifactRepository localRepository) throws ProjectBuildingException
 	{
-		final Set<MavenProject> reactor = new HashSet<MavenProject>();
-		final Set<MavenProject> visited = new HashSet<MavenProject>();
+		final Set<MavenProject> reactor = new HashSet<>();
+		final Set<MavenProject> visited = new HashSet<>();
 		final ProfileManager profileManager = getProfileManager(session);
 
 		findEffectiveReactor(reactor, visited, baseProject, baseProject,
 			projectBuilder, localRepository, profileManager);
 
 		if (reactor.size() <= 1 || !reactor.contains(baseProject)) return defaultReactor;
-		return new ArrayList<MavenProject>(reactor);
+		return new ArrayList<>(reactor);
 	}
 
 	// -- Helper methods --

src/main/java/org/scijava/maven/plugin/EclipseHelperMojo.java

@@ -79,7 +79,6 @@ public void execute() throws MojoExecutionException {
 
 		getLog().info("Parsing SciJava annotations");
 		try {
-			@SuppressWarnings("unchecked")
 			final List<String> elements =
 				currentProject.getCompileClasspathElements();
 			final URL[] classpath = new URL[elements.size() + 1];
@@ -138,7 +137,6 @@ public void execute() throws MojoExecutionException {
 	 * @return true iff the project depends on <code>scijava-common</code>
 	 */
 	private boolean dependsOnScijavaCommon(final MavenProject project) {
-		@SuppressWarnings("unchecked")
 		final List<Dependency> dependencies = project.getCompileDependencies();
 		if (dependencies == null) return false;
 

src/main/java/org/scijava/maven/plugin/SnapshotFinder.java

@@ -63,23 +63,22 @@ public class SnapshotFinder extends AbstractSciJavaDependencyChecker {
 
 	// -- Parameters --
 
-	@SuppressWarnings("rawtypes")
-	private final List remoteRepositories;
+	private final List<ArtifactRepository> remoteRepositories;
 	private final MavenProjectBuilder projectBuilder;
 	private final ArtifactRepository localRepository;
 
 	// -- Fields --
 
 	private final Map<DependencyNode, Result> results =
-		new HashMap<DependencyNode, Result>();
+		new HashMap<>();
 
-	private Set<MavenProject> reactorModules = new HashSet<MavenProject>();
+	private Set<MavenProject> reactorModules = new HashSet<>();
 
 	// -- Constructor --
 
 	public SnapshotFinder(final MavenProjectBuilder projectBuilder,
 		final ArtifactRepository localRepository,
-		@SuppressWarnings("rawtypes") final List remoteRepositories)
+		final List<ArtifactRepository> remoteRepositories)
 	{
 		this.projectBuilder = projectBuilder;
 		this.localRepository = localRepository;
@@ -103,7 +102,7 @@ public SnapshotFinder(final MavenProjectBuilder projectBuilder,
 	 *          reactor.
 	 */
 	public void setReactorModules(final List<MavenProject> modules) {
-		reactorModules = new HashSet<MavenProject>(modules);
+		reactorModules = new HashSet<>(modules);
 	}
 
 	@Override
@@ -117,7 +116,7 @@ public String makeExceptionMessage() {
 		// Because we are using the Maven 2 DependencyTree, artifacts can be listed
 		// multiple times if multiple components depend on them. Thus we need to
 		// merge our dependencies to a set of artifacts.
-		final Map<Artifact, Result> mergedResults = new HashMap<Artifact, Result>();
+		final Map<Artifact, Result> mergedResults = new HashMap<>();
 
 		for (final DependencyNode node : results.keySet()) {
 			final Artifact a = node.getArtifact();

src/main/java/org/scijava/maven/plugin/VerifyNoSnapshotsMojo.java

@@ -138,7 +138,7 @@ public void execute() throws MojoExecutionException, MojoFailureException {
 	// -- Helper methods --
 
 	private Set<String> getGroupIds() {
-		final Set<String> ids = new HashSet<String>();
+		final Set<String> ids = new HashSet<>();
 		if (groupIds != null) {
 			for (final Object id : groupIds)
 				ids.add(id == null ? null : id.toString());

src/main/java/org/scijava/maven/plugin/enforcer/RequireReproducibleBuilds.java

@@ -111,7 +111,7 @@ public void execute(final EnforcerRuleHelper helper)
 			}
 
 			// populate groupIds
-			final Set<String> ids = new HashSet<String>();
+			final Set<String> ids = new HashSet<>();
 			if (groupId != null) ids.add(groupId);
 			if (groupIds != null) {
 				for (final String id : groupIds.split(",")) {

src/main/java/org/scijava/maven/plugin/install/AbstractCopyJarsMojo.java

@@ -281,7 +281,7 @@ protected boolean hasIJ1Dependency(final MavenProject project) {
 	}
 
 	protected String interpolate(final String original,
-		final MavenProject project, final MavenSession session)
+		final MavenProject project)
 		throws MojoExecutionException
 	{
 		if (original == null || original.indexOf("${") < 0) return original;
@@ -324,41 +324,41 @@ protected String interpolate(final String original,
 	}
 
 	protected void installArtifact(final Artifact artifact,
-		final File appDirectory, final boolean force,
+		final File appDir, final boolean force,
 		final OtherVersions otherVersionsPolicy) throws IOException
 	{
-		installArtifact(artifact, appDirectory, "", force, otherVersionsPolicy);
+		installArtifact(artifact, appDir, "", force, otherVersionsPolicy);
 	}
 
 	protected void installArtifact(final Artifact artifact,
-		final File appDirectory, final String appSubdirectory, final boolean force,
+		final File appDir, final String appSubdir, final boolean force,
 		final OtherVersions otherVersionsPolicy) throws IOException
 	{
 		if (!"jar".equals(artifact.getType())) return;
 
 		final File source = artifact.getFile();
 		final File targetDirectory;
 
-		if (appSubdirectory != null && !appSubdirectory.equals("")) {
-			targetDirectory = new File(appDirectory, appSubdirectory);
+		if (appSubdir != null && !appSubdir.equals("")) {
+			targetDirectory = new File(appDir, appSubdir);
 		} else if (isIJ1Plugin(source)) {
-			targetDirectory = new File(appDirectory, "plugins");
+			targetDirectory = new File(appDir, "plugins");
 		}
 		else if ("ome".equals(artifact.getGroupId()) ||
 			("loci".equals(artifact.getGroupId()) && (source.getName().startsWith(
 				"scifio-4.4.") || source.getName().startsWith("jai_imageio-4.4."))))
 		{
-			targetDirectory = new File(appDirectory, "jars/bio-formats");
+			targetDirectory = new File(appDir, "jars/bio-formats");
 		}
 		else {
-			targetDirectory = new File(appDirectory, "jars");
+			targetDirectory = new File(appDir, "jars");
 		}
 		final String fileName = "Fiji_Updater".equals(artifact.getArtifactId())
 			? artifact.getArtifactId() + ".jar" : source.getName();
 		final File target = new File(targetDirectory, fileName);
 
 		boolean newerVersion = false;
-		final Path directoryPath = Paths.get(appDirectory.toURI());
+		final Path directoryPath = Paths.get(appDir.toURI());
 		final Path targetPath = Paths.get(target.toURI());
 		final Collection<Path> otherVersions = //
 			getEncroachingVersions(directoryPath, targetPath);

src/main/java/org/scijava/maven/plugin/install/CopyJarsMojo.java

@@ -99,7 +99,7 @@ public void execute() throws MojoExecutionException {
 				"Property '" + APP_DIRECTORY_PROPERTY + "' unset; Skipping copy-jars");
 			return;
 		}
-		final String interpolated = interpolate(appDirectory, project, session);
+		final String interpolated = interpolate(appDirectory, project);
 		appDir = new File(interpolated);
 
 		if (appSubdirectory == null) {