make more checkstyle compatible
diff --git a/src/main/java/org/apache/netbeans/nbm/repository/DownloadIndexMojo.java b/src/main/java/org/apache/netbeans/nbm/repository/DownloadIndexMojo.java
index e74d2b3..e2c9eff 100644
--- a/src/main/java/org/apache/netbeans/nbm/repository/DownloadIndexMojo.java
+++ b/src/main/java/org/apache/netbeans/nbm/repository/DownloadIndexMojo.java
@@ -1,3 +1,5 @@
+package org.apache.netbeans.nbm.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,8 +19,6 @@
  * under the License.
  */
 
-package org.apache.netbeans.nbm.repository;
-
 import java.io.File;
 import java.net.URI;
 import java.util.ArrayList;
@@ -50,70 +50,73 @@
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 
 /**
- * Goal for retrieving and expanding the lucene index of the given repository. That in turn is used by the <code>populate</code>
- * goal.
+ * Goal for retrieving and expanding the lucene index of the given repository. 
+ * That in turn is used by the <code>populate</code> goal.
  * @author Milos Kleint
  */
-@Mojo(name="download", aggregator=true, requiresProject=false)
-public class DownloadIndexMojo extends AbstractMojo implements Contextualizable {
-    
+@Mojo( name = "download", aggregator = true, requiresProject = false )
+public class DownloadIndexMojo extends AbstractMojo implements Contextualizable 
+{
+
     /**
      * url of the repository to download index from. Please note that if you already have
      * an existing index at <code>nexusIndexDirectory</code>, you should always use the same url for that directory.
      */
-    @Parameter(required=true, property="repositoryUrl")
+    @Parameter( required = true, property = "repositoryUrl" )
     private String repositoryUrl;
-    
+
     /**
-     * location on disk where the index should be created. either empty or with existing index from same repository. then only update check will
-     * be performed.
+     * location on disk where the index should be created. either empty or with existing index from same repository. 
+     * Then only update check will be performed.
      */
-    @Parameter(required=true, property="nexusIndexDirectory")
+    @Parameter( required = true, property = "nexusIndexDirectory" )
     private File nexusIndexDirectory;
  
     @Component
     IndexUpdater remoteIndexUpdater;
-    
+
     @Component
     NexusIndexer indexer;
-    
+
     PlexusContainer container;
-    
-    
+
+
     @Component
     WagonManager wagonManager;
-    
+
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException
     {
-        try        
+        try
         {
             List<IndexCreator> creators = new ArrayList<IndexCreator>();
-            creators.addAll(container.lookupList(IndexCreator.class));
-            String indexurl = repositoryUrl + (!repositoryUrl.endsWith( "/") ? "/" : "") + ".index";
+            creators.addAll( container.lookupList( IndexCreator.class ) );
+            String indexurl = repositoryUrl + ( !repositoryUrl.endsWith( "/" ) ? "/" : "" ) + ".index";
             IndexingContext indexingContext = indexer.addIndexingContextForced(
                                     "central", // context id
                                     "central", // repository id
                                     null, // repository folder
                                     nexusIndexDirectory,
-                                    repositoryUrl,// repositoryUrl
+                                    repositoryUrl, // repositoryUrl
                                     indexurl,
-                                    creators);
+                                    creators );
 
-            String protocol = URI.create(repositoryUrl).getScheme();
+            String protocol = URI.create( repositoryUrl ).getScheme();
             ProxyInfo wagonProxy = wagonManager.getProxy( protocol );
-            TransferListener tr = new TransferListener() {
+            TransferListener tr = new TransferListener() 
+            {
 
                 @Override
                 public void transferInitiated( TransferEvent transferEvent )
                 {
-                    getLog().info( "Initiated connection to " + repositoryUrl);
+                    getLog().info( "Initiated connection to " + repositoryUrl );
                 }
 
                 @Override
                 public void transferStarted( TransferEvent transferEvent )
                 {
-                    getLog().info( "Started transfer of " + repositoryUrl + "/.index/" + transferEvent.getResource().toString());
+                    getLog().info( "Started transfer of " + repositoryUrl + "/.index/" 
+                            + transferEvent.getResource().toString() );
                 }
 
                 @Override
@@ -124,13 +127,15 @@
                 @Override
                 public void transferCompleted( TransferEvent transferEvent )
                 {
-                    getLog().info( "Finished transfer of " + repositoryUrl + "/.index/" + transferEvent.getResource().toString());
+                    getLog().info( "Finished transfer of " + repositoryUrl + "/.index/" 
+                            + transferEvent.getResource().toString() );
                 }
 
                 @Override
                 public void transferError( TransferEvent transferEvent )
                 {
-                    getLog().error( "Failed transfer of " + repositoryUrl + "/.index/" + transferEvent.getResource().toString(), transferEvent.getException());
+                    getLog().error( "Failed transfer of " + repositoryUrl + "/.index/" 
+                            + transferEvent.getResource().toString(), transferEvent.getException() );
                 }
 
                 @Override
@@ -139,32 +144,32 @@
                 }
             };
             // MINDEXER-42: cannot use WagonHelper.getWagonResourceFetcher
-            Wagon wagon = container.lookup(Wagon.class, protocol);
-            if (wagon instanceof HttpWagon) { //#216401
+            Wagon wagon = container.lookup( Wagon.class, protocol );
+            if ( wagon instanceof HttpWagon ) 
+            { //#216401
                 HttpWagon httpwagon = (HttpWagon) wagon;
                 //#215343
                 Properties p = new Properties();
-                p.setProperty("User-Agent", "mojo/nb-repository-plugin");
-                httpwagon.setHttpHeaders(p);
+                p.setProperty( "User-Agent", "mojo/nb-repository-plugin" );
+                httpwagon.setHttpHeaders( p );
             }
 
-            ResourceFetcher fetcher = new WagonHelper.WagonFetcher(wagon, tr, null, wagonProxy);
-            IndexUpdateRequest iur = new IndexUpdateRequest(indexingContext, fetcher);
+            ResourceFetcher fetcher = new WagonHelper.WagonFetcher( wagon, tr, null, wagonProxy );
+            IndexUpdateRequest iur = new IndexUpdateRequest( indexingContext, fetcher );
 
-            remoteIndexUpdater.fetchAndUpdateIndex(iur);
-            indexer.removeIndexingContext(indexingContext, false);
+            remoteIndexUpdater.fetchAndUpdateIndex( iur );
+            indexer.removeIndexingContext( indexingContext, false );
         }
         catch ( Exception ex )
         {
-            throw new MojoExecutionException( "Cannot download index", ex);
+            throw new MojoExecutionException( "Cannot download index", ex );
         }
     }
 
     @Override
     public void contextualize( Context context ) throws ContextException
     {
-        this.container = (PlexusContainer) context.get( PlexusConstants.PLEXUS_KEY );
+        this.container = ( PlexusContainer ) context.get( PlexusConstants.PLEXUS_KEY );
     }
 
-    
 }
diff --git a/src/main/java/org/apache/netbeans/nbm/repository/PopulateRepositoryMojo.java b/src/main/java/org/apache/netbeans/nbm/repository/PopulateRepositoryMojo.java
index df4c1c5..d193031 100644
--- a/src/main/java/org/apache/netbeans/nbm/repository/PopulateRepositoryMojo.java
+++ b/src/main/java/org/apache/netbeans/nbm/repository/PopulateRepositoryMojo.java
@@ -1,3 +1,5 @@
+package org.apache.netbeans.nbm.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,8 +19,6 @@
  * under the License.
  */
 
-package org.apache.netbeans.nbm.repository;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -106,7 +106,7 @@
  *
  * @author Milos Kleint
  */
-@Mojo(name="populate", aggregator=true, requiresProject=false)
+@Mojo( name = "populate", aggregator = true, requiresProject = false )
 public class PopulateRepositoryMojo
     extends AbstractNetbeansMojo
 {
@@ -121,14 +121,14 @@
      * eg. for org.netbeans value will generate org.netbeans.cluster groupId for clusters and org.netbeans.modules for module artifacts.
      * @since 1.2
      */
-    @Parameter(property="groupIdPrefix", defaultValue = "org.netbeans")
+    @Parameter( property = "groupIdPrefix", defaultValue = "org.netbeans" )
     private String groupIdPrefix;
     
     /**
      * an url where to deploy the NetBeans artifacts. Optional, if not specified, the artifacts will be only installed
      * in local repository, if you need to give credentials to access remote repo, the id of the server is hardwired to "netbeans".
      */
-    @Parameter(property="deployUrl")
+    @Parameter( property = "deployUrl" )
     private String deployUrl;
 
     /**
@@ -137,14 +137,14 @@
      * a defined "deployUrl" parameter.
      * @since 3.0
      */
-    @Parameter(defaultValue="false", property="skipInstall")
+    @Parameter( defaultValue = "false", property = "skipInstall" )
     private boolean skipLocalInstall;
 
 
     /**
      * Location of NetBeans installation
      */
-    @Parameter(property="netbeansInstallDirectory", required=true)
+    @Parameter( property = "netbeansInstallDirectory", required = true )
     protected File netbeansInstallDirectory;
 
     /**
@@ -152,13 +152,13 @@
      * expand it to a directory, it should contain multiple zip files. Define this parameter as absolute path to the zip files folder.
      *
      */
-    @Parameter(property="netbeansJavadocDirectory")
+    @Parameter( property = "netbeansJavadocDirectory" )
     protected File netbeansJavadocDirectory;
 
     /**
      * Assumes a folder with &lt;code-name-base&gt;.zip files containing sources for modules.
      */
-    @Parameter(property="netbeansSourcesDirectory")
+    @Parameter( property = "netbeansSourcesDirectory" )
     protected File netbeansSourcesDirectory;
 
     /**
@@ -168,7 +168,7 @@
      * Assumes a folder with &lt;code-name-base&gt;.nbm files containing nbm files for modules.
      * @since 3.0
      */
-    @Parameter(property="netbeansNbmDirectory", required=true)
+    @Parameter( property = "netbeansNbmDirectory", required = true )
     protected File netbeansNbmDirectory;
 
     /**
@@ -180,7 +180,7 @@
      * Highly Recommended!
      * </p>
      */
-    @Parameter(property="forcedVersion")
+    @Parameter( property = "forcedVersion" )
     protected String forcedVersion;
 
     /**
@@ -193,7 +193,7 @@
      * Use the {@code download} goal to retrieve the index.
      * @since 3.0
      */
-    @Parameter(property="nexusIndexDirectory")
+    @Parameter( property = "nexusIndexDirectory" )
     private File nexusIndexDirectory;
 
     /**
@@ -201,7 +201,7 @@
      * Only meaningful when {@code forcedVersion} is defined.
      * @since 3.7
      */
-    @Parameter(defaultValue="true", property="defineCluster")   
+    @Parameter( defaultValue = "true", property = "defineCluster" )   
     private boolean defineCluster;
 
     /**
@@ -211,7 +211,7 @@
      * Currently only supported when {@code forcedVersion} is defined.
      * @since 3.7
      */
-    @Parameter(property="dependencyRepositoryUrl")
+    @Parameter( property = "dependencyRepositoryUrl" )
     private String dependencyRepositoryUrl;
 
     /**
@@ -219,7 +219,7 @@
      * Only meaningful when {@code dependencyRepositoryUrl} is defined.
      * @since 3.7
      */
-    @Parameter(defaultValue="temp", property="dependencyRepositoryId")
+    @Parameter( defaultValue = "temp", property = "dependencyRepositoryId" )
     private String dependencyRepositoryId;
 
     /**
@@ -228,14 +228,14 @@
      *
      * @since 1.4
      */
-    @Parameter(property = "parentGAV", required = false)
+    @Parameter( property = "parentGAV", required = false )
     private String parentGAV;
     
     // <editor-fold defaultstate="collapsed" desc="Component parameters">
     /**
      * Local maven repository.
      */
-    @Parameter(required=true, readonly=true, defaultValue="${localRepository}")
+    @Parameter( required = true, readonly = true, defaultValue = "${localRepository}" )
     protected ArtifactRepository localRepository;
 
     /**
@@ -289,12 +289,13 @@
         Project antProject = antProject();
         ArtifactRepository deploymentRepository = null;
 
-        if (parentGAV != null) 
+        if ( parentGAV != null ) 
         {
             // populate artefactParent
             artefactParent = new Parent();
-            String[] split = parentGAV.split(":");
-            if (split.length != 3) {
+            String[] split = parentGAV.split( ":" );
+            if ( split.length != 3 ) 
+            {
                 throw new MojoExecutionException(
                     "parentGAV should respect the following format groupId:artefactId:version" );
             }
@@ -408,7 +409,7 @@
                     artifact = "org-netbeans-core-startup-base";
                 }                
                 String version = forcedVersion == null ? examinator.getSpecVersion() : forcedVersion;
-                String group = groupIdPrefix + (examinator.isOsgiBundle() ? GROUP_EXTERNAL : examinator.hasPublicPackages() ? GROUP_API : GROUP_IMPL);
+                String group = groupIdPrefix + ( examinator.isOsgiBundle() ? GROUP_EXTERNAL : examinator.hasPublicPackages() ? GROUP_API : GROUP_IMPL );
                 Artifact art = createArtifact( artifact, version, group );
                 if ( examinator.isOsgiBundle() )
                 {
@@ -553,8 +554,9 @@
                                             b.append( ' ' );
                                         }
                                         b.append( dep.getGroupId() ).append( ':' ).append( dep.getArtifactId() ).append( ':' ).append( dep.getVersion() );
-                                        if (dep.getClassifier() != null) {
-                                            b.append(":").append(dep.getClassifier());
+                                        if ( dep.getClassifier() != null ) 
+                                        {
+                                            b.append( ":" ).append( dep.getClassifier() );
                                         }
                                     }
                                     mani.getMainAttributes().putValue( "Maven-Class-Path", b.toString() );
@@ -785,7 +787,8 @@
         mavenModel.setVersion( wrapper.getVersion() );
         mavenModel.setPackaging( "jar" );
         mavenModel.setModelVersion( "4.0.0" );
-        if ( artefactParent != null ) {
+        if ( artefactParent != null ) 
+        {
             mavenModel.setParent( artefactParent );
         }
         ExamineManifest man = wrapper.getModuleManifest();
@@ -807,7 +810,8 @@
                     dep.setType( "jar" );
                     //we don't want the API modules to depend on non-api ones..
                     // otherwise the transitive dependency mechanism pollutes your classpath..
-                    if ( wrapper.getModuleManifest().hasPublicPackages() && !wr.getModuleManifest().hasPublicPackages() )
+                    if ( wrapper.getModuleManifest().hasPublicPackages() 
+                            && !wr.getModuleManifest().hasPublicPackages() )
                     {
                         dep.setScope( "runtime" );
                     }
@@ -826,10 +830,14 @@
                     dep.setVersion( forcedVersion );
                     ArtifactRepositoryPolicy policy = new ArtifactRepositoryPolicy();
                     List<ArtifactRepository> repos = Collections.singletonList(
-                            repositoryFactory.createArtifactRepository( dependencyRepositoryId, dependencyRepositoryUrl, artifactRepositoryLayout, policy, policy) );
+                            repositoryFactory.createArtifactRepository( 
+                                    dependencyRepositoryId, dependencyRepositoryUrl, artifactRepositoryLayout, policy, policy ) );
                     try
                     {
-                        artifactResolver.resolve( artifactFactory.createBuildArtifact( groupIdPrefix + GROUP_API, artifactId, forcedVersion, "pom" ), repos, localRepository );
+                        artifactResolver.resolve(
+                                artifactFactory.createBuildArtifact( groupIdPrefix + GROUP_API, artifactId, forcedVersion, "pom" ),
+                                repos, 
+                                localRepository );
                         dep.setGroupId( groupIdPrefix + GROUP_API );
                     }
                     catch ( AbstractArtifactResolutionException x )
@@ -958,7 +966,8 @@
         {
             MessageDigest shaDig = MessageDigest.getInstance( "SHA1" );
             InputStream is = new FileInputStream( f );
-            try {
+            try
+            {
                 OutputStream os = new DigestOutputStream( new NullOutputStream(), shaDig );
                 IOUtil.copy( is, os );
                 os.close();
@@ -970,12 +979,12 @@
             String sha = encode( shaDig.digest() );
             TermQuery q = new TermQuery( new Term( "1", sha ) );
             TopScoreDocCollector collector = TopScoreDocCollector.create( 5 );
-            searcher.search(q, collector);
+            searcher.search( q, collector );
             ScoreDoc[] hits = collector.topDocs().scoreDocs;
             if ( hits.length >= 1 )
             {
-                int docId = hits[0].doc;    
-                Document doc = searcher.doc(docId);                
+                int docId = hits[0].doc;
+                Document doc = searcher.doc( docId );
                 IndexableField idField = doc.getField( "u" );
                 if ( idField != null )
                 {
@@ -1019,7 +1028,8 @@
         mavenModel.setVersion( wrapper.getVersion() );
         mavenModel.setPackaging( "jar" );
         mavenModel.setModelVersion( "4.0.0" );
-        if ( artefactParent != null ) {
+        if ( artefactParent != null ) 
+        {
             mavenModel.setParent( artefactParent );
         }
         mavenModel.setName( 
@@ -1068,7 +1078,8 @@
 //        mavenModel.setPackaging("nbm-application");
         mavenModel.setPackaging( "pom" );
         mavenModel.setModelVersion( "4.0.0" );
-        if ( artefactParent != null ) {
+        if ( artefactParent != null ) 
+        {
             mavenModel.setParent( artefactParent );
         }
         List<Dependency> deps = new ArrayList<Dependency>();
@@ -1126,8 +1137,8 @@
     {
         return artifactFactory.createBuildArtifact( groupIdPrefix + GROUP_CLUSTER, artifact, version, "pom" );
     }
-
-    private static Pattern PATTERN_CLUSTER = Pattern.compile( "([a-zA-Z]+)[0-9\\.]*" );
+    
+    private static final Pattern PATTERN_CLUSTER = Pattern.compile( "([a-zA-Z]+)[0-9\\.]*" );
     static String stripClusterName( String key )
     {
         Matcher m = PATTERN_CLUSTER.matcher( key );
diff --git a/src/test/java/org/apache/netbeans/nbm/repository/PopulateRepositoryMojoTest.java b/src/test/java/org/apache/netbeans/nbm/repository/PopulateRepositoryMojoTest.java
index 2b01e36..516c4a1 100644
--- a/src/test/java/org/apache/netbeans/nbm/repository/PopulateRepositoryMojoTest.java
+++ b/src/test/java/org/apache/netbeans/nbm/repository/PopulateRepositoryMojoTest.java
@@ -1,3 +1,5 @@
+package org.apache.netbeans.nbm.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -17,8 +19,6 @@
  * under the License.
  */
 
-package org.apache.netbeans.nbm.repository;
-
 import org.apache.netbeans.nbm.repository.PopulateRepositoryMojo;
 import java.io.File;
 import junit.framework.TestCase;