fixed errors reported by Checkstyle
diff --git a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
index e97ac29..8335e01 100644
--- a/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
+++ b/maven-aether-provider/src/main/java/org/apache/maven/repository/internal/DefaultModelResolver.java
@@ -88,8 +88,8 @@
this.remoteRepositoryManager = remoteRepositoryManager;
this.repositories = repositories;
List<RemoteRepository> externalRepositories = new ArrayList<RemoteRepository>();
- externalRepositories.addAll(repositories);
- this.externalRepositories = Collections.unmodifiableList(externalRepositories);
+ externalRepositories.addAll( repositories );
+ this.externalRepositories = Collections.unmodifiableList( externalRepositories );
this.repositoryIds = new HashSet<String>();
}
@@ -128,7 +128,7 @@
{
this.repositoryIds.clear();
this.repositories.clear();
- this.repositories.addAll(externalRepositories);
+ this.repositories.addAll( externalRepositories );
}
@Override
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
index 06d61aa..af0defd 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultMaven.java
@@ -22,7 +22,6 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -35,7 +34,6 @@
import java.util.List;
import java.util.Map;
import java.util.Properties;
-import java.util.TimeZone;
import org.apache.maven.artifact.ArtifactUtils;
import org.apache.maven.artifact.handler.manager.ArtifactHandlerManager;
@@ -55,7 +53,6 @@
import org.apache.maven.model.building.ModelProblemUtils;
import org.apache.maven.model.building.ModelSource;
import org.apache.maven.model.building.UrlModelSource;
-import org.apache.maven.model.interpolation.MavenBuildTimestamp;
import org.apache.maven.plugin.LegacySupport;
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.ProjectBuilder;
diff --git a/maven-core/src/main/java/org/apache/maven/SessionModule.java b/maven-core/src/main/java/org/apache/maven/SessionModule.java
index 5f6d301..c3438c6 100644
--- a/maven-core/src/main/java/org/apache/maven/SessionModule.java
+++ b/maven-core/src/main/java/org/apache/maven/SessionModule.java
@@ -33,7 +33,7 @@
{
SessionScope scope = new SessionScope();
bindScope( SessionScoped.class, scope );
- bind( SessionScope.class).toInstance( scope );
+ bind( SessionScope.class ).toInstance( scope );
bind( MavenSession.class ).toProvider( SessionScope.<MavenSession> seededKeyProvider() ).in( scope );
}
}
diff --git a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
index 8d06cd6..6176f24 100644
--- a/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
+++ b/maven-embedder/src/main/java/org/apache/maven/cli/CLIReportingUtils.java
@@ -155,8 +155,10 @@
int offset = tz.getRawOffset();
// Raw offset ignores DST, so check if we are in DST now and add the offset
- if( tz.inDaylightTime( new Date( timestamp ) ) )
- offset += tz.getDSTSavings();
+ if ( tz.inDaylightTime( new Date( timestamp ) ) )
+ {
+ offset += tz.getDSTSavings();
+ }
long m = Math.abs( ( offset / ONE_MINUTE ) % 60 );
long h = Math.abs( ( offset / ONE_HOUR ) % 24 );
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
index 632c932..52c9fc3 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java
@@ -591,7 +591,7 @@
List<Repository> repositories = model.getRepositories();
- if (resetRepositories)
+ if ( resetRepositories )
{
modelResolver.resetRepositories();
}
diff --git a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java
index 7094a3f..57487d4 100644
--- a/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java
+++ b/maven-model-builder/src/main/java/org/apache/maven/model/profile/activation/ProfileActivator.java
@@ -44,8 +44,8 @@
boolean isActive( Profile profile, ProfileActivationContext context, ModelProblemCollector problems );
/**
- * Determines whether specified activation method is present in configuration or not. It should help to have AND between
- * activation conditions
+ * Determines whether specified activation method is present in configuration or not. It should help to have AND
+ * between activation conditions
* Need for solving http://jira.codehaus.org/browse/MNG-4565
* @param profile The profile whose activation status should be determined, must not be {@code null}.
* @param context The environmental context used to determine the activation status of the profile, must not be