activated Checkstyle back
diff --git a/aether-api/src/main/java/org/eclipse/aether/AbstractForwardingRepositorySystemSession.java b/aether-api/src/main/java/org/eclipse/aether/AbstractForwardingRepositorySystemSession.java
index 011d39e..20df431 100644
--- a/aether-api/src/main/java/org/eclipse/aether/AbstractForwardingRepositorySystemSession.java
+++ b/aether-api/src/main/java/org/eclipse/aether/AbstractForwardingRepositorySystemSession.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 import java.util.Map;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/AbstractRepositoryListener.java b/aether-api/src/main/java/org/eclipse/aether/AbstractRepositoryListener.java
index 74a188d..f42d15e 100644
--- a/aether-api/src/main/java/org/eclipse/aether/AbstractRepositoryListener.java
+++ b/aether-api/src/main/java/org/eclipse/aether/AbstractRepositoryListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 /**
  * A skeleton implementation for custom repository listeners. The callback methods in this class do nothing.
diff --git a/aether-api/src/main/java/org/eclipse/aether/ConfigurationProperties.java b/aether-api/src/main/java/org/eclipse/aether/ConfigurationProperties.java
index b04c1ba..b96a754 100644
--- a/aether-api/src/main/java/org/eclipse/aether/ConfigurationProperties.java
+++ b/aether-api/src/main/java/org/eclipse/aether/ConfigurationProperties.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 /**
  * The keys and defaults for common configuration properties.
diff --git a/aether-api/src/main/java/org/eclipse/aether/DefaultRepositoryCache.java b/aether-api/src/main/java/org/eclipse/aether/DefaultRepositoryCache.java
index ad6b5c5..b645f43 100644
--- a/aether-api/src/main/java/org/eclipse/aether/DefaultRepositoryCache.java
+++ b/aether-api/src/main/java/org/eclipse/aether/DefaultRepositoryCache.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/aether-api/src/main/java/org/eclipse/aether/DefaultRepositorySystemSession.java b/aether-api/src/main/java/org/eclipse/aether/DefaultRepositorySystemSession.java
index 2e570f3..93ebaca 100644
--- a/aether-api/src/main/java/org/eclipse/aether/DefaultRepositorySystemSession.java
+++ b/aether-api/src/main/java/org/eclipse/aether/DefaultRepositorySystemSession.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/aether-api/src/main/java/org/eclipse/aether/DefaultSessionData.java b/aether-api/src/main/java/org/eclipse/aether/DefaultSessionData.java
index bf69eae..e78df3a 100644
--- a/aether-api/src/main/java/org/eclipse/aether/DefaultSessionData.java
+++ b/aether-api/src/main/java/org/eclipse/aether/DefaultSessionData.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
diff --git a/aether-api/src/main/java/org/eclipse/aether/RepositoryCache.java b/aether-api/src/main/java/org/eclipse/aether/RepositoryCache.java
index c8c9f1e..6f9f114 100644
--- a/aether-api/src/main/java/org/eclipse/aether/RepositoryCache.java
+++ b/aether-api/src/main/java/org/eclipse/aether/RepositoryCache.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 /**
  * Caches auxiliary data used during repository access like already processed metadata. The data in the cache is meant
diff --git a/aether-api/src/main/java/org/eclipse/aether/RepositoryEvent.java b/aether-api/src/main/java/org/eclipse/aether/RepositoryEvent.java
index 22187e4..33816ba 100644
--- a/aether-api/src/main/java/org/eclipse/aether/RepositoryEvent.java
+++ b/aether-api/src/main/java/org/eclipse/aether/RepositoryEvent.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 import java.io.File;
 import java.util.Collections;
diff --git a/aether-api/src/main/java/org/eclipse/aether/RepositoryException.java b/aether-api/src/main/java/org/eclipse/aether/RepositoryException.java
index 8d8405f..83a6cac 100644
--- a/aether-api/src/main/java/org/eclipse/aether/RepositoryException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/RepositoryException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 /**
  * The base class for exceptions thrown by the repository system. <em>Note:</em> Unless otherwise noted, instances of
diff --git a/aether-api/src/main/java/org/eclipse/aether/RepositoryListener.java b/aether-api/src/main/java/org/eclipse/aether/RepositoryListener.java
index f837e91..d654630 100644
--- a/aether-api/src/main/java/org/eclipse/aether/RepositoryListener.java
+++ b/aether-api/src/main/java/org/eclipse/aether/RepositoryListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 /**
  * A listener being notified of events from the repository system. In general, the system sends events upon termination
diff --git a/aether-api/src/main/java/org/eclipse/aether/RepositorySystem.java b/aether-api/src/main/java/org/eclipse/aether/RepositorySystem.java
index e914906..8706f89 100644
--- a/aether-api/src/main/java/org/eclipse/aether/RepositorySystem.java
+++ b/aether-api/src/main/java/org/eclipse/aether/RepositorySystem.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/aether-api/src/main/java/org/eclipse/aether/RepositorySystemSession.java b/aether-api/src/main/java/org/eclipse/aether/RepositorySystemSession.java
index 5ee0d42..888f29c 100644
--- a/aether-api/src/main/java/org/eclipse/aether/RepositorySystemSession.java
+++ b/aether-api/src/main/java/org/eclipse/aether/RepositorySystemSession.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 import java.util.Map;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/RequestTrace.java b/aether-api/src/main/java/org/eclipse/aether/RequestTrace.java
index d996eac..86aaa78 100644
--- a/aether-api/src/main/java/org/eclipse/aether/RequestTrace.java
+++ b/aether-api/src/main/java/org/eclipse/aether/RequestTrace.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 /**
  * A trace of nested requests that are performed by the repository system. This trace information can be used to
diff --git a/aether-api/src/main/java/org/eclipse/aether/SessionData.java b/aether-api/src/main/java/org/eclipse/aether/SessionData.java
index a7dd407..b6efeac 100644
--- a/aether-api/src/main/java/org/eclipse/aether/SessionData.java
+++ b/aether-api/src/main/java/org/eclipse/aether/SessionData.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 /**
  * A container for data that is specific to a repository system session. Both components within the repository system
diff --git a/aether-api/src/main/java/org/eclipse/aether/SyncContext.java b/aether-api/src/main/java/org/eclipse/aether/SyncContext.java
index f511baf..2d751c0 100644
--- a/aether-api/src/main/java/org/eclipse/aether/SyncContext.java
+++ b/aether-api/src/main/java/org/eclipse/aether/SyncContext.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 import java.io.Closeable;
 import java.util.Collection;
diff --git a/aether-api/src/main/java/org/eclipse/aether/artifact/AbstractArtifact.java b/aether-api/src/main/java/org/eclipse/aether/artifact/AbstractArtifact.java
index 95ed776..d89260b 100644
--- a/aether-api/src/main/java/org/eclipse/aether/artifact/AbstractArtifact.java
+++ b/aether-api/src/main/java/org/eclipse/aether/artifact/AbstractArtifact.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.artifact;
 
 import java.io.File;
 import java.util.Collections;
diff --git a/aether-api/src/main/java/org/eclipse/aether/artifact/Artifact.java b/aether-api/src/main/java/org/eclipse/aether/artifact/Artifact.java
index 1c3d40c..6323243 100644
--- a/aether-api/src/main/java/org/eclipse/aether/artifact/Artifact.java
+++ b/aether-api/src/main/java/org/eclipse/aether/artifact/Artifact.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.artifact;
 
 import java.io.File;
 import java.util.Map;
diff --git a/aether-api/src/main/java/org/eclipse/aether/artifact/ArtifactProperties.java b/aether-api/src/main/java/org/eclipse/aether/artifact/ArtifactProperties.java
index fef3b06..1108086 100644
--- a/aether-api/src/main/java/org/eclipse/aether/artifact/ArtifactProperties.java
+++ b/aether-api/src/main/java/org/eclipse/aether/artifact/ArtifactProperties.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.artifact;
 
 /**
  * The keys for common properties of artifacts.
diff --git a/aether-api/src/main/java/org/eclipse/aether/artifact/ArtifactType.java b/aether-api/src/main/java/org/eclipse/aether/artifact/ArtifactType.java
index c04a54d..5f87217 100644
--- a/aether-api/src/main/java/org/eclipse/aether/artifact/ArtifactType.java
+++ b/aether-api/src/main/java/org/eclipse/aether/artifact/ArtifactType.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.artifact;
 
 import java.util.Map;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/artifact/ArtifactTypeRegistry.java b/aether-api/src/main/java/org/eclipse/aether/artifact/ArtifactTypeRegistry.java
index 694b631..f379173 100644
--- a/aether-api/src/main/java/org/eclipse/aether/artifact/ArtifactTypeRegistry.java
+++ b/aether-api/src/main/java/org/eclipse/aether/artifact/ArtifactTypeRegistry.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.artifact;
 
 /**
  * A registry of known artifact types.
diff --git a/aether-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifact.java b/aether-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifact.java
index 77625c3..786af74 100644
--- a/aether-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifact.java
+++ b/aether-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifact.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.artifact;
 
 import java.io.File;
 import java.util.Collections;
@@ -56,7 +57,7 @@
      */
     public DefaultArtifact( String coords )
     {
-        this( coords, Collections.<String, String> emptyMap() );
+        this( coords, Collections.<String, String>emptyMap() );
     }
 
     /**
diff --git a/aether-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifactType.java b/aether-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifactType.java
index c7c4357..c0d2ad8 100644
--- a/aether-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifactType.java
+++ b/aether-api/src/main/java/org/eclipse/aether/artifact/DefaultArtifactType.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.artifact;
 
 import java.util.Collections;
 import java.util.HashMap;
diff --git a/aether-api/src/main/java/org/eclipse/aether/artifact/package-info.java b/aether-api/src/main/java/org/eclipse/aether/artifact/package-info.java
index a60cd8c..9a4cc79 100644
--- a/aether-api/src/main/java/org/eclipse/aether/artifact/package-info.java
+++ b/aether-api/src/main/java/org/eclipse/aether/artifact/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-api/src/main/java/org/eclipse/aether/collection/CollectRequest.java b/aether-api/src/main/java/org/eclipse/aether/collection/CollectRequest.java
index dda9f10..d9c2527 100644
--- a/aether-api/src/main/java/org/eclipse/aether/collection/CollectRequest.java
+++ b/aether-api/src/main/java/org/eclipse/aether/collection/CollectRequest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.collection;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.collection;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/aether-api/src/main/java/org/eclipse/aether/collection/CollectResult.java b/aether-api/src/main/java/org/eclipse/aether/collection/CollectResult.java
index e43928b..dd9f02e 100644
--- a/aether-api/src/main/java/org/eclipse/aether/collection/CollectResult.java
+++ b/aether-api/src/main/java/org/eclipse/aether/collection/CollectResult.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.collection;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.collection;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/aether-api/src/main/java/org/eclipse/aether/collection/DependencyCollectionContext.java b/aether-api/src/main/java/org/eclipse/aether/collection/DependencyCollectionContext.java
index 980abe9..671bd2a 100644
--- a/aether-api/src/main/java/org/eclipse/aether/collection/DependencyCollectionContext.java
+++ b/aether-api/src/main/java/org/eclipse/aether/collection/DependencyCollectionContext.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.collection;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.collection;
 
 import java.util.List;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/collection/DependencyCollectionException.java b/aether-api/src/main/java/org/eclipse/aether/collection/DependencyCollectionException.java
index 2b247c1..8a04d79 100644
--- a/aether-api/src/main/java/org/eclipse/aether/collection/DependencyCollectionException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/collection/DependencyCollectionException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.collection;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.collection;
 
 import org.eclipse.aether.RepositoryException;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/collection/DependencyGraphTransformationContext.java b/aether-api/src/main/java/org/eclipse/aether/collection/DependencyGraphTransformationContext.java
index 739c02e..ba66474 100644
--- a/aether-api/src/main/java/org/eclipse/aether/collection/DependencyGraphTransformationContext.java
+++ b/aether-api/src/main/java/org/eclipse/aether/collection/DependencyGraphTransformationContext.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.collection;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.collection;
 
 import org.eclipse.aether.RepositorySystemSession;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/collection/DependencyGraphTransformer.java b/aether-api/src/main/java/org/eclipse/aether/collection/DependencyGraphTransformer.java
index 426ce7f..c472500 100644
--- a/aether-api/src/main/java/org/eclipse/aether/collection/DependencyGraphTransformer.java
+++ b/aether-api/src/main/java/org/eclipse/aether/collection/DependencyGraphTransformer.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.collection;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.collection;
 
 import org.eclipse.aether.RepositoryException;
 import org.eclipse.aether.graph.DependencyNode;
diff --git a/aether-api/src/main/java/org/eclipse/aether/collection/DependencyManagement.java b/aether-api/src/main/java/org/eclipse/aether/collection/DependencyManagement.java
index fbfcf5e..054bfe0 100644
--- a/aether-api/src/main/java/org/eclipse/aether/collection/DependencyManagement.java
+++ b/aether-api/src/main/java/org/eclipse/aether/collection/DependencyManagement.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.collection;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.collection;
 
 import java.util.Collection;
 import java.util.Map;
diff --git a/aether-api/src/main/java/org/eclipse/aether/collection/DependencyManager.java b/aether-api/src/main/java/org/eclipse/aether/collection/DependencyManager.java
index 0b85318..993e388 100644
--- a/aether-api/src/main/java/org/eclipse/aether/collection/DependencyManager.java
+++ b/aether-api/src/main/java/org/eclipse/aether/collection/DependencyManager.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.collection;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.collection;
 
 import org.eclipse.aether.graph.Dependency;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/collection/DependencySelector.java b/aether-api/src/main/java/org/eclipse/aether/collection/DependencySelector.java
index 4d40db5..b257ffa 100644
--- a/aether-api/src/main/java/org/eclipse/aether/collection/DependencySelector.java
+++ b/aether-api/src/main/java/org/eclipse/aether/collection/DependencySelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.collection;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.collection;
 
 import org.eclipse.aether.graph.Dependency;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/collection/DependencyTraverser.java b/aether-api/src/main/java/org/eclipse/aether/collection/DependencyTraverser.java
index e86bbd6..be1887b 100644
--- a/aether-api/src/main/java/org/eclipse/aether/collection/DependencyTraverser.java
+++ b/aether-api/src/main/java/org/eclipse/aether/collection/DependencyTraverser.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.collection;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.collection;
 
 import org.eclipse.aether.graph.Dependency;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/collection/UnsolvableVersionConflictException.java b/aether-api/src/main/java/org/eclipse/aether/collection/UnsolvableVersionConflictException.java
index f1dd8b4..54a7004 100644
--- a/aether-api/src/main/java/org/eclipse/aether/collection/UnsolvableVersionConflictException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/collection/UnsolvableVersionConflictException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.collection;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.collection;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/aether-api/src/main/java/org/eclipse/aether/collection/VersionFilter.java b/aether-api/src/main/java/org/eclipse/aether/collection/VersionFilter.java
index d25f86b..fb36747 100644
--- a/aether-api/src/main/java/org/eclipse/aether/collection/VersionFilter.java
+++ b/aether-api/src/main/java/org/eclipse/aether/collection/VersionFilter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.collection;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.collection;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/aether-api/src/main/java/org/eclipse/aether/collection/package-info.java b/aether-api/src/main/java/org/eclipse/aether/collection/package-info.java
index 913a4fb..414629f 100644
--- a/aether-api/src/main/java/org/eclipse/aether/collection/package-info.java
+++ b/aether-api/src/main/java/org/eclipse/aether/collection/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-api/src/main/java/org/eclipse/aether/deployment/DeployRequest.java b/aether-api/src/main/java/org/eclipse/aether/deployment/DeployRequest.java
index 1e237fe..637f47d 100644
--- a/aether-api/src/main/java/org/eclipse/aether/deployment/DeployRequest.java
+++ b/aether-api/src/main/java/org/eclipse/aether/deployment/DeployRequest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.deployment;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.deployment;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-api/src/main/java/org/eclipse/aether/deployment/DeployResult.java b/aether-api/src/main/java/org/eclipse/aether/deployment/DeployResult.java
index f7a4bb6..f75705e 100644
--- a/aether-api/src/main/java/org/eclipse/aether/deployment/DeployResult.java
+++ b/aether-api/src/main/java/org/eclipse/aether/deployment/DeployResult.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.deployment;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.deployment;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-api/src/main/java/org/eclipse/aether/deployment/DeploymentException.java b/aether-api/src/main/java/org/eclipse/aether/deployment/DeploymentException.java
index b0dde93..53252ba 100644
--- a/aether-api/src/main/java/org/eclipse/aether/deployment/DeploymentException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/deployment/DeploymentException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.deployment;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.deployment;
 
 import org.eclipse.aether.RepositoryException;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/deployment/package-info.java b/aether-api/src/main/java/org/eclipse/aether/deployment/package-info.java
index aa7428c..dc50c21 100644
--- a/aether-api/src/main/java/org/eclipse/aether/deployment/package-info.java
+++ b/aether-api/src/main/java/org/eclipse/aether/deployment/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java b/aether-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
index 1d2040d..66a60c6 100644
--- a/aether-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
+++ b/aether-api/src/main/java/org/eclipse/aether/graph/DefaultDependencyNode.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.graph;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.graph;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-api/src/main/java/org/eclipse/aether/graph/Dependency.java b/aether-api/src/main/java/org/eclipse/aether/graph/Dependency.java
index 43a5182..b9e7cb4 100644
--- a/aether-api/src/main/java/org/eclipse/aether/graph/Dependency.java
+++ b/aether-api/src/main/java/org/eclipse/aether/graph/Dependency.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.graph;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.graph;
 
 import java.util.AbstractSet;
 import java.util.Collection;
diff --git a/aether-api/src/main/java/org/eclipse/aether/graph/DependencyCycle.java b/aether-api/src/main/java/org/eclipse/aether/graph/DependencyCycle.java
index bbef09f..1076ab8 100644
--- a/aether-api/src/main/java/org/eclipse/aether/graph/DependencyCycle.java
+++ b/aether-api/src/main/java/org/eclipse/aether/graph/DependencyCycle.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.graph;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.graph;
 
 import java.util.List;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/graph/DependencyFilter.java b/aether-api/src/main/java/org/eclipse/aether/graph/DependencyFilter.java
index a82b9bb..41776ff 100644
--- a/aether-api/src/main/java/org/eclipse/aether/graph/DependencyFilter.java
+++ b/aether-api/src/main/java/org/eclipse/aether/graph/DependencyFilter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.graph;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.graph;
 
 import java.util.List;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/graph/DependencyNode.java b/aether-api/src/main/java/org/eclipse/aether/graph/DependencyNode.java
index 040c1fa..2551043 100644
--- a/aether-api/src/main/java/org/eclipse/aether/graph/DependencyNode.java
+++ b/aether-api/src/main/java/org/eclipse/aether/graph/DependencyNode.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.graph;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.graph;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/aether-api/src/main/java/org/eclipse/aether/graph/DependencyVisitor.java b/aether-api/src/main/java/org/eclipse/aether/graph/DependencyVisitor.java
index 4808755..2a85f2d 100644
--- a/aether-api/src/main/java/org/eclipse/aether/graph/DependencyVisitor.java
+++ b/aether-api/src/main/java/org/eclipse/aether/graph/DependencyVisitor.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.graph;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.graph;
 
 /**
  * A visitor for nodes of the dependency graph.
diff --git a/aether-api/src/main/java/org/eclipse/aether/graph/Exclusion.java b/aether-api/src/main/java/org/eclipse/aether/graph/Exclusion.java
index 96e2dcd..497cf43 100644
--- a/aether-api/src/main/java/org/eclipse/aether/graph/Exclusion.java
+++ b/aether-api/src/main/java/org/eclipse/aether/graph/Exclusion.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.graph;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.graph;
 
 /**
  * An exclusion of one or more transitive dependencies. <em>Note:</em> Instances of this class are immutable and the
diff --git a/aether-api/src/main/java/org/eclipse/aether/graph/package-info.java b/aether-api/src/main/java/org/eclipse/aether/graph/package-info.java
index 158ce5f..c3ba9db 100644
--- a/aether-api/src/main/java/org/eclipse/aether/graph/package-info.java
+++ b/aether-api/src/main/java/org/eclipse/aether/graph/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-api/src/main/java/org/eclipse/aether/installation/InstallRequest.java b/aether-api/src/main/java/org/eclipse/aether/installation/InstallRequest.java
index 95eb4bf..f9b3163 100644
--- a/aether-api/src/main/java/org/eclipse/aether/installation/InstallRequest.java
+++ b/aether-api/src/main/java/org/eclipse/aether/installation/InstallRequest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.installation;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.installation;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-api/src/main/java/org/eclipse/aether/installation/InstallResult.java b/aether-api/src/main/java/org/eclipse/aether/installation/InstallResult.java
index ad9f2b9..6624585 100644
--- a/aether-api/src/main/java/org/eclipse/aether/installation/InstallResult.java
+++ b/aether-api/src/main/java/org/eclipse/aether/installation/InstallResult.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.installation;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.installation;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-api/src/main/java/org/eclipse/aether/installation/InstallationException.java b/aether-api/src/main/java/org/eclipse/aether/installation/InstallationException.java
index 758df12..9a556bb 100644
--- a/aether-api/src/main/java/org/eclipse/aether/installation/InstallationException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/installation/InstallationException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.installation;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.installation;
 
 import org.eclipse.aether.RepositoryException;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/installation/package-info.java b/aether-api/src/main/java/org/eclipse/aether/installation/package-info.java
index 78e05d6..d4ac077 100644
--- a/aether-api/src/main/java/org/eclipse/aether/installation/package-info.java
+++ b/aether-api/src/main/java/org/eclipse/aether/installation/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-api/src/main/java/org/eclipse/aether/metadata/AbstractMetadata.java b/aether-api/src/main/java/org/eclipse/aether/metadata/AbstractMetadata.java
index 88a7807..49dab35 100644
--- a/aether-api/src/main/java/org/eclipse/aether/metadata/AbstractMetadata.java
+++ b/aether-api/src/main/java/org/eclipse/aether/metadata/AbstractMetadata.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.metadata;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.metadata;
 
 import java.io.File;
 import java.util.Collections;
diff --git a/aether-api/src/main/java/org/eclipse/aether/metadata/DefaultMetadata.java b/aether-api/src/main/java/org/eclipse/aether/metadata/DefaultMetadata.java
index a7e32fd..1efbb72 100644
--- a/aether-api/src/main/java/org/eclipse/aether/metadata/DefaultMetadata.java
+++ b/aether-api/src/main/java/org/eclipse/aether/metadata/DefaultMetadata.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.metadata;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.metadata;
 
 import java.io.File;
 import java.util.Map;
diff --git a/aether-api/src/main/java/org/eclipse/aether/metadata/MergeableMetadata.java b/aether-api/src/main/java/org/eclipse/aether/metadata/MergeableMetadata.java
index b8039d5..deaff70 100644
--- a/aether-api/src/main/java/org/eclipse/aether/metadata/MergeableMetadata.java
+++ b/aether-api/src/main/java/org/eclipse/aether/metadata/MergeableMetadata.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.metadata;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.metadata;
 
 import java.io.File;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/metadata/Metadata.java b/aether-api/src/main/java/org/eclipse/aether/metadata/Metadata.java
index 0622372..84e9212 100644
--- a/aether-api/src/main/java/org/eclipse/aether/metadata/Metadata.java
+++ b/aether-api/src/main/java/org/eclipse/aether/metadata/Metadata.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.metadata;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.metadata;
 
 import java.io.File;
 import java.util.Map;
diff --git a/aether-api/src/main/java/org/eclipse/aether/metadata/package-info.java b/aether-api/src/main/java/org/eclipse/aether/metadata/package-info.java
index b328077..e41f98e 100644
--- a/aether-api/src/main/java/org/eclipse/aether/metadata/package-info.java
+++ b/aether-api/src/main/java/org/eclipse/aether/metadata/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-api/src/main/java/org/eclipse/aether/package-info.java b/aether-api/src/main/java/org/eclipse/aether/package-info.java
index ec7c54f..8d11fa8 100644
--- a/aether-api/src/main/java/org/eclipse/aether/package-info.java
+++ b/aether-api/src/main/java/org/eclipse/aether/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/ArtifactRepository.java b/aether-api/src/main/java/org/eclipse/aether/repository/ArtifactRepository.java
index 595490c..c62bf87 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/ArtifactRepository.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/ArtifactRepository.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 /**
  * A repository hosting artifacts.
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/Authentication.java b/aether-api/src/main/java/org/eclipse/aether/repository/Authentication.java
index d4b6905..d85c2a2 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/Authentication.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/Authentication.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import java.util.Map;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/AuthenticationContext.java b/aether-api/src/main/java/org/eclipse/aether/repository/AuthenticationContext.java
index 93e14d8..bd248a0 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/AuthenticationContext.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/AuthenticationContext.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/AuthenticationDigest.java b/aether-api/src/main/java/org/eclipse/aether/repository/AuthenticationDigest.java
index 5d01b3b..03725b6 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/AuthenticationDigest.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/AuthenticationDigest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/AuthenticationSelector.java b/aether-api/src/main/java/org/eclipse/aether/repository/AuthenticationSelector.java
index c8ce532..0637d1c 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/AuthenticationSelector.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/AuthenticationSelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 /**
  * Selects authentication for a given remote repository.
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/LocalArtifactRegistration.java b/aether-api/src/main/java/org/eclipse/aether/repository/LocalArtifactRegistration.java
index 419608b..1065779 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/LocalArtifactRegistration.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/LocalArtifactRegistration.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/LocalArtifactRequest.java b/aether-api/src/main/java/org/eclipse/aether/repository/LocalArtifactRequest.java
index fc24f87..8f6eabf 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/LocalArtifactRequest.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/LocalArtifactRequest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/LocalArtifactResult.java b/aether-api/src/main/java/org/eclipse/aether/repository/LocalArtifactResult.java
index f242da9..e611b27 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/LocalArtifactResult.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/LocalArtifactResult.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import java.io.File;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/LocalMetadataRegistration.java b/aether-api/src/main/java/org/eclipse/aether/repository/LocalMetadataRegistration.java
index c8616b9..dd0d587 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/LocalMetadataRegistration.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/LocalMetadataRegistration.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/LocalMetadataRequest.java b/aether-api/src/main/java/org/eclipse/aether/repository/LocalMetadataRequest.java
index ae5a6db..4c8f270 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/LocalMetadataRequest.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/LocalMetadataRequest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.metadata.Metadata;
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/LocalMetadataResult.java b/aether-api/src/main/java/org/eclipse/aether/repository/LocalMetadataResult.java
index 5358538..29bd045 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/LocalMetadataResult.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/LocalMetadataResult.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import java.io.File;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/LocalRepository.java b/aether-api/src/main/java/org/eclipse/aether/repository/LocalRepository.java
index 042c5e3..32dce73 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/LocalRepository.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/LocalRepository.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import java.io.File;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/LocalRepositoryManager.java b/aether-api/src/main/java/org/eclipse/aether/repository/LocalRepositoryManager.java
index ea3b5c7..649707c 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/LocalRepositoryManager.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/LocalRepositoryManager.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/MirrorSelector.java b/aether-api/src/main/java/org/eclipse/aether/repository/MirrorSelector.java
index 61b4f0c..d50262c 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/MirrorSelector.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/MirrorSelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 /**
  * Selects a mirror for a given remote repository.
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/NoLocalRepositoryManagerException.java b/aether-api/src/main/java/org/eclipse/aether/repository/NoLocalRepositoryManagerException.java
index eee4d5c..c804821 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/NoLocalRepositoryManagerException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/NoLocalRepositoryManagerException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import org.eclipse.aether.RepositoryException;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/Proxy.java b/aether-api/src/main/java/org/eclipse/aether/repository/Proxy.java
index d5a33c9..8e8cba1 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/Proxy.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/Proxy.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 /**
  * A proxy to use for connections to a repository.
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/ProxySelector.java b/aether-api/src/main/java/org/eclipse/aether/repository/ProxySelector.java
index aab1828..29b9e4e 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/ProxySelector.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/ProxySelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 /**
  * Selects a proxy for a given remote repository.
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/RemoteRepository.java b/aether-api/src/main/java/org/eclipse/aether/repository/RemoteRepository.java
index 83afaa2..31259ca 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/RemoteRepository.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/RemoteRepository.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/RepositoryPolicy.java b/aether-api/src/main/java/org/eclipse/aether/repository/RepositoryPolicy.java
index 469556d..18fb850 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/RepositoryPolicy.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/RepositoryPolicy.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 /**
  * A policy controlling access to a repository.
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/WorkspaceReader.java b/aether-api/src/main/java/org/eclipse/aether/repository/WorkspaceReader.java
index eebcd25..d1140f3 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/WorkspaceReader.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/WorkspaceReader.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import java.io.File;
 import java.util.List;
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/WorkspaceRepository.java b/aether-api/src/main/java/org/eclipse/aether/repository/WorkspaceRepository.java
index 6bde85b..38dc5c5 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/WorkspaceRepository.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/WorkspaceRepository.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import java.util.UUID;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/repository/package-info.java b/aether-api/src/main/java/org/eclipse/aether/repository/package-info.java
index 13aeef2..538e7f1 100644
--- a/aether-api/src/main/java/org/eclipse/aether/repository/package-info.java
+++ b/aether-api/src/main/java/org/eclipse/aether/repository/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorException.java b/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorException.java
index e0655f2..d645a82 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import org.eclipse.aether.RepositoryException;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorPolicy.java b/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorPolicy.java
index afd0ab0..c4de9b2 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorPolicy.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorPolicy.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import org.eclipse.aether.RepositorySystemSession;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorPolicyRequest.java b/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorPolicyRequest.java
index 866d287..ffaac16 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorPolicyRequest.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorPolicyRequest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import org.eclipse.aether.artifact.Artifact;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorRequest.java b/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorRequest.java
index 0e0c6d9..387b1dc 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorRequest.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorRequest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorResult.java b/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorResult.java
index 74fbbd1..4c53b6e 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorResult.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactDescriptorResult.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactRequest.java b/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactRequest.java
index 6b18aab..a220207 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactRequest.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactRequest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactResolutionException.java b/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactResolutionException.java
index a1644c8..bfae4a0 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactResolutionException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactResolutionException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import java.util.Collections;
 import java.util.List;
@@ -42,7 +43,7 @@
     public ArtifactResolutionException( List<ArtifactResult> results )
     {
         super( getMessage( results ), getCause( results ) );
-        this.results = ( results != null ) ? results : Collections.<ArtifactResult> emptyList();
+        this.results = ( results != null ) ? results : Collections.<ArtifactResult>emptyList();
     }
 
     /**
@@ -54,7 +55,7 @@
     public ArtifactResolutionException( List<ArtifactResult> results, String message )
     {
         super( message, getCause( results ) );
-        this.results = ( results != null ) ? results : Collections.<ArtifactResult> emptyList();
+        this.results = ( results != null ) ? results : Collections.<ArtifactResult>emptyList();
     }
 
     /**
@@ -67,7 +68,7 @@
     public ArtifactResolutionException( List<ArtifactResult> results, String message, Throwable cause )
     {
         super( message, cause );
-        this.results = ( results != null ) ? results : Collections.<ArtifactResult> emptyList();
+        this.results = ( results != null ) ? results : Collections.<ArtifactResult>emptyList();
     }
 
     /**
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactResult.java b/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactResult.java
index 851af22..5ae820b 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactResult.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/ArtifactResult.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/DependencyRequest.java b/aether-api/src/main/java/org/eclipse/aether/resolution/DependencyRequest.java
index cf3c2af..138304a 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/DependencyRequest.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/DependencyRequest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/DependencyResolutionException.java b/aether-api/src/main/java/org/eclipse/aether/resolution/DependencyResolutionException.java
index b063e42..2c12b57 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/DependencyResolutionException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/DependencyResolutionException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import org.eclipse.aether.RepositoryException;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/DependencyResult.java b/aether-api/src/main/java/org/eclipse/aether/resolution/DependencyResult.java
index b80b17a..030e923 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/DependencyResult.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/DependencyResult.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import java.util.Collections;
 import java.util.List;
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/MetadataRequest.java b/aether-api/src/main/java/org/eclipse/aether/resolution/MetadataRequest.java
index 1cf19b2..86063ff 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/MetadataRequest.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/MetadataRequest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/MetadataResult.java b/aether-api/src/main/java/org/eclipse/aether/resolution/MetadataResult.java
index a14e556..2bba499 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/MetadataResult.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/MetadataResult.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/ResolutionErrorPolicy.java b/aether-api/src/main/java/org/eclipse/aether/resolution/ResolutionErrorPolicy.java
index 7c520e5..5158fa0 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/ResolutionErrorPolicy.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/ResolutionErrorPolicy.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/ResolutionErrorPolicyRequest.java b/aether-api/src/main/java/org/eclipse/aether/resolution/ResolutionErrorPolicyRequest.java
index 758d3a9..9126914 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/ResolutionErrorPolicyRequest.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/ResolutionErrorPolicyRequest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import org.eclipse.aether.repository.RemoteRepository;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/VersionRangeRequest.java b/aether-api/src/main/java/org/eclipse/aether/resolution/VersionRangeRequest.java
index 929afdb..d6aa16b 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/VersionRangeRequest.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/VersionRangeRequest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/VersionRangeResolutionException.java b/aether-api/src/main/java/org/eclipse/aether/resolution/VersionRangeResolutionException.java
index ed8b5f2..deb0e52 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/VersionRangeResolutionException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/VersionRangeResolutionException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import org.eclipse.aether.RepositoryException;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/VersionRangeResult.java b/aether-api/src/main/java/org/eclipse/aether/resolution/VersionRangeResult.java
index b7e9515..4749f7c 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/VersionRangeResult.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/VersionRangeResult.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/VersionRequest.java b/aether-api/src/main/java/org/eclipse/aether/resolution/VersionRequest.java
index 1eedc60..3dde7dd 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/VersionRequest.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/VersionRequest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/VersionResolutionException.java b/aether-api/src/main/java/org/eclipse/aether/resolution/VersionResolutionException.java
index 2daf01b..1aca861 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/VersionResolutionException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/VersionResolutionException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import org.eclipse.aether.RepositoryException;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/VersionResult.java b/aether-api/src/main/java/org/eclipse/aether/resolution/VersionResult.java
index d5118de..5125773 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/VersionResult.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/VersionResult.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.resolution;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.resolution;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/aether-api/src/main/java/org/eclipse/aether/resolution/package-info.java b/aether-api/src/main/java/org/eclipse/aether/resolution/package-info.java
index 49a45b2..33f9ef8 100644
--- a/aether-api/src/main/java/org/eclipse/aether/resolution/package-info.java
+++ b/aether-api/src/main/java/org/eclipse/aether/resolution/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-api/src/main/java/org/eclipse/aether/transfer/AbstractTransferListener.java b/aether-api/src/main/java/org/eclipse/aether/transfer/AbstractTransferListener.java
index 6266f75..5691e31 100644
--- a/aether-api/src/main/java/org/eclipse/aether/transfer/AbstractTransferListener.java
+++ b/aether-api/src/main/java/org/eclipse/aether/transfer/AbstractTransferListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transfer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transfer;
 
 /**
  * A skeleton implementation for custom transfer listeners. The callback methods in this class do nothing.
diff --git a/aether-api/src/main/java/org/eclipse/aether/transfer/ArtifactNotFoundException.java b/aether-api/src/main/java/org/eclipse/aether/transfer/ArtifactNotFoundException.java
index ed005cf..89a50d4 100644
--- a/aether-api/src/main/java/org/eclipse/aether/transfer/ArtifactNotFoundException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/transfer/ArtifactNotFoundException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transfer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transfer;
 
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.artifact.ArtifactProperties;
diff --git a/aether-api/src/main/java/org/eclipse/aether/transfer/ArtifactTransferException.java b/aether-api/src/main/java/org/eclipse/aether/transfer/ArtifactTransferException.java
index 6ca445d..087040f 100644
--- a/aether-api/src/main/java/org/eclipse/aether/transfer/ArtifactTransferException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/transfer/ArtifactTransferException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transfer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transfer;
 
 import org.eclipse.aether.RepositoryException;
 import org.eclipse.aether.artifact.Artifact;
diff --git a/aether-api/src/main/java/org/eclipse/aether/transfer/ChecksumFailureException.java b/aether-api/src/main/java/org/eclipse/aether/transfer/ChecksumFailureException.java
index 13e4ac6..1dbc6b0 100644
--- a/aether-api/src/main/java/org/eclipse/aether/transfer/ChecksumFailureException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/transfer/ChecksumFailureException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transfer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transfer;
 
 import org.eclipse.aether.RepositoryException;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/transfer/MetadataNotFoundException.java b/aether-api/src/main/java/org/eclipse/aether/transfer/MetadataNotFoundException.java
index 38addea..9642621 100644
--- a/aether-api/src/main/java/org/eclipse/aether/transfer/MetadataNotFoundException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/transfer/MetadataNotFoundException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transfer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transfer;
 
 import org.eclipse.aether.metadata.Metadata;
 import org.eclipse.aether.repository.LocalRepository;
diff --git a/aether-api/src/main/java/org/eclipse/aether/transfer/MetadataTransferException.java b/aether-api/src/main/java/org/eclipse/aether/transfer/MetadataTransferException.java
index 55caafd..df6374c 100644
--- a/aether-api/src/main/java/org/eclipse/aether/transfer/MetadataTransferException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/transfer/MetadataTransferException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transfer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transfer;
 
 import org.eclipse.aether.RepositoryException;
 import org.eclipse.aether.metadata.Metadata;
diff --git a/aether-api/src/main/java/org/eclipse/aether/transfer/NoRepositoryConnectorException.java b/aether-api/src/main/java/org/eclipse/aether/transfer/NoRepositoryConnectorException.java
index b8dacdb..3140569 100644
--- a/aether-api/src/main/java/org/eclipse/aether/transfer/NoRepositoryConnectorException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/transfer/NoRepositoryConnectorException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transfer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transfer;
 
 import org.eclipse.aether.RepositoryException;
 import org.eclipse.aether.repository.RemoteRepository;
diff --git a/aether-api/src/main/java/org/eclipse/aether/transfer/NoRepositoryLayoutException.java b/aether-api/src/main/java/org/eclipse/aether/transfer/NoRepositoryLayoutException.java
index 89656eb..3fc05bb 100644
--- a/aether-api/src/main/java/org/eclipse/aether/transfer/NoRepositoryLayoutException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/transfer/NoRepositoryLayoutException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transfer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transfer;
 
 import org.eclipse.aether.RepositoryException;
 import org.eclipse.aether.repository.RemoteRepository;
diff --git a/aether-api/src/main/java/org/eclipse/aether/transfer/NoTransporterException.java b/aether-api/src/main/java/org/eclipse/aether/transfer/NoTransporterException.java
index 5f79814..5d98558 100644
--- a/aether-api/src/main/java/org/eclipse/aether/transfer/NoTransporterException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/transfer/NoTransporterException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transfer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transfer;
 
 import org.eclipse.aether.RepositoryException;
 import org.eclipse.aether.repository.RemoteRepository;
diff --git a/aether-api/src/main/java/org/eclipse/aether/transfer/RepositoryOfflineException.java b/aether-api/src/main/java/org/eclipse/aether/transfer/RepositoryOfflineException.java
index 1763720..02d4680 100644
--- a/aether-api/src/main/java/org/eclipse/aether/transfer/RepositoryOfflineException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/transfer/RepositoryOfflineException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transfer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transfer;
 
 import org.eclipse.aether.RepositoryException;
 import org.eclipse.aether.repository.RemoteRepository;
diff --git a/aether-api/src/main/java/org/eclipse/aether/transfer/TransferCancelledException.java b/aether-api/src/main/java/org/eclipse/aether/transfer/TransferCancelledException.java
index 3b339c7..88caa13 100644
--- a/aether-api/src/main/java/org/eclipse/aether/transfer/TransferCancelledException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/transfer/TransferCancelledException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transfer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transfer;
 
 import org.eclipse.aether.RepositoryException;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/transfer/TransferEvent.java b/aether-api/src/main/java/org/eclipse/aether/transfer/TransferEvent.java
index e2d98da..1599a82 100644
--- a/aether-api/src/main/java/org/eclipse/aether/transfer/TransferEvent.java
+++ b/aether-api/src/main/java/org/eclipse/aether/transfer/TransferEvent.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transfer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transfer;
 
 import java.nio.ByteBuffer;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/transfer/TransferListener.java b/aether-api/src/main/java/org/eclipse/aether/transfer/TransferListener.java
index 4619e8a..18019a9 100644
--- a/aether-api/src/main/java/org/eclipse/aether/transfer/TransferListener.java
+++ b/aether-api/src/main/java/org/eclipse/aether/transfer/TransferListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transfer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transfer;
 
 /**
  * A listener being notified of artifact/metadata transfers from/to remote repositories. The listener may be called from
diff --git a/aether-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java b/aether-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java
index 14f0563..cbe0230 100644
--- a/aether-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java
+++ b/aether-api/src/main/java/org/eclipse/aether/transfer/TransferResource.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transfer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transfer;
 
 import java.io.File;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/transfer/package-info.java b/aether-api/src/main/java/org/eclipse/aether/transfer/package-info.java
index 8d02b53..541b244 100644
--- a/aether-api/src/main/java/org/eclipse/aether/transfer/package-info.java
+++ b/aether-api/src/main/java/org/eclipse/aether/transfer/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-api/src/main/java/org/eclipse/aether/version/InvalidVersionSpecificationException.java b/aether-api/src/main/java/org/eclipse/aether/version/InvalidVersionSpecificationException.java
index c186c05..a576844 100644
--- a/aether-api/src/main/java/org/eclipse/aether/version/InvalidVersionSpecificationException.java
+++ b/aether-api/src/main/java/org/eclipse/aether/version/InvalidVersionSpecificationException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.version;
 
 import org.eclipse.aether.RepositoryException;
 
diff --git a/aether-api/src/main/java/org/eclipse/aether/version/Version.java b/aether-api/src/main/java/org/eclipse/aether/version/Version.java
index bf363a8..41c02c0 100644
--- a/aether-api/src/main/java/org/eclipse/aether/version/Version.java
+++ b/aether-api/src/main/java/org/eclipse/aether/version/Version.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.version;
 
 /**
  * A parsed artifact version.
diff --git a/aether-api/src/main/java/org/eclipse/aether/version/VersionConstraint.java b/aether-api/src/main/java/org/eclipse/aether/version/VersionConstraint.java
index edfaf9f..1c68587 100644
--- a/aether-api/src/main/java/org/eclipse/aether/version/VersionConstraint.java
+++ b/aether-api/src/main/java/org/eclipse/aether/version/VersionConstraint.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.version;
 
 /**
  * A constraint on versions for a dependency. A constraint can either consist of a version range (e.g. "[1, ]") or a
diff --git a/aether-api/src/main/java/org/eclipse/aether/version/VersionRange.java b/aether-api/src/main/java/org/eclipse/aether/version/VersionRange.java
index 7700c52..e355cf5 100644
--- a/aether-api/src/main/java/org/eclipse/aether/version/VersionRange.java
+++ b/aether-api/src/main/java/org/eclipse/aether/version/VersionRange.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.version;
 
 /**
  * A range of versions.
diff --git a/aether-api/src/main/java/org/eclipse/aether/version/VersionScheme.java b/aether-api/src/main/java/org/eclipse/aether/version/VersionScheme.java
index eb0c74b..c765a03 100644
--- a/aether-api/src/main/java/org/eclipse/aether/version/VersionScheme.java
+++ b/aether-api/src/main/java/org/eclipse/aether/version/VersionScheme.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.version;
 
 /**
  * A version scheme that handles interpretation of version strings to facilitate their comparison.
diff --git a/aether-api/src/main/java/org/eclipse/aether/version/package-info.java b/aether-api/src/main/java/org/eclipse/aether/version/package-info.java
index 5e8fb55..a16dd64 100644
--- a/aether-api/src/main/java/org/eclipse/aether/version/package-info.java
+++ b/aether-api/src/main/java/org/eclipse/aether/version/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-api/src/test/java/org/eclipse/aether/AbstractForwardingRepositorySystemSessionTest.java b/aether-api/src/test/java/org/eclipse/aether/AbstractForwardingRepositorySystemSessionTest.java
index af1c072..5ad2475 100644
--- a/aether-api/src/test/java/org/eclipse/aether/AbstractForwardingRepositorySystemSessionTest.java
+++ b/aether-api/src/test/java/org/eclipse/aether/AbstractForwardingRepositorySystemSessionTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-api/src/test/java/org/eclipse/aether/AbstractRepositoryListenerTest.java b/aether-api/src/test/java/org/eclipse/aether/AbstractRepositoryListenerTest.java
index 0ca660a..74c617f 100644
--- a/aether-api/src/test/java/org/eclipse/aether/AbstractRepositoryListenerTest.java
+++ b/aether-api/src/test/java/org/eclipse/aether/AbstractRepositoryListenerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java b/aether-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java
index 42d4517..ad5dfc5 100644
--- a/aether-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java
+++ b/aether-api/src/test/java/org/eclipse/aether/DefaultRepositoryCacheTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java b/aether-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java
index 1f4a4c2..91afeb5 100644
--- a/aether-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java
+++ b/aether-api/src/test/java/org/eclipse/aether/DefaultRepositorySystemSessionTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java b/aether-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java
index 872fc90..58f3649 100644
--- a/aether-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java
+++ b/aether-api/src/test/java/org/eclipse/aether/DefaultSessionDataTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-api/src/test/java/org/eclipse/aether/RepositoryExceptionTest.java b/aether-api/src/test/java/org/eclipse/aether/RepositoryExceptionTest.java
index 2763453..c3246be 100644
--- a/aether-api/src/test/java/org/eclipse/aether/RepositoryExceptionTest.java
+++ b/aether-api/src/test/java/org/eclipse/aether/RepositoryExceptionTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/aether-api/src/test/java/org/eclipse/aether/RequestTraceTest.java b/aether-api/src/test/java/org/eclipse/aether/RequestTraceTest.java
index 26b43b1..63e5877 100644
--- a/aether-api/src/test/java/org/eclipse/aether/RequestTraceTest.java
+++ b/aether-api/src/test/java/org/eclipse/aether/RequestTraceTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-api/src/test/java/org/eclipse/aether/artifact/DefaultArtifactTest.java b/aether-api/src/test/java/org/eclipse/aether/artifact/DefaultArtifactTest.java
index 39c7497..d8ac40c 100644
--- a/aether-api/src/test/java/org/eclipse/aether/artifact/DefaultArtifactTest.java
+++ b/aether-api/src/test/java/org/eclipse/aether/artifact/DefaultArtifactTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.artifact;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-api/src/test/java/org/eclipse/aether/graph/DependencyTest.java b/aether-api/src/test/java/org/eclipse/aether/graph/DependencyTest.java
index 28da7a3..c96746d 100644
--- a/aether-api/src/test/java/org/eclipse/aether/graph/DependencyTest.java
+++ b/aether-api/src/test/java/org/eclipse/aether/graph/DependencyTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.graph;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.graph;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-api/src/test/java/org/eclipse/aether/repository/AuthenticationContextTest.java b/aether-api/src/test/java/org/eclipse/aether/repository/AuthenticationContextTest.java
index 12c2798..6d579a1 100644
--- a/aether-api/src/test/java/org/eclipse/aether/repository/AuthenticationContextTest.java
+++ b/aether-api/src/test/java/org/eclipse/aether/repository/AuthenticationContextTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-api/src/test/java/org/eclipse/aether/repository/AuthenticationDigestTest.java b/aether-api/src/test/java/org/eclipse/aether/repository/AuthenticationDigestTest.java
index 5ee84d0..387a3da 100644
--- a/aether-api/src/test/java/org/eclipse/aether/repository/AuthenticationDigestTest.java
+++ b/aether-api/src/test/java/org/eclipse/aether/repository/AuthenticationDigestTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryBuilderTest.java b/aether-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryBuilderTest.java
index 5cf3092..a384705 100644
--- a/aether-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryBuilderTest.java
+++ b/aether-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryBuilderTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryTest.java b/aether-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryTest.java
index 951a5e3..97f0b3e 100644
--- a/aether-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryTest.java
+++ b/aether-api/src/test/java/org/eclipse/aether/repository/RemoteRepositoryTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.repository;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-api/src/test/java/org/eclipse/aether/transfer/AbstractTransferListenerTest.java b/aether-api/src/test/java/org/eclipse/aether/transfer/AbstractTransferListenerTest.java
index 82403a2..87c1472 100644
--- a/aether-api/src/test/java/org/eclipse/aether/transfer/AbstractTransferListenerTest.java
+++ b/aether-api/src/test/java/org/eclipse/aether/transfer/AbstractTransferListenerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transfer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transfer;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-api/src/test/java/org/eclipse/aether/transfer/TransferEventTest.java b/aether-api/src/test/java/org/eclipse/aether/transfer/TransferEventTest.java
index 37d8ea7..0ce6249 100644
--- a/aether-api/src/test/java/org/eclipse/aether/transfer/TransferEventTest.java
+++ b/aether-api/src/test/java/org/eclipse/aether/transfer/TransferEventTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transfer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transfer;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ArtifactTransportListener.java b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ArtifactTransportListener.java
index 534e254..f8a9b1c 100644
--- a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ArtifactTransportListener.java
+++ b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ArtifactTransportListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.connector.basic;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.connector.basic;
 
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.spi.connector.ArtifactTransfer;
diff --git a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
index 1fb968e..27f2285 100644
--- a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
+++ b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.connector.basic;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.connector.basic;
 
 import java.io.File;
 import java.io.IOException;
@@ -299,7 +300,7 @@
 
     private static <T> Collection<T> safe( Collection<T> items )
     {
-        return ( items != null ) ? items : Collections.<T> emptyList();
+        return ( items != null ) ? items : Collections.<T>emptyList();
     }
 
     private TransferResource newTransferResource( URI path, File file, RequestTrace trace )
diff --git a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
index 5801383..8338daf 100644
--- a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
+++ b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/BasicRepositoryConnectorFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.connector.basic;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.connector.basic;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java
index 6a0551b..e76f8a9 100644
--- a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java
+++ b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumCalculator.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.connector.basic;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.connector.basic;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumValidator.java b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumValidator.java
index 95afb7a..8289997 100644
--- a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumValidator.java
+++ b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/ChecksumValidator.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.connector.basic;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.connector.basic;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/MetadataTransportListener.java b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/MetadataTransportListener.java
index a40909b..7f8bc6d 100644
--- a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/MetadataTransportListener.java
+++ b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/MetadataTransportListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.connector.basic;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.connector.basic;
 
 import org.eclipse.aether.repository.RemoteRepository;
 import org.eclipse.aether.spi.connector.MetadataTransfer;
diff --git a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java
index e1e4d03..ad428d4 100644
--- a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java
+++ b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/PartialFile.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.connector.basic;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.connector.basic;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/TransferTransportListener.java b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/TransferTransportListener.java
index d5ffc63..bd95577 100644
--- a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/TransferTransportListener.java
+++ b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/TransferTransportListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.connector.basic;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.connector.basic;
 
 import java.nio.ByteBuffer;
 import java.util.Collections;
diff --git a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/package-info.java b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/package-info.java
index 29084c1..df86897 100644
--- a/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/package-info.java
+++ b/aether-connector-basic/src/main/java/org/eclipse/aether/connector/basic/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java b/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java
index 285a1b4..0dc43af 100644
--- a/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java
+++ b/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumCalculatorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.connector.basic;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.connector.basic;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java b/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java
index b9a20d0..6d67768 100644
--- a/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java
+++ b/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/ChecksumValidatorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.connector.basic;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.connector.basic;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/PartialFileTest.java b/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/PartialFileTest.java
index bec240c..edfeee9 100644
--- a/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/PartialFileTest.java
+++ b/aether-connector-basic/src/test/java/org/eclipse/aether/connector/basic/PartialFileTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.connector.basic;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.connector.basic;
 
 import static org.junit.Assert.*;
 import static org.junit.Assume.*;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/AetherModule.java b/aether-impl/src/main/java/org/eclipse/aether/impl/AetherModule.java
index a10d882..4e05ec2 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/AetherModule.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/AetherModule.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 /**
  * A ready-made Guice module that sets up bindings for all components from this library. To acquire a complete
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/ArtifactDescriptorReader.java b/aether-impl/src/main/java/org/eclipse/aether/impl/ArtifactDescriptorReader.java
index 5df9874..66f3528 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/ArtifactDescriptorReader.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/ArtifactDescriptorReader.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/ArtifactResolver.java b/aether-impl/src/main/java/org/eclipse/aether/impl/ArtifactResolver.java
index b9d9adc..3b43592 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/ArtifactResolver.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/ArtifactResolver.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/DefaultServiceLocator.java b/aether-impl/src/main/java/org/eclipse/aether/impl/DefaultServiceLocator.java
index 48ffe9f..4d71b88 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/DefaultServiceLocator.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/DefaultServiceLocator.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Modifier;
@@ -326,7 +327,7 @@
     /**
      * A hook to customize the handling of errors encountered while locating a service implementation.
      */
-    public static abstract class ErrorHandler
+    public abstract static class ErrorHandler
     {
 
         /**
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/DependencyCollector.java b/aether-impl/src/main/java/org/eclipse/aether/impl/DependencyCollector.java
index 7374f76..9fa5817 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/DependencyCollector.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/DependencyCollector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/Deployer.java b/aether-impl/src/main/java/org/eclipse/aether/impl/Deployer.java
index 12373a9..8f6b8fc 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/Deployer.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/Deployer.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/Installer.java b/aether-impl/src/main/java/org/eclipse/aether/impl/Installer.java
index b637658..a9ebed6 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/Installer.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/Installer.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/LocalRepositoryProvider.java b/aether-impl/src/main/java/org/eclipse/aether/impl/LocalRepositoryProvider.java
index 87c471d..d5f4be2 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/LocalRepositoryProvider.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/LocalRepositoryProvider.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/MetadataGenerator.java b/aether-impl/src/main/java/org/eclipse/aether/impl/MetadataGenerator.java
index 1390247..b4356cc 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/MetadataGenerator.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/MetadataGenerator.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import java.util.Collection;
 
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/MetadataGeneratorFactory.java b/aether-impl/src/main/java/org/eclipse/aether/impl/MetadataGeneratorFactory.java
index 0842367..5f2b740 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/MetadataGeneratorFactory.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/MetadataGeneratorFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.deployment.DeployRequest;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/MetadataResolver.java b/aether-impl/src/main/java/org/eclipse/aether/impl/MetadataResolver.java
index 960252d..886e856 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/MetadataResolver.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/MetadataResolver.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import java.util.Collection;
 import java.util.List;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/OfflineController.java b/aether-impl/src/main/java/org/eclipse/aether/impl/OfflineController.java
index c7670a7..22f5a4b 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/OfflineController.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/OfflineController.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.RemoteRepository;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/RemoteRepositoryManager.java b/aether-impl/src/main/java/org/eclipse/aether/impl/RemoteRepositoryManager.java
index 96f9170..23685e7 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/RemoteRepositoryManager.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/RemoteRepositoryManager.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import java.util.List;
 
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/RepositoryConnectorProvider.java b/aether-impl/src/main/java/org/eclipse/aether/impl/RepositoryConnectorProvider.java
index a047f76..8d665c0 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/RepositoryConnectorProvider.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/RepositoryConnectorProvider.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.RemoteRepository;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/RepositoryEventDispatcher.java b/aether-impl/src/main/java/org/eclipse/aether/impl/RepositoryEventDispatcher.java
index 41c6559..2d29eb7 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/RepositoryEventDispatcher.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/RepositoryEventDispatcher.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositoryEvent;
 
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/SyncContextFactory.java b/aether-impl/src/main/java/org/eclipse/aether/impl/SyncContextFactory.java
index ddc9ced..95086d1 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/SyncContextFactory.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/SyncContextFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/UpdateCheck.java b/aether-impl/src/main/java/org/eclipse/aether/impl/UpdateCheck.java
index 3e6bee1..b77d2bc 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/UpdateCheck.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/UpdateCheck.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import java.io.File;
 
@@ -26,6 +27,8 @@
 /**
  * A request to check if an update of an artifact/metadata from a remote repository is needed.
  * 
+ * @param <T>
+ * @param <E>
  * @see UpdateCheckManager
  * @provisional This type is provisional and can be changed, moved or removed without prior notice.
  */
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/UpdateCheckManager.java b/aether-impl/src/main/java/org/eclipse/aether/impl/UpdateCheckManager.java
index 569e043..cd35df0 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/UpdateCheckManager.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/UpdateCheckManager.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/UpdatePolicyAnalyzer.java b/aether-impl/src/main/java/org/eclipse/aether/impl/UpdatePolicyAnalyzer.java
index 352a44c..ce8018a 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/UpdatePolicyAnalyzer.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/UpdatePolicyAnalyzer.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositorySystemSession;
 
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/VersionRangeResolver.java b/aether-impl/src/main/java/org/eclipse/aether/impl/VersionRangeResolver.java
index 65a162a..89bf706 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/VersionRangeResolver.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/VersionRangeResolver.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/VersionResolver.java b/aether-impl/src/main/java/org/eclipse/aether/impl/VersionResolver.java
index c3ec081..e6a8a10 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/VersionResolver.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/VersionResolver.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositorySystem;
 import org.eclipse.aether.RepositorySystemSession;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java b/aether-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java
index dc7b9ee..f775fb1 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/guice/AetherModule.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl.guice;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl.guice;
 
 import java.util.Collections;
 import java.util.HashSet;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/guice/package-info.java b/aether-impl/src/main/java/org/eclipse/aether/impl/guice/package-info.java
index eb94357..e3f8fd3 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/guice/package-info.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/guice/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-impl/src/main/java/org/eclipse/aether/impl/package-info.java b/aether-impl/src/main/java/org/eclipse/aether/impl/package-info.java
index 7758f8b..959a431 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/impl/package-info.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/impl/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/AbstractChecksumPolicy.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/AbstractChecksumPolicy.java
index 3eddac5..368e31b 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/AbstractChecksumPolicy.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/AbstractChecksumPolicy.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import org.eclipse.aether.spi.connector.checksum.ChecksumPolicy;
 import org.eclipse.aether.spi.log.Logger;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/ArtifactRequestBuilder.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/ArtifactRequestBuilder.java
index 8e51b17..f9773dc 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/ArtifactRequestBuilder.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/ArtifactRequestBuilder.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/CacheUtils.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/CacheUtils.java
index 77f3766..d7e8f01 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/CacheUtils.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/CacheUtils.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.Iterator;
 import java.util.List;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/CachingArtifactTypeRegistry.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/CachingArtifactTypeRegistry.java
index a74def7..bde4103 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/CachingArtifactTypeRegistry.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/CachingArtifactTypeRegistry.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DataPool.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DataPool.java
index 6086030..fa41003 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DataPool.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DataPool.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -160,7 +161,7 @@
         nodes.put( key, children );
     }
 
-    static abstract class Descriptor
+    abstract static class Descriptor
     {
 
         public abstract ArtifactDescriptorResult toResult( ArtifactDescriptorRequest request );
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
index c9fd2a8..37d296e 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultArtifactResolver.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.io.File;
 import java.io.IOException;
@@ -418,7 +419,7 @@
                 {
                     group = new ResolutionGroup( repo );
                     groups.add( group );
-                    groupIt = Collections.<ResolutionGroup> emptyList().iterator();
+                    groupIt = Collections.<ResolutionGroup>emptyList().iterator();
                 }
                 group.items.add( new ResolutionItem( trace, artifact, resolved, result, local, repo ) );
             }
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java
index 4e1425c..20c0484 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProvider.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java
index 274b10d..1ad6cc7 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectionContext.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.List;
 
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
index eeb0bb1..f1fcbf2 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCollector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -328,7 +329,7 @@
         {
             int initialCapacity = dominant.size() + recessive.size();
             result = new ArrayList<Dependency>( initialCapacity );
-            Collection<String> ids = new HashSet<String>(initialCapacity, 1.0f);
+            Collection<String> ids = new HashSet<String>( initialCapacity, 1.0f );
             for ( Dependency dependency : dominant )
             {
                 ids.add( getId( dependency.getArtifact() ) );
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCycle.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCycle.java
index 57d88a4..5ffcf67 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCycle.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyCycle.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyGraphTransformationContext.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyGraphTransformationContext.java
index 551eb75..d877ad6 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyGraphTransformationContext.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDependencyGraphTransformationContext.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java
index fd9950e..56951fa 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultDeployer.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java
index e95b9b2..cfeac98 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultFileProcessor.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.io.Closeable;
 import java.io.File;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java
index e1778b5..ea95371 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultInstaller.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java
index 16fc1f9..1f0597a 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultLocalRepositoryProvider.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java
index 3d372a4..c751112 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultMetadataResolver.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultOfflineController.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultOfflineController.java
index 2f2ab35..938a9e1 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultOfflineController.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultOfflineController.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.regex.Pattern;
 
@@ -34,6 +35,9 @@
 import org.eclipse.aether.transfer.RepositoryOfflineException;
 import org.eclipse.aether.util.ConfigUtils;
 
+/**
+ * 
+ */
 @Named
 public class DefaultOfflineController
     implements OfflineController, Service
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
index 01b8a8f..148bf4d 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManager.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java
index 5e7c121..10fdc23 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryConnectorProvider.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java
index f85712b..2e56c93 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcher.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java
index db92de8..9cc6371 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositoryLayoutProvider.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
index 9eebbce..b2c453c 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultRepositorySystem.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultSyncContextFactory.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultSyncContextFactory.java
index 29bf3b0..69fdbc6 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultSyncContextFactory.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultSyncContextFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.Collection;
 
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java
index c08f4f9..133fd81 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultTransporterProvider.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -153,7 +154,7 @@
         {
             buffer.append( "Cannot access " ).append( repository.getUrl() );
             buffer.append( " using the registered transporter factories: " );
-            factories.list( buffer);
+            factories.list( buffer );
         }
 
         throw new NoTransporterException( repository, buffer.toString(), errors.size() == 1 ? errors.get( 0 ) : null );
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java
index e081638..eb4eff9 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManager.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.io.File;
 import java.util.Collections;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java
index dbe80b1..c2cdd83 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzer.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.Calendar;
 
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultVersionFilterContext.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultVersionFilterContext.java
index 94fda31..2007368 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultVersionFilterContext.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/DefaultVersionFilterContext.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -41,7 +42,7 @@
     implements VersionFilter.VersionFilterContext
 {
 
-    private final Iterator<Version> EMPTY = Collections.<Version> emptySet().iterator();
+    private final Iterator<Version> EMPTY = Collections.<Version>emptySet().iterator();
 
     private final RepositorySystemSession session;
 
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManager.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManager.java
index 6ba343b..11ba9a1 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManager.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManager.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.io.File;
 import java.util.Collection;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java
index c3825e1..cfd2013 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/FailChecksumPolicy.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/FailChecksumPolicy.java
index 1f975f2..4f3de45 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/FailChecksumPolicy.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/FailChecksumPolicy.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import org.eclipse.aether.spi.log.LoggerFactory;
 import org.eclipse.aether.transfer.ChecksumFailureException;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/LoggerFactoryProvider.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/LoggerFactoryProvider.java
index 82623e2..3d46490 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/LoggerFactoryProvider.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/LoggerFactoryProvider.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java
index f369ca1..9202c4b 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/NodeStack.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/NodeStack.java
index a66154f..b0e0cd3 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/NodeStack.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/NodeStack.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.Arrays;
 
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/ObjectPool.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/ObjectPool.java
index 4d5905b..af2d949 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/ObjectPool.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/ObjectPool.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.lang.ref.Reference;
 import java.lang.ref.WeakReference;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/PrioritizedComponent.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/PrioritizedComponent.java
index efe9ce7..fc9ebeb 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/PrioritizedComponent.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/PrioritizedComponent.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 final class PrioritizedComponent<T>
     implements Comparable<PrioritizedComponent<?>>
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/PrioritizedComponents.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/PrioritizedComponents.java
index a812b45..3ec5613 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/PrioritizedComponents.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/PrioritizedComponents.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -33,7 +34,7 @@
 final class PrioritizedComponents<T>
 {
 
-    private final static String FACTORY_SUFFIX = "Factory";
+    private static final String FACTORY_SUFFIX = "Factory";
 
     private final Map<?, ?> configProps;
 
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SafeTransferListener.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SafeTransferListener.java
index adb9049..1ba8a37 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SafeTransferListener.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SafeTransferListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.spi.log.Logger;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleDigest.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleDigest.java
index 83314b7..9b51e98 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleDigest.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleDigest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.io.UnsupportedEncodingException;
 import java.security.MessageDigest;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManager.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManager.java
index 26680cb..97c7bba 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManager.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManager.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.io.File;
 import java.util.SortedSet;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java
index cfd2b94..3c2cf6d 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java
index 78d20d8..7b33f6e 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/TrackingFileManager.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/Utils.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/Utils.java
index 6551ce1..deb830d 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/Utils.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/Utils.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/WarnChecksumPolicy.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/WarnChecksumPolicy.java
index ba9bc23..b5e72ec 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/WarnChecksumPolicy.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/WarnChecksumPolicy.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import org.eclipse.aether.spi.log.LoggerFactory;
 import org.eclipse.aether.transfer.ChecksumFailureException;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/package-info.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/package-info.java
index 4e0c585..813b21d 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/package-info.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/Slf4jLoggerFactory.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/Slf4jLoggerFactory.java
index 6bd3a9e..840fe21 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/Slf4jLoggerFactory.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/Slf4jLoggerFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl.slf4j;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl.slf4j;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/package-info.java b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/package-info.java
index f13f8c5..307c22e 100644
--- a/aether-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/package-info.java
+++ b/aether-impl/src/main/java/org/eclipse/aether/internal/impl/slf4j/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-impl/src/test/java/org/eclipse/aether/impl/DefaultServiceLocatorTest.java b/aether-impl/src/test/java/org/eclipse/aether/impl/DefaultServiceLocatorTest.java
index eb8c17a..657b4ac 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/impl/DefaultServiceLocatorTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/impl/DefaultServiceLocatorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/impl/StubArtifactDescriptorReader.java b/aether-impl/src/test/java/org/eclipse/aether/impl/StubArtifactDescriptorReader.java
index 9f76d70..a5e650f 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/impl/StubArtifactDescriptorReader.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/impl/StubArtifactDescriptorReader.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.impl.ArtifactDescriptorReader;
diff --git a/aether-impl/src/test/java/org/eclipse/aether/impl/StubVersionRangeResolver.java b/aether-impl/src/test/java/org/eclipse/aether/impl/StubVersionRangeResolver.java
index f58322d..81e000e 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/impl/StubVersionRangeResolver.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/impl/StubVersionRangeResolver.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.impl.VersionRangeResolver;
diff --git a/aether-impl/src/test/java/org/eclipse/aether/impl/StubVersionResolver.java b/aether-impl/src/test/java/org/eclipse/aether/impl/StubVersionResolver.java
index 51db2b7..f59fa11 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/impl/StubVersionResolver.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/impl/StubVersionResolver.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.impl.VersionResolver;
diff --git a/aether-impl/src/test/java/org/eclipse/aether/impl/guice/AetherModuleTest.java b/aether-impl/src/test/java/org/eclipse/aether/impl/guice/AetherModuleTest.java
index 0924bd2..efcda19 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/impl/guice/AetherModuleTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/impl/guice/AetherModuleTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.impl.guice;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.impl.guice;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DataPoolTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DataPoolTest.java
index 36548e3..43651f6 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DataPoolTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DataPoolTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java
index 019e86e..f776e9c 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultArtifactResolverTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProviderTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProviderTest.java
index a72c605..82318e5 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProviderTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultChecksumPolicyProviderTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectorTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectorTest.java
index 9dc95fe..b78838a 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectorTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultDependencyCollectorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultDeployerTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultDeployerTest.java
index 98807a6..9465e87 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultDeployerTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultDeployerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java
index 0bc31f4..3f8ab5e 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultFileProcessorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java
index e70c7f7..99d57bc 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultInstallerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java
index 2e82c00..d977a78 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultMetadataResolverTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultOfflineControllerTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultOfflineControllerTest.java
index b823bed..7e42707 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultOfflineControllerTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultOfflineControllerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import org.eclipse.aether.DefaultRepositorySystemSession;
 import org.eclipse.aether.RepositorySystemSession;
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java
index 220f3fe..8bc50d6 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRemoteRepositoryManagerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcherTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcherTest.java
index c2f6bee..25e8a87 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcherTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositoryEventDispatcherTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositorySystemTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositorySystemTest.java
index 3c60c1b..9576152 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositorySystemTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultRepositorySystemTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
index efee115..43ccd54 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdateCheckManagerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java
index 1d36ba0..31bcbaa 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DefaultUpdatePolicyAnalyzerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.eclipse.aether.repository.RepositoryPolicy.*;
 import static org.junit.Assert.*;
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DependencyGraphDumper.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DependencyGraphDumper.java
index 4dd02dc..39bc1ed 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DependencyGraphDumper.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/DependencyGraphDumper.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.io.PrintWriter;
 import java.util.ArrayList;
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java
index 8127d8a..41bf542 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/EnhancedLocalRepositoryManagerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/FailChecksumPolicyTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/FailChecksumPolicyTest.java
index 879e2fe..f36e0a0 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/FailChecksumPolicyTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/FailChecksumPolicyTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/IniArtifactDescriptorReader.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/IniArtifactDescriptorReader.java
index f32dd64..4ae2b9b 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/IniArtifactDescriptorReader.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/IniArtifactDescriptorReader.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import org.eclipse.aether.impl.ArtifactDescriptorReader;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java
index 677e0ee..7411a1d 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/Maven2RepositoryLayoutFactoryTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentTest.java
index 040b319..989c1ad 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentsTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentsTest.java
index 4d7ff04..3f5a093 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentsTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/PrioritizedComponentsTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryConnector.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryConnector.java
index a8f3ab7..bbb78bf 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryConnector.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryConnector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryListener.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryListener.java
index f90eb79..a6f91f1 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryListener.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/RecordingRepositoryListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/SafeTransferListenerTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/SafeTransferListenerTest.java
index 150d286..6d7a6fe 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/SafeTransferListenerTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/SafeTransferListenerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java
index 5a098f9..a301bd4 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/SimpleLocalRepositoryManagerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StaticUpdateCheckManager.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StaticUpdateCheckManager.java
index 619f4f2..7810089 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StaticUpdateCheckManager.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StaticUpdateCheckManager.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubRemoteRepositoryManager.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubRemoteRepositoryManager.java
index a2aadca..1836a04 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubRemoteRepositoryManager.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubRemoteRepositoryManager.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.List;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryConnectorProvider.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryConnectorProvider.java
index f0caa46..3cb5e38 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryConnectorProvider.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryConnectorProvider.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.impl.RepositoryConnectorProvider;
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryEventDispatcher.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryEventDispatcher.java
index caf57c6..b5168e4 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryEventDispatcher.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubRepositoryEventDispatcher.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import org.eclipse.aether.RepositoryEvent;
 import org.eclipse.aether.RepositoryListener;
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubSyncContextFactory.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubSyncContextFactory.java
index 3bdfd5f..91d2988 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubSyncContextFactory.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubSyncContextFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import java.util.Collection;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionRangeResolver.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionRangeResolver.java
index f338749..ae415d7 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionRangeResolver.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionRangeResolver.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.impl.VersionRangeResolver;
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionResolver.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionResolver.java
index 5285b96..719e5bc 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionResolver.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/StubVersionResolver.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.impl.VersionResolver;
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/TrackingFileManagerTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/TrackingFileManagerTest.java
index 041666d..d730d7e 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/TrackingFileManagerTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/TrackingFileManagerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/WarnChecksumPolicyTest.java b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/WarnChecksumPolicyTest.java
index ce23e4e..78fd807 100644
--- a/aether-impl/src/test/java/org/eclipse/aether/internal/impl/WarnChecksumPolicyTest.java
+++ b/aether-impl/src/test/java/org/eclipse/aether/internal/impl/WarnChecksumPolicyTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.impl;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.impl;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactDownload.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactDownload.java
index 8a67cec..3d82ac1 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactDownload.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactDownload.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector;
 
 import java.io.File;
 import java.util.Collection;
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactTransfer.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactTransfer.java
index f9d347e..8399512 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactTransfer.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactTransfer.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector;
 
 import java.io.File;
 
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactUpload.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactUpload.java
index 569df9e..f85539e 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactUpload.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/ArtifactUpload.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector;
 
 import java.io.File;
 
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataDownload.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataDownload.java
index 446d93e..be3a2d0 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataDownload.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataDownload.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector;
 
 import java.io.File;
 import java.util.Collections;
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataTransfer.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataTransfer.java
index 889a54a..94eb46e 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataTransfer.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataTransfer.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector;
 
 import java.io.File;
 
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataUpload.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataUpload.java
index d78a8b4..d992757 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataUpload.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/MetadataUpload.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector;
 
 import java.io.File;
 
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/RepositoryConnector.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/RepositoryConnector.java
index 4228678..51e0627 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/RepositoryConnector.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/RepositoryConnector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector;
 
 import java.io.Closeable;
 import java.util.Collection;
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/RepositoryConnectorFactory.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/RepositoryConnectorFactory.java
index 26449b6..0d401c4 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/RepositoryConnectorFactory.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/RepositoryConnectorFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.RemoteRepository;
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/Transfer.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/Transfer.java
index d6b59d8..fc77011 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/Transfer.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/Transfer.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector;
 
 import org.eclipse.aether.RequestTrace;
 import org.eclipse.aether.transfer.TransferListener;
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumPolicy.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumPolicy.java
index 290e2ad..eb1716d 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumPolicy.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumPolicy.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector.checksum;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector.checksum;
 
 import org.eclipse.aether.transfer.ChecksumFailureException;
 
@@ -67,7 +68,7 @@
     /**
      * Bit flag indicating a checksum which is not part of the official repository layout/structure.
      */
-    static final int KIND_UNOFFICIAL = 0x01;
+    int KIND_UNOFFICIAL = 0x01;
 
     /**
      * Signals a match between the locally computed checksum value and the checksum value declared by the remote
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumPolicyProvider.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumPolicyProvider.java
index 4598462..f502300 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumPolicyProvider.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/ChecksumPolicyProvider.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector.checksum;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector.checksum;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.RemoteRepository;
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/package-info.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/package-info.java
index deca766..94d0653 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/package-info.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/checksum/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayout.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayout.java
index 25d8320..7ae69ac 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayout.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayout.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector.layout;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector.layout;
 
 import java.net.URI;
 import java.util.List;
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayoutFactory.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayoutFactory.java
index 56f5863..8aa71d7 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayoutFactory.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayoutFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector.layout;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector.layout;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.RemoteRepository;
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayoutProvider.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayoutProvider.java
index ddf8270..5cdf53b 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayoutProvider.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/layout/RepositoryLayoutProvider.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector.layout;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector.layout;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.RemoteRepository;
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/layout/package-info.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/layout/package-info.java
index 511ff06..2b36f7c 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/layout/package-info.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/layout/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/package-info.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/package-info.java
index d9f472b..f31a2a8 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/package-info.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java
index 326a132..21e54c9 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/AbstractTransporter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector.transport;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector.transport;
 
 import java.io.Closeable;
 import java.io.IOException;
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/GetTask.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/GetTask.java
index b4bf796..e77de77 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/GetTask.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/GetTask.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector.transport;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector.transport;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PeekTask.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PeekTask.java
index 6c623ef..d1fb905 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PeekTask.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PeekTask.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector.transport;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector.transport;
 
 import java.net.URI;
 
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PutTask.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PutTask.java
index 169b3f7..1208a64 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PutTask.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/PutTask.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector.transport;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector.transport;
 
 import java.io.ByteArrayInputStream;
 import java.io.File;
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransportListener.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransportListener.java
index 4debe8d..473036b 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransportListener.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransportListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector.transport;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector.transport;
 
 import java.nio.ByteBuffer;
 
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransportTask.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransportTask.java
index b717a40..f74b301 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransportTask.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransportTask.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector.transport;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector.transport;
 
 import java.net.URI;
 
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/Transporter.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/Transporter.java
index b76b420..b8d221c 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/Transporter.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/Transporter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector.transport;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector.transport;
 
 import java.io.Closeable;
 
@@ -42,7 +43,7 @@
      * 
      * @see #classify(Throwable)
      */
-    public static final int ERROR_OTHER = 0;
+    int ERROR_OTHER = 0;
 
     /**
      * Classification for exceptions that denote a requested resource does not exist in the remote repository. Note that
@@ -50,7 +51,7 @@
      * 
      * @see #classify(Throwable)
      */
-    public static final int ERROR_NOT_FOUND = 1;
+    int ERROR_NOT_FOUND = 1;
 
     /**
      * Classifies the type of exception that has been thrown from a previous request to the transporter. The exception
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterFactory.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterFactory.java
index ddbb23c..999908a 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterFactory.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector.transport;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector.transport;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.RemoteRepository;
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterProvider.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterProvider.java
index 1166927..b855042 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterProvider.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/TransporterProvider.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector.transport;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector.transport;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.RemoteRepository;
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/package-info.java b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/package-info.java
index 8f040bc..26796ba 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/package-info.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/connector/transport/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/io/FileProcessor.java b/aether-spi/src/main/java/org/eclipse/aether/spi/io/FileProcessor.java
index 37d9919..1de21a0 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/io/FileProcessor.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/io/FileProcessor.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.io;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.io;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/io/package-info.java b/aether-spi/src/main/java/org/eclipse/aether/spi/io/package-info.java
index fe02a01..ec5c122 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/io/package-info.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/io/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/localrepo/LocalRepositoryManagerFactory.java b/aether-spi/src/main/java/org/eclipse/aether/spi/localrepo/LocalRepositoryManagerFactory.java
index 9610446..518f90e 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/localrepo/LocalRepositoryManagerFactory.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/localrepo/LocalRepositoryManagerFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.localrepo;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.localrepo;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.repository.LocalRepository;
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/localrepo/package-info.java b/aether-spi/src/main/java/org/eclipse/aether/spi/localrepo/package-info.java
index 9eaf837..afd64cf 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/localrepo/package-info.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/localrepo/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/locator/Service.java b/aether-spi/src/main/java/org/eclipse/aether/spi/locator/Service.java
index b1c1564..ffe36b0 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/locator/Service.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/locator/Service.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.locator;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.locator;
 
 /**
  * A stateless component of the repository system. The primary purpose of this interface is to provide a convenient
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/locator/ServiceLocator.java b/aether-spi/src/main/java/org/eclipse/aether/spi/locator/ServiceLocator.java
index e4f77ed..0160ac9 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/locator/ServiceLocator.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/locator/ServiceLocator.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.locator;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.locator;
 
 import java.util.List;
 
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/locator/package-info.java b/aether-spi/src/main/java/org/eclipse/aether/spi/locator/package-info.java
index a327a38..2d47ceb 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/locator/package-info.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/locator/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/log/Logger.java b/aether-spi/src/main/java/org/eclipse/aether/spi/log/Logger.java
index 361f94d..8b4bfb3 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/log/Logger.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/log/Logger.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.log;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.log;
 
 /**
  * A simple logger to facilitate emission of diagnostic messages. In general, unrecoverable errors should be reported
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/log/LoggerFactory.java b/aether-spi/src/main/java/org/eclipse/aether/spi/log/LoggerFactory.java
index 4cc6f09..9f66eb1 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/log/LoggerFactory.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/log/LoggerFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.log;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.log;
 
 /**
  * A factory to create loggers.
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/log/NullLogger.java b/aether-spi/src/main/java/org/eclipse/aether/spi/log/NullLogger.java
index ceade2e..8fb7745 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/log/NullLogger.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/log/NullLogger.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.log;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.log;
 
 /**
  * A logger that disables any logging.
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/log/NullLoggerFactory.java b/aether-spi/src/main/java/org/eclipse/aether/spi/log/NullLoggerFactory.java
index 7905576..bea659f 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/log/NullLoggerFactory.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/log/NullLoggerFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.log;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.log;
 
 /**
  * A logger factory that disables any logging.
diff --git a/aether-spi/src/main/java/org/eclipse/aether/spi/log/package-info.java b/aether-spi/src/main/java/org/eclipse/aether/spi/log/package-info.java
index 1006f5d..9584292 100644
--- a/aether-spi/src/main/java/org/eclipse/aether/spi/log/package-info.java
+++ b/aether-spi/src/main/java/org/eclipse/aether/spi/log/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-spi/src/test/java/org/eclipse/aether/spi/connector/layout/ChecksumTest.java b/aether-spi/src/test/java/org/eclipse/aether/spi/connector/layout/ChecksumTest.java
index 7b82662..bcd49b4 100644
--- a/aether-spi/src/test/java/org/eclipse/aether/spi/connector/layout/ChecksumTest.java
+++ b/aether-spi/src/test/java/org/eclipse/aether/spi/connector/layout/ChecksumTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.spi.connector.layout;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.spi.connector.layout;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDefinition.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDefinition.java
index eda5e37..0a760cc 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDefinition.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDefinition.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 class ArtifactDefinition
 {
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDescription.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDescription.java
index 9c1db64..bdb5c7f 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDescription.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/ArtifactDescription.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import java.util.List;
 
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java
index 546b5d8..a745ccf 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/DependencyGraphParser.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -119,7 +120,7 @@
      */
     public DependencyGraphParser( String prefix )
     {
-        this( prefix, Collections.<String> emptyList() );
+        this( prefix, Collections.<String>emptyList() );
     }
 
     /**
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java
index 4e6d404..4253544 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDataReader.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReader.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReader.java
index 1ebd79e..4efe880 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReader.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReader.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java
index b7ef0e4..fdd988a 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeBuilder.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -129,7 +130,7 @@
 
     public NodeBuilder properties( Map<String, String> properties )
     {
-        this.properties = properties != null ? properties : Collections.<String, String> emptyMap();
+        this.properties = properties != null ? properties : Collections.<String, String>emptyMap();
         return this;
     }
 
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeDefinition.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeDefinition.java
index ee09fc8..64910f1 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeDefinition.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/NodeDefinition.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestDependencyCollectionContext.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestDependencyCollectionContext.java
index 5331e8e..b4f4155 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestDependencyCollectionContext.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestDependencyCollectionContext.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import java.util.List;
 
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestDependencyGraphTransformationContext.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestDependencyGraphTransformationContext.java
index 9cab3a2..c3da4d9 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestDependencyGraphTransformationContext.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestDependencyGraphTransformationContext.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java
index 710d846..fe130a3 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileProcessor.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import java.io.BufferedOutputStream;
 import java.io.Closeable;
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileUtils.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileUtils.java
index 048bf68..9757daa 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileUtils.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestFileUtils.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import java.io.BufferedOutputStream;
 import java.io.Closeable;
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java
index b0ea269..f97fb78 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLocalRepositoryManager.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLoggerFactory.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLoggerFactory.java
index d5f23cb..ea92825 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLoggerFactory.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestLoggerFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import java.io.PrintStream;
 
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestUtils.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestUtils.java
index 206a930..cc0c4cb 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestUtils.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestUtils.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import java.util.List;
 
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersion.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersion.java
index abf2e39..0fc9bab 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersion.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersion.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import org.eclipse.aether.version.Version;
 
@@ -52,19 +53,29 @@
     public boolean equals( Object obj )
     {
         if ( this == obj )
+        {
             return true;
+        }
         if ( obj == null )
+        {
             return false;
+        }
         if ( getClass() != obj.getClass() )
+        {
             return false;
+        }
         TestVersion other = (TestVersion) obj;
         if ( version == null )
         {
             if ( other.version != null )
+            {
                 return false;
+            }
         }
         else if ( !version.equals( other.version ) )
+        {
             return false;
+        }
         return true;
     }
 
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionConstraint.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionConstraint.java
index 285e2e3..bd84687 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionConstraint.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionConstraint.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import org.eclipse.aether.version.Version;
 import org.eclipse.aether.version.VersionConstraint;
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionFilterContext.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionFilterContext.java
index 9593fe1..2647c56 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionFilterContext.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionFilterContext.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionRange.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionRange.java
index 27c4d9a..dd5950e 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionRange.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionRange.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import org.eclipse.aether.version.InvalidVersionSpecificationException;
 import org.eclipse.aether.version.Version;
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionScheme.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionScheme.java
index 9f855cc..5865f6c 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionScheme.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/TestVersionScheme.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/package-info.java b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/package-info.java
index cc2c188..4d874da 100644
--- a/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/package-info.java
+++ b/aether-test-util/src/main/java/org/eclipse/aether/internal/test/util/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/DependencyGraphParserTest.java b/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/DependencyGraphParserTest.java
index 2db799e..86e8a77 100644
--- a/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/DependencyGraphParserTest.java
+++ b/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/DependencyGraphParserTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java b/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java
index 781c0f7..4864b32 100644
--- a/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java
+++ b/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDataReaderTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java b/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java
index c9a576f..8b6bfa4 100644
--- a/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java
+++ b/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/IniArtifactDescriptorReaderTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/NodeDefinitionTest.java b/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/NodeDefinitionTest.java
index 30aca6d..8f41a5a 100644
--- a/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/NodeDefinitionTest.java
+++ b/aether-test-util/src/test/java/org/eclipse/aether/internal/test/util/NodeDefinitionTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.test.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.test.util;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporter.java b/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporter.java
index 9248eb7..493c907 100644
--- a/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporter.java
+++ b/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.classpath;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.classpath;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java b/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java
index ba276bf..18db417 100644
--- a/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java
+++ b/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ClasspathTransporterFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.classpath;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.classpath;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ResourceNotFoundException.java b/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ResourceNotFoundException.java
index d97789e..d30a0ff 100644
--- a/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ResourceNotFoundException.java
+++ b/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/ResourceNotFoundException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.classpath;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.classpath;
 
 import java.io.IOException;
 
diff --git a/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/package-info.java b/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/package-info.java
index a273399..8bcda93 100644
--- a/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/package-info.java
+++ b/aether-transport-classpath/src/main/java/org/eclipse/aether/transport/classpath/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java b/aether-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java
index a87f7f4..0c91685 100644
--- a/aether-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java
+++ b/aether-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/ClasspathTransporterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.classpath;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.classpath;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/RecordingTransportListener.java b/aether-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/RecordingTransportListener.java
index 6932f57..9447d39 100644
--- a/aether-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/RecordingTransportListener.java
+++ b/aether-transport-classpath/src/test/java/org/eclipse/aether/transport/classpath/RecordingTransportListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.classpath;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.classpath;
 
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
diff --git a/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporter.java b/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporter.java
index 319688b..5c5cfa4 100644
--- a/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporter.java
+++ b/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.file;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.file;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java b/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java
index 00a7461..86ae6fc 100644
--- a/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java
+++ b/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/FileTransporterFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.file;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.file;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/PathUtils.java b/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/PathUtils.java
index eea0360..ac3f8fd 100644
--- a/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/PathUtils.java
+++ b/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/PathUtils.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.file;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.file;
 
 /**
  * URL handling for file URLs. Based on org.apache.maven.wagon.PathUtils.
diff --git a/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/ResourceNotFoundException.java b/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/ResourceNotFoundException.java
index 6032aaf..462fa0a 100644
--- a/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/ResourceNotFoundException.java
+++ b/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/ResourceNotFoundException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.file;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.file;
 
 import java.io.IOException;
 
diff --git a/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/package-info.java b/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/package-info.java
index 400296d..8220bf4 100644
--- a/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/package-info.java
+++ b/aether-transport-file/src/main/java/org/eclipse/aether/transport/file/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java b/aether-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java
index 4dbeab8..6c4e361 100644
--- a/aether-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java
+++ b/aether-transport-file/src/test/java/org/eclipse/aether/transport/file/FileTransporterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.file;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.file;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-transport-file/src/test/java/org/eclipse/aether/transport/file/RecordingTransportListener.java b/aether-transport-file/src/test/java/org/eclipse/aether/transport/file/RecordingTransportListener.java
index 7438c58..c6331e0 100644
--- a/aether-transport-file/src/test/java/org/eclipse/aether/transport/file/RecordingTransportListener.java
+++ b/aether-transport-file/src/test/java/org/eclipse/aether/transport/file/RecordingTransportListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.file;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.file;
 
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
diff --git a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/AuthSchemePool.java b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/AuthSchemePool.java
index c037895..9b86252 100644
--- a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/AuthSchemePool.java
+++ b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/AuthSchemePool.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import java.util.LinkedList;
 
diff --git a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/DeferredCredentialsProvider.java b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/DeferredCredentialsProvider.java
index 2b005ec..c0daeaf 100644
--- a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/DeferredCredentialsProvider.java
+++ b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/DeferredCredentialsProvider.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
diff --git a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/DemuxCredentialsProvider.java b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/DemuxCredentialsProvider.java
index 3365050..f16246e 100644
--- a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/DemuxCredentialsProvider.java
+++ b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/DemuxCredentialsProvider.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import org.apache.http.HttpHost;
 import org.apache.http.auth.AuthScope;
diff --git a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/GlobalState.java b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/GlobalState.java
index 84a5f27..b3a9d4b 100644
--- a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/GlobalState.java
+++ b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/GlobalState.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import java.io.Closeable;
 import java.util.Arrays;
diff --git a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpMkCol.java b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpMkCol.java
index 18aaace..7a945ea 100644
--- a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpMkCol.java
+++ b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpMkCol.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import java.net.URI;
 
diff --git a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java
index c11616d..169bb12 100644
--- a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java
+++ b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java
index d703cee..e9a9bfd 100644
--- a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java
+++ b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/HttpTransporterFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/LocalState.java b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/LocalState.java
index 1dcd966..176b895 100644
--- a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/LocalState.java
+++ b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/LocalState.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import java.io.Closeable;
 import java.util.concurrent.ConcurrentHashMap;
diff --git a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SharingAuthCache.java b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SharingAuthCache.java
index 0003cbe..1264d04 100644
--- a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SharingAuthCache.java
+++ b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SharingAuthCache.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SharingHttpContext.java b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SharingHttpContext.java
index bc72138..4464c26 100644
--- a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SharingHttpContext.java
+++ b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SharingHttpContext.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import java.io.Closeable;
 
diff --git a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SslConfig.java b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SslConfig.java
index b530193..d991796 100644
--- a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SslConfig.java
+++ b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SslConfig.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import java.util.Arrays;
 
diff --git a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SslSocketFactory.java b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SslSocketFactory.java
index 87bb111..5189c87 100644
--- a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SslSocketFactory.java
+++ b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/SslSocketFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import java.io.IOException;
 
diff --git a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/UriUtils.java b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/UriUtils.java
index 17797ad..7bc19da 100644
--- a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/UriUtils.java
+++ b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/UriUtils.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import java.net.URI;
 import java.net.URISyntaxException;
diff --git a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/X509HostnameVerifierAdapter.java b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/X509HostnameVerifierAdapter.java
index 6140790..007f660 100644
--- a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/X509HostnameVerifierAdapter.java
+++ b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/X509HostnameVerifierAdapter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import java.io.IOException;
 import java.security.cert.X509Certificate;
diff --git a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/package-info.java b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/package-info.java
index 0f74923..828299e 100644
--- a/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/package-info.java
+++ b/aether-transport-http/src/main/java/org/eclipse/aether/transport/http/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java b/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java
index b59cd74..71182b5 100644
--- a/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java
+++ b/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpServer.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java b/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java
index e7746f1..d9011a5 100644
--- a/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java
+++ b/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/HttpTransporterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/RecordingTransportListener.java b/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/RecordingTransportListener.java
index 868922d..d88a320 100644
--- a/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/RecordingTransportListener.java
+++ b/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/RecordingTransportListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
diff --git a/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/UriUtilsTest.java b/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/UriUtilsTest.java
index 5aadae3..e3ea9fa 100644
--- a/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/UriUtilsTest.java
+++ b/aether-transport-http/src/test/java/org/eclipse/aether/transport/http/UriUtilsTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.http;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.http;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java b/aether-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java
index bea9367..808d2b7 100644
--- a/aether-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java
+++ b/aether-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonConfigurator.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.transport.wagon;
 
 import org.apache.maven.wagon.Wagon;
 import org.codehaus.plexus.PlexusContainer;
diff --git a/aether-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonProvider.java b/aether-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonProvider.java
index 1a6e5cd..6f40f0d 100644
--- a/aether-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonProvider.java
+++ b/aether-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/PlexusWagonProvider.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.internal.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.internal.transport.wagon;
 
 import org.apache.maven.wagon.Wagon;
 import org.codehaus.plexus.PlexusContainer;
diff --git a/aether-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/package-info.java b/aether-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/package-info.java
index a1600f2..df14e9c 100644
--- a/aether-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/package-info.java
+++ b/aether-transport-wagon/src/main/java/org/eclipse/aether/internal/transport/wagon/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonCancelledException.java b/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonCancelledException.java
index 4c4cda4..105917f 100644
--- a/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonCancelledException.java
+++ b/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonCancelledException.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.wagon;
 
 import org.eclipse.aether.transfer.TransferCancelledException;
 
diff --git a/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonConfigurator.java b/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonConfigurator.java
index 574dd4b..42399cb 100644
--- a/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonConfigurator.java
+++ b/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonConfigurator.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.wagon;
 
 import org.apache.maven.wagon.Wagon;
 
diff --git a/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonProvider.java b/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonProvider.java
index e187494..77bf9d6 100644
--- a/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonProvider.java
+++ b/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonProvider.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.wagon;
 
 import org.apache.maven.wagon.Wagon;
 
diff --git a/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransferListener.java b/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransferListener.java
index d1507f3..3c3120e 100644
--- a/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransferListener.java
+++ b/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransferListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.wagon;
 
 import java.nio.ByteBuffer;
 
diff --git a/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java b/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java
index dede862..e9f89c2 100644
--- a/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java
+++ b/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.wagon;
 
 import java.io.Closeable;
 import java.io.File;
@@ -503,7 +504,7 @@
     private interface TaskRunner
     {
 
-        public void run( Wagon wagon )
+        void run( Wagon wagon )
             throws Exception;
 
     }
diff --git a/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java b/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java
index 8842d55..490acac 100644
--- a/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java
+++ b/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/WagonTransporterFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.wagon;
 
 import javax.inject.Inject;
 import javax.inject.Named;
diff --git a/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/package-info.java b/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/package-info.java
index e394572..82df9ac 100644
--- a/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/package-info.java
+++ b/aether-transport-wagon/src/main/java/org/eclipse/aether/transport/wagon/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java
index 160db33..61f8a8e 100644
--- a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java
+++ b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/AbstractWagonTransporterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.wagon;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
diff --git a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/Configurable.java b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/Configurable.java
index 17a3ecb..9a90f6f 100644
--- a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/Configurable.java
+++ b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/Configurable.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.wagon;
 
 /**
  */
diff --git a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemStreamWagon.java b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemStreamWagon.java
index be7066e..35efca1 100644
--- a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemStreamWagon.java
+++ b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemStreamWagon.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.wagon;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagon.java b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagon.java
index 6f9b50d..ec3d7d6 100644
--- a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagon.java
+++ b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagon.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.wagon;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagonUtils.java b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagonUtils.java
index 1e90273..86d2cc7 100644
--- a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagonUtils.java
+++ b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/MemWagonUtils.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.wagon;
 
 import java.net.URI;
 import java.util.Map;
diff --git a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/PlexusSupportTest.java b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/PlexusSupportTest.java
index 8d5ab75..231fa95 100644
--- a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/PlexusSupportTest.java
+++ b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/PlexusSupportTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.wagon;
 
 import org.codehaus.plexus.ContainerConfiguration;
 import org.codehaus.plexus.PlexusTestCase;
diff --git a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/RecordingTransportListener.java b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/RecordingTransportListener.java
index e70efb5..7f61985 100644
--- a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/RecordingTransportListener.java
+++ b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/RecordingTransportListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.wagon;
 
 import java.io.ByteArrayOutputStream;
 import java.nio.ByteBuffer;
diff --git a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/StreamWagonTransporterTest.java b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/StreamWagonTransporterTest.java
index 66ac8b1..c3f3fd4 100644
--- a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/StreamWagonTransporterTest.java
+++ b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/StreamWagonTransporterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.wagon;
 
 import org.apache.maven.wagon.Wagon;
 
diff --git a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/WagonTransporterTest.java b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/WagonTransporterTest.java
index 6ad8b96..5a10399 100644
--- a/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/WagonTransporterTest.java
+++ b/aether-transport-wagon/src/test/java/org/eclipse/aether/transport/wagon/WagonTransporterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.transport.wagon;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.transport.wagon;
 
 import org.apache.maven.wagon.Wagon;
 
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/ChecksumUtils.java b/aether-util/src/main/java/org/eclipse/aether/util/ChecksumUtils.java
index c1ba41f..b629c8d 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/ChecksumUtils.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/ChecksumUtils.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util;
 
 import java.io.BufferedReader;
 import java.io.File;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/ConfigUtils.java b/aether-util/src/main/java/org/eclipse/aether/util/ConfigUtils.java
index dd39589..c19c113 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/ConfigUtils.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/ConfigUtils.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/StringUtils.java b/aether-util/src/main/java/org/eclipse/aether/util/StringUtils.java
index 5902ac6..e0ed12a 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/StringUtils.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/StringUtils.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util;
 
 /**
  * A utility class to ease string processing.
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/artifact/ArtifactIdUtils.java b/aether-util/src/main/java/org/eclipse/aether/util/artifact/ArtifactIdUtils.java
index 00139bf..54ffc64 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/artifact/ArtifactIdUtils.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/artifact/ArtifactIdUtils.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.artifact;
 
 import org.eclipse.aether.artifact.Artifact;
 
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/artifact/DefaultArtifactTypeRegistry.java b/aether-util/src/main/java/org/eclipse/aether/util/artifact/DefaultArtifactTypeRegistry.java
index d9014fe..9fb29af 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/artifact/DefaultArtifactTypeRegistry.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/artifact/DefaultArtifactTypeRegistry.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.artifact;
 
 import org.eclipse.aether.artifact.ArtifactType;
 
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/artifact/DelegatingArtifact.java b/aether-util/src/main/java/org/eclipse/aether/util/artifact/DelegatingArtifact.java
index bb04ca9..8816ae5 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/artifact/DelegatingArtifact.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/artifact/DelegatingArtifact.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.artifact;
 
 import java.io.File;
 import java.util.Map;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/artifact/JavaScopes.java b/aether-util/src/main/java/org/eclipse/aether/util/artifact/JavaScopes.java
index 39fbee3..bf4894c 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/artifact/JavaScopes.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/artifact/JavaScopes.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.artifact;
 
 /**
  * The dependency scopes used for Java dependencies.
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/artifact/OverlayArtifactTypeRegistry.java b/aether-util/src/main/java/org/eclipse/aether/util/artifact/OverlayArtifactTypeRegistry.java
index 618f072..6768b16 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/artifact/OverlayArtifactTypeRegistry.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/artifact/OverlayArtifactTypeRegistry.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.artifact;
 
 import org.eclipse.aether.artifact.ArtifactType;
 import org.eclipse.aether.artifact.ArtifactTypeRegistry;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/artifact/SimpleArtifactTypeRegistry.java b/aether-util/src/main/java/org/eclipse/aether/util/artifact/SimpleArtifactTypeRegistry.java
index 2983dc7..b0bfc9f 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/artifact/SimpleArtifactTypeRegistry.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/artifact/SimpleArtifactTypeRegistry.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.artifact;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/artifact/SubArtifact.java b/aether-util/src/main/java/org/eclipse/aether/util/artifact/SubArtifact.java
index 6849b16..ed4d55b 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/artifact/SubArtifact.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/artifact/SubArtifact.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.artifact;
 
 import java.io.File;
 import java.util.Map;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/artifact/package-info.java b/aether-util/src/main/java/org/eclipse/aether/util/artifact/package-info.java
index 9221434..153159f 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/artifact/package-info.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/artifact/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/concurrency/RunnableErrorForwarder.java b/aether-util/src/main/java/org/eclipse/aether/util/concurrency/RunnableErrorForwarder.java
index f2fc870..270ea82 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/concurrency/RunnableErrorForwarder.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/concurrency/RunnableErrorForwarder.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.concurrency;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.concurrency;
 
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/concurrency/WorkerThreadFactory.java b/aether-util/src/main/java/org/eclipse/aether/util/concurrency/WorkerThreadFactory.java
index 5143bac..26d0fb6 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/concurrency/WorkerThreadFactory.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/concurrency/WorkerThreadFactory.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.concurrency;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.concurrency;
 
 import java.util.concurrent.Executors;
 import java.util.concurrent.ThreadFactory;
@@ -35,7 +36,7 @@
 
     private final AtomicInteger threadIndex;
 
-    private static final AtomicInteger poolIndex = new AtomicInteger();
+    private static final AtomicInteger POOL_INDEX = new AtomicInteger();
 
     /**
      * Creates a new thread factory whose threads will have names using the specified prefix.
@@ -48,7 +49,7 @@
         this.factory = Executors.defaultThreadFactory();
         this.namePrefix =
             ( ( namePrefix != null && namePrefix.length() > 0 ) ? namePrefix : getCallerSimpleClassName() + '-' )
-                + poolIndex.getAndIncrement() + '-';
+                + POOL_INDEX.getAndIncrement() + '-';
         threadIndex = new AtomicInteger();
     }
 
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/concurrency/package-info.java b/aether-util/src/main/java/org/eclipse/aether/util/concurrency/package-info.java
index fd72395..2bb7853 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/concurrency/package-info.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/concurrency/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/filter/AbstractPatternDependencyFilter.java b/aether-util/src/main/java/org/eclipse/aether/util/filter/AbstractPatternDependencyFilter.java
index 04fff21..d707d26 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/filter/AbstractPatternDependencyFilter.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/filter/AbstractPatternDependencyFilter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/filter/AndDependencyFilter.java b/aether-util/src/main/java/org/eclipse/aether/util/filter/AndDependencyFilter.java
index b5b3d78..9997c94 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/filter/AndDependencyFilter.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/filter/AndDependencyFilter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/filter/DependencyFilterUtils.java b/aether-util/src/main/java/org/eclipse/aether/util/filter/DependencyFilterUtils.java
index 752df67..887c4b1 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/filter/DependencyFilterUtils.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/filter/DependencyFilterUtils.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/filter/ExclusionsDependencyFilter.java b/aether-util/src/main/java/org/eclipse/aether/util/filter/ExclusionsDependencyFilter.java
index 2277650..2de4ae8 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/filter/ExclusionsDependencyFilter.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/filter/ExclusionsDependencyFilter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/filter/NotDependencyFilter.java b/aether-util/src/main/java/org/eclipse/aether/util/filter/NotDependencyFilter.java
index 077e855..d5fdb24 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/filter/NotDependencyFilter.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/filter/NotDependencyFilter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import java.util.List;
 
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/filter/OrDependencyFilter.java b/aether-util/src/main/java/org/eclipse/aether/util/filter/OrDependencyFilter.java
index 32eb53b..665f6e7 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/filter/OrDependencyFilter.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/filter/OrDependencyFilter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilter.java b/aether-util/src/main/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilter.java
index 915eef9..e768614 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilter.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import java.util.Collection;
 
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilter.java b/aether-util/src/main/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilter.java
index e5abe8f..e30600b 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilter.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import java.util.Collection;
 
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/filter/ScopeDependencyFilter.java b/aether-util/src/main/java/org/eclipse/aether/util/filter/ScopeDependencyFilter.java
index 988b382..bc60c41 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/filter/ScopeDependencyFilter.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/filter/ScopeDependencyFilter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/filter/package-info.java b/aether-util/src/main/java/org/eclipse/aether/util/filter/package-info.java
index c1006e1..6547d2e 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/filter/package-info.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/filter/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManager.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManager.java
index ce86aed..fefb9fb 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManager.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManager.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.manager;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.manager;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -59,9 +60,9 @@
      */
     public ClassicDependencyManager()
     {
-        this( 0, Collections.<Object, String> emptyMap(), Collections.<Object, String> emptyMap(),
-              Collections.<Object, Boolean> emptyMap(), Collections.<Object, String> emptyMap(),
-              Collections.<Object, Collection<Exclusion>> emptyMap() );
+        this( 0, Collections.<Object, String>emptyMap(), Collections.<Object, String>emptyMap(),
+              Collections.<Object, Boolean>emptyMap(), Collections.<Object, String>emptyMap(),
+              Collections.<Object, Collection<Exclusion>>emptyMap() );
     }
 
     private ClassicDependencyManager( int depth, Map<Object, String> managedVersions,
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/DependencyManagerUtils.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/DependencyManagerUtils.java
index 527abe8..7719096 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/DependencyManagerUtils.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/DependencyManagerUtils.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.manager;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.manager;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.graph.DependencyNode;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/NoopDependencyManager.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/NoopDependencyManager.java
index 89c3945..ae8ee40 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/NoopDependencyManager.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/NoopDependencyManager.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.manager;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.manager;
 
 import org.eclipse.aether.collection.DependencyCollectionContext;
 import org.eclipse.aether.collection.DependencyManagement;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/package-info.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/package-info.java
index 6ed25a6..7c7ae12 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/package-info.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/manager/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/AndDependencySelector.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/AndDependencySelector.java
index 216e459..f2a7e38 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/AndDependencySelector.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/AndDependencySelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.selector;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.selector;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelector.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelector.java
index 89aabcd..221cf4f 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelector.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/ExclusionDependencySelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.selector;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.selector;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/OptionalDependencySelector.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/OptionalDependencySelector.java
index a4b83f7..69bbda4 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/OptionalDependencySelector.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/OptionalDependencySelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.selector;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.selector;
 
 import org.eclipse.aether.collection.DependencyCollectionContext;
 import org.eclipse.aether.collection.DependencySelector;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelector.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelector.java
index 0f3e845..552fc09 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelector.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/ScopeDependencySelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.selector;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.selector;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/StaticDependencySelector.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/StaticDependencySelector.java
index 603d08c..41ce0e0 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/StaticDependencySelector.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/StaticDependencySelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.selector;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.selector;
 
 import org.eclipse.aether.collection.DependencyCollectionContext;
 import org.eclipse.aether.collection.DependencySelector;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/package-info.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/package-info.java
index fd214a9..3c3cf3c 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/package-info.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/selector/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ChainedDependencyGraphTransformer.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ChainedDependencyGraphTransformer.java
index 45f9ec9..d7f1771 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ChainedDependencyGraphTransformer.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ChainedDependencyGraphTransformer.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import org.eclipse.aether.RepositoryException;
 import org.eclipse.aether.collection.DependencyGraphTransformationContext;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorter.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorter.java
index 89ed370..c2122fa 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorter.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictMarker.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictMarker.java
index 362a54b..a3fb483 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictMarker.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictMarker.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import java.util.Collection;
 import java.util.Collections;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java
index 098bafd..5f9d8e0 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/ConflictResolver.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -300,7 +301,7 @@
                         loser.setData( NODE_DATA_ORIGINAL_SCOPE, loser.getDependency().getScope() );
                         loser.setData( NODE_DATA_ORIGINAL_OPTIONALITY, loser.getDependency().isOptional() );
                         loser.setScope( item.getScopes().iterator().next() );
-                        loser.setChildren( Collections.<DependencyNode> emptyList() );
+                        loser.setChildren( Collections.<DependencyNode>emptyList() );
                         childIt.set( loser );
                     }
                     else
@@ -1156,7 +1157,7 @@
      * <p>
      * <strong>Note:</strong> Implementations must be stateless.
      */
-    public static abstract class VersionSelector
+    public abstract static class VersionSelector
     {
 
         /**
@@ -1200,7 +1201,7 @@
      * <p>
      * <strong>Note:</strong> Implementations must be stateless.
      */
-    public static abstract class ScopeSelector
+    public abstract static class ScopeSelector
     {
 
         /**
@@ -1243,7 +1244,7 @@
      * <p>
      * <strong>Note:</strong> Implementations must be stateless.
      */
-    public static abstract class ScopeDeriver
+    public abstract static class ScopeDeriver
     {
 
         /**
@@ -1286,7 +1287,7 @@
      * <p>
      * <strong>Note:</strong> Implementations must be stateless.
      */
-    public static abstract class OptionalitySelector
+    public abstract static class OptionalitySelector
     {
 
         /**
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefiner.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefiner.java
index c1509e9..d96e04e 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefiner.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefiner.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import org.eclipse.aether.RepositoryException;
 import org.eclipse.aether.collection.DependencyGraphTransformationContext;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeDeriver.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeDeriver.java
index 09708e3..4c5fd3e 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeDeriver.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeDeriver.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import org.eclipse.aether.RepositoryException;
 import org.eclipse.aether.util.artifact.JavaScopes;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelector.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelector.java
index 12a9cdd..93edf05 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelector.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import java.util.Collection;
 import java.util.HashSet;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelector.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelector.java
index 5b32d73..c1ffa85 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelector.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/NoopDependencyGraphTransformer.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/NoopDependencyGraphTransformer.java
index 67b6749..55b6175 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/NoopDependencyGraphTransformer.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/NoopDependencyGraphTransformer.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import org.eclipse.aether.RepositoryException;
 import org.eclipse.aether.collection.DependencyGraphTransformationContext;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelector.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelector.java
index f4f76bd..0cc7a73 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelector.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import java.util.Collection;
 
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/TransformationContextKeys.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/TransformationContextKeys.java
index 565e81b..a9ebf68 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/TransformationContextKeys.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/TransformationContextKeys.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 /**
  * A collection of keys used by the dependency graph transformers when exchanging information via the graph
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/package-info.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/package-info.java
index 3db8113..a41adcd 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/package-info.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/transformer/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverser.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverser.java
index d5409bf..fb08b3b 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverser.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverser.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.traverser;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.traverser;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverser.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverser.java
index 8d2b93a..40ce616 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverser.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverser.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.traverser;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.traverser;
 
 import org.eclipse.aether.artifact.ArtifactProperties;
 import org.eclipse.aether.collection.DependencyCollectionContext;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverser.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverser.java
index c794575..5e2a703 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverser.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverser.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.traverser;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.traverser;
 
 import org.eclipse.aether.collection.DependencyCollectionContext;
 import org.eclipse.aether.collection.DependencyTraverser;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/package-info.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/package-info.java
index f86ddf6..a1b71e0 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/package-info.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/traverser/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/version/ChainedVersionFilter.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/version/ChainedVersionFilter.java
index 169bb34..7d13555 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/version/ChainedVersionFilter.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/version/ChainedVersionFilter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.version;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/version/ContextualSnapshotVersionFilter.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/version/ContextualSnapshotVersionFilter.java
index f361ddc..569bf4c 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/version/ContextualSnapshotVersionFilter.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/version/ContextualSnapshotVersionFilter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.version;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/version/HighestVersionFilter.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/version/HighestVersionFilter.java
index f788f3f..902e08d 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/version/HighestVersionFilter.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/version/HighestVersionFilter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.version;
 
 import java.util.Iterator;
 
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/version/SnapshotVersionFilter.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/version/SnapshotVersionFilter.java
index da82f9e..6af7cf5 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/version/SnapshotVersionFilter.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/version/SnapshotVersionFilter.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.version;
 
 import java.util.Iterator;
 
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/version/package-info.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/version/package-info.java
index c1845aa..a9f4649 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/version/package-info.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/version/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/AbstractDepthFirstNodeListGenerator.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/AbstractDepthFirstNodeListGenerator.java
index cd3a64a..70fc7d4 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/AbstractDepthFirstNodeListGenerator.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/AbstractDepthFirstNodeListGenerator.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.visitor;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.visitor;
 
 import org.eclipse.aether.artifact.Artifact;
 import org.eclipse.aether.graph.Dependency;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/CloningDependencyVisitor.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/CloningDependencyVisitor.java
index a7f295e..a39fc84 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/CloningDependencyVisitor.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/CloningDependencyVisitor.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.visitor;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.visitor;
 
 import java.util.IdentityHashMap;
 import java.util.Map;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitor.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitor.java
index af66d6b..49f779c 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitor.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitor.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.visitor;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.visitor;
 
 import org.eclipse.aether.graph.DependencyFilter;
 import org.eclipse.aether.graph.DependencyNode;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitor.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitor.java
index c8551da..d1814ed 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitor.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitor.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.visitor;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.visitor;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGenerator.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGenerator.java
index b1e487d..47897a7 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGenerator.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGenerator.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.visitor;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.visitor;
 
 import org.eclipse.aether.graph.DependencyNode;
 
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGenerator.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGenerator.java
index e630fa5..bd9b52a 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGenerator.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGenerator.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.visitor;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.visitor;
 
 import org.eclipse.aether.graph.DependencyNode;
 
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/Stack.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/Stack.java
index 997d20a..27fbb4b 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/Stack.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/Stack.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.visitor;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.visitor;
 
 import java.util.AbstractList;
 import java.util.NoSuchElementException;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitor.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitor.java
index 9713956..f1658a8 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitor.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitor.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.visitor;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.visitor;
 
 import java.util.IdentityHashMap;
 import java.util.Map;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/package-info.java b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/package-info.java
index ecc3c1d..3ea9968 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/package-info.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/graph/visitor/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/listener/ChainedRepositoryListener.java b/aether-util/src/main/java/org/eclipse/aether/util/listener/ChainedRepositoryListener.java
index 7750f07..c654510 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/listener/ChainedRepositoryListener.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/listener/ChainedRepositoryListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.listener;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.listener;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/listener/ChainedTransferListener.java b/aether-util/src/main/java/org/eclipse/aether/util/listener/ChainedTransferListener.java
index d786cdf..d943105 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/listener/ChainedTransferListener.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/listener/ChainedTransferListener.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.listener;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.listener;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/listener/package-info.java b/aether-util/src/main/java/org/eclipse/aether/util/listener/package-info.java
index f159e1b..9f0be58 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/listener/package-info.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/listener/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/package-info.java b/aether-util/src/main/java/org/eclipse/aether/util/package-info.java
index 80ba7ff..605e777 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/package-info.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/AuthenticationBuilder.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/AuthenticationBuilder.java
index 9884cc5..bc69e85 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/repository/AuthenticationBuilder.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/AuthenticationBuilder.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/ChainedAuthentication.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/ChainedAuthentication.java
index 4bced7d..40dae3f 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/repository/ChainedAuthentication.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/ChainedAuthentication.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import java.util.Arrays;
 import java.util.Collection;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/ChainedWorkspaceReader.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/ChainedWorkspaceReader.java
index 22d82b7..0a9b8f6 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/repository/ChainedWorkspaceReader.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/ChainedWorkspaceReader.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/ComponentAuthentication.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/ComponentAuthentication.java
index 99cecb1..af83c9d 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/repository/ComponentAuthentication.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/ComponentAuthentication.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import java.util.Map;
 
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/ConservativeAuthenticationSelector.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/ConservativeAuthenticationSelector.java
index 816a7ec..6e727e5 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/repository/ConservativeAuthenticationSelector.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/ConservativeAuthenticationSelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import org.eclipse.aether.repository.Authentication;
 import org.eclipse.aether.repository.AuthenticationSelector;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/ConservativeProxySelector.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/ConservativeProxySelector.java
index e38ceab..437c719 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/repository/ConservativeProxySelector.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/ConservativeProxySelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import org.eclipse.aether.repository.Proxy;
 import org.eclipse.aether.repository.ProxySelector;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultAuthenticationSelector.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultAuthenticationSelector.java
index d02699e..a5d4ce3 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultAuthenticationSelector.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultAuthenticationSelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultMirrorSelector.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultMirrorSelector.java
index 0f32dc2..7a77599 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultMirrorSelector.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultMirrorSelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java
index 51efabf..522b0d7 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/DefaultProxySelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/JreProxySelector.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/JreProxySelector.java
index 7f90a29..a09b435 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/repository/JreProxySelector.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/JreProxySelector.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import java.net.Authenticator;
 import java.net.InetSocketAddress;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/SecretAuthentication.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/SecretAuthentication.java
index 804555f..8b3b095 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/repository/SecretAuthentication.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/SecretAuthentication.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import java.util.Arrays;
 import java.util.Map;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/SimpleArtifactDescriptorPolicy.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/SimpleArtifactDescriptorPolicy.java
index 36b41b0..ccf1ba8 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/repository/SimpleArtifactDescriptorPolicy.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/SimpleArtifactDescriptorPolicy.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.resolution.ArtifactDescriptorPolicy;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/SimpleResolutionErrorPolicy.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/SimpleResolutionErrorPolicy.java
index efc5d81..4fa9059 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/repository/SimpleResolutionErrorPolicy.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/SimpleResolutionErrorPolicy.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import org.eclipse.aether.RepositorySystemSession;
 import org.eclipse.aether.artifact.Artifact;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/StringAuthentication.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/StringAuthentication.java
index 33e3fda..8438082 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/repository/StringAuthentication.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/StringAuthentication.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import java.util.Map;
 
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/repository/package-info.java b/aether-util/src/main/java/org/eclipse/aether/util/repository/package-info.java
index 9450164..1c0a194 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/repository/package-info.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/repository/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersion.java b/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersion.java
index 5d17d64..3596a29 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersion.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersion.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.version;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -337,6 +338,7 @@
                         case 'm':
                         case 'M':
                             return new Item( Item.KIND_QUALIFIER, QUALIFIER_MILESTONE );
+                        default:
                     }
                 }
                 Integer qualifier = QUALIFIERS.get( token );
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java b/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java
index 122426a..bfcd455 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersionConstraint.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.version;
 
 import org.eclipse.aether.version.Version;
 import org.eclipse.aether.version.VersionConstraint;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java b/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java
index 4c27111..832dd94 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersionRange.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.version;
 
 import org.eclipse.aether.version.InvalidVersionSpecificationException;
 import org.eclipse.aether.version.Version;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersionScheme.java b/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersionScheme.java
index 41ef63a..8fc0488 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersionScheme.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/version/GenericVersionScheme.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.version;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/version/UnionVersionRange.java b/aether-util/src/main/java/org/eclipse/aether/util/version/UnionVersionRange.java
index 6ad405e..c54a4b4 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/version/UnionVersionRange.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/version/UnionVersionRange.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.version;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -44,7 +45,7 @@
     {
         if ( ranges == null )
         {
-            return from( Collections.<VersionRange> emptySet() );
+            return from( Collections.<VersionRange>emptySet() );
         }
         return from( Arrays.asList( ranges ) );
     }
diff --git a/aether-util/src/main/java/org/eclipse/aether/util/version/package-info.java b/aether-util/src/main/java/org/eclipse/aether/util/version/package-info.java
index ce60950..18dc724 100644
--- a/aether-util/src/main/java/org/eclipse/aether/util/version/package-info.java
+++ b/aether-util/src/main/java/org/eclipse/aether/util/version/package-info.java
@@ -1,3 +1,4 @@
+// CHECKSTYLE_OFF: RegexpHeader
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java b/aether-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java
index 29bd53a..05da6f4 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/ChecksumUtilTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util;
 
 import static org.eclipse.aether.internal.test.util.TestFileUtils.*;
 import static org.junit.Assert.*;
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java b/aether-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java
index 1d72da6..9218031 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/ConfigUtilsTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/StringUtilsTest.java b/aether-util/src/test/java/org/eclipse/aether/util/StringUtilsTest.java
index d800605..4ac2f7e 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/StringUtilsTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/StringUtilsTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/artifact/ArtifactIdUtilsTest.java b/aether-util/src/test/java/org/eclipse/aether/util/artifact/ArtifactIdUtilsTest.java
index 6c5d03a..36193f3 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/artifact/ArtifactIdUtilsTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/artifact/ArtifactIdUtilsTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.artifact;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/artifact/SubArtifactTest.java b/aether-util/src/test/java/org/eclipse/aether/util/artifact/SubArtifactTest.java
index 897b71a..dc0e472 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/artifact/SubArtifactTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/artifact/SubArtifactTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.artifact;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.artifact;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/filter/AbstractDependencyFilterTest.java b/aether-util/src/test/java/org/eclipse/aether/util/filter/AbstractDependencyFilterTest.java
index 80bb3e8..835c1ce 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/filter/AbstractDependencyFilterTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/filter/AbstractDependencyFilterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import java.util.List;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/filter/AndDependencyFilterTest.java b/aether-util/src/test/java/org/eclipse/aether/util/filter/AndDependencyFilterTest.java
index 4df4c7f..45a7f3d 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/filter/AndDependencyFilterTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/filter/AndDependencyFilterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/filter/DependencyFilterUtilsTest.java b/aether-util/src/test/java/org/eclipse/aether/util/filter/DependencyFilterUtilsTest.java
index 9fed61f..28bde57 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/filter/DependencyFilterUtilsTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/filter/DependencyFilterUtilsTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java b/aether-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java
index 483af75..a0be592 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/filter/ExclusionDependencyFilterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/filter/OrDependencyFilterTest.java b/aether-util/src/test/java/org/eclipse/aether/util/filter/OrDependencyFilterTest.java
index 2ebb9b4..03b80ea 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/filter/OrDependencyFilterTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/filter/OrDependencyFilterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java b/aether-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java
index d792dca..b5b307e 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/filter/PatternExclusionsDependencyFilterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java b/aether-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java
index b4dc5b9..cb85431 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/filter/PatternInclusionsDependencyFilterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/filter/ScopeDependencyFilterTest.java b/aether-util/src/test/java/org/eclipse/aether/util/filter/ScopeDependencyFilterTest.java
index 0dc9aec..e943df9 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/filter/ScopeDependencyFilterTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/filter/ScopeDependencyFilterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.filter;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.filter;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManagerTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManagerTest.java
index d7d6a19..2593585 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManagerTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/manager/ClassicDependencyManagerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.manager;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.manager;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/selector/AndDependencySelectorTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/selector/AndDependencySelectorTest.java
index 44b8dd5..b0f2b09 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/selector/AndDependencySelectorTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/selector/AndDependencySelectorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.selector;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.selector;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/AbstractDependencyGraphTransformerTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/AbstractDependencyGraphTransformerTest.java
index 4f1bd77..b5947ed 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/AbstractDependencyGraphTransformerTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/AbstractDependencyGraphTransformerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorterTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorterTest.java
index ca4235a..b24a920 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorterTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictIdSorterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictMarkerTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictMarkerTest.java
index e2bdc53..550a0c6 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictMarkerTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/ConflictMarkerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefinerTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefinerTest.java
index eb52e83..bb0d65a 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefinerTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaDependencyContextRefinerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelectorTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelectorTest.java
index c66c287..2737803 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelectorTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/JavaScopeSelectorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelectorTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelectorTest.java
index fc26b3c..b71adab 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelectorTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/NearestVersionSelectorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/RootQueueTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/RootQueueTest.java
index d3a0986..f609ed7 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/RootQueueTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/RootQueueTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleConflictMarker.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleConflictMarker.java
index 08e8bcd..df30368 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleConflictMarker.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleConflictMarker.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import java.util.IdentityHashMap;
 import java.util.Map;
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelectorTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelectorTest.java
index 0b9ff11..f6d268f 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelectorTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/transformer/SimpleOptionalitySelectorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.transformer;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.transformer;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverserTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverserTest.java
index 9297d2d..74d744e 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverserTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/traverser/AndDependencyTraverserTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.traverser;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.traverser;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverserTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverserTest.java
index e28bf44..641e593 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverserTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/traverser/FatArtifactTraverserTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.traverser;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.traverser;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverserTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverserTest.java
index 75b1d79..0ac1d91 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverserTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/traverser/StaticDependencyTraverserTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.traverser;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.traverser;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/AbstractVersionFilterTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/AbstractVersionFilterTest.java
index 7e5e35b..13fd4b0 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/AbstractVersionFilterTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/AbstractVersionFilterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.versions;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.versions;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java
index eda8c11..1e8a5bd 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/ChainedVersionFilterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.versions;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.versions;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java
index e84c8da..dd88a66 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/ContextualSnapshotVersionFilterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.versions;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.versions;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java
index 6e825e1..3926c66 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/HighestVersionFilterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.versions;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.versions;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java
index b750906..70c26f9 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/versions/SnapshotVersionFilterTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.versions;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.versions;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitorTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitorTest.java
index 2b2316f..65a02a8 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitorTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/FilteringDependencyVisitorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.visitor;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.visitor;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitorTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitorTest.java
index 0ff9943..cd766a0 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitorTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/PathRecordingDependencyVisitorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.visitor;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.visitor;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGeneratorTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGeneratorTest.java
index aa75aa5..8d6f525 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGeneratorTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/PostorderNodeListGeneratorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.visitor;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.visitor;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGeneratorTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGeneratorTest.java
index 3e85040..200dd3b 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGeneratorTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/PreorderNodeListGeneratorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.visitor;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.visitor;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitorTest.java b/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitorTest.java
index 7caeaa5..36cb6ac 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitorTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/graph/visitor/TreeDependencyVisitorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.graph.visitor;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.graph.visitor;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/listener/ChainedRepositoryListenerTest.java b/aether-util/src/test/java/org/eclipse/aether/util/listener/ChainedRepositoryListenerTest.java
index 3031a42..6eaa25b 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/listener/ChainedRepositoryListenerTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/listener/ChainedRepositoryListenerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.listener;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.listener;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/listener/ChainedTransferListenerTest.java b/aether-util/src/test/java/org/eclipse/aether/util/listener/ChainedTransferListenerTest.java
index 57049b2..7e7e969 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/listener/ChainedTransferListenerTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/listener/ChainedTransferListenerTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.listener;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.listener;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/repository/ComponentAuthenticationTest.java b/aether-util/src/test/java/org/eclipse/aether/util/repository/ComponentAuthenticationTest.java
index 05b81ed..25d53f2 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/repository/ComponentAuthenticationTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/repository/ComponentAuthenticationTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/repository/DefaultMirrorSelectorTest.java b/aether-util/src/test/java/org/eclipse/aether/util/repository/DefaultMirrorSelectorTest.java
index 8b65920..d436658 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/repository/DefaultMirrorSelectorTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/repository/DefaultMirrorSelectorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/repository/DefaultProxySelectorTest.java b/aether-util/src/test/java/org/eclipse/aether/util/repository/DefaultProxySelectorTest.java
index f95f234..02a665a 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/repository/DefaultProxySelectorTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/repository/DefaultProxySelectorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/repository/JreProxySelectorTest.java b/aether-util/src/test/java/org/eclipse/aether/util/repository/JreProxySelectorTest.java
index f982d47..8eac55b 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/repository/JreProxySelectorTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/repository/JreProxySelectorTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/repository/SecretAuthenticationTest.java b/aether-util/src/test/java/org/eclipse/aether/util/repository/SecretAuthenticationTest.java
index 4045519..df4afaf 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/repository/SecretAuthenticationTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/repository/SecretAuthenticationTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/repository/StringAuthenticationTest.java b/aether-util/src/test/java/org/eclipse/aether/util/repository/StringAuthenticationTest.java
index 4b2aab4..8f89299 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/repository/StringAuthenticationTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/repository/StringAuthenticationTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.repository;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.repository;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/version/AbstractVersionTest.java b/aether-util/src/test/java/org/eclipse/aether/util/version/AbstractVersionTest.java
index f1f3443..52541db 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/version/AbstractVersionTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/version/AbstractVersionTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.version;
 
 import static org.junit.Assert.assertEquals;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/version/GenericVersionRangeTest.java b/aether-util/src/test/java/org/eclipse/aether/util/version/GenericVersionRangeTest.java
index 0e12f77..85d007f 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/version/GenericVersionRangeTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/version/GenericVersionRangeTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.version;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java b/aether-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java
index 81a50e7..f52f73d 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/version/GenericVersionSchemeTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.version;
 
 import static org.junit.Assert.*;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/version/GenericVersionTest.java b/aether-util/src/test/java/org/eclipse/aether/util/version/GenericVersionTest.java
index bfd12a2..ae891af 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/version/GenericVersionTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/version/GenericVersionTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.version;
 
 import java.util.Locale;
 
diff --git a/aether-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java b/aether-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java
index 439b045..570b6b7 100644
--- a/aether-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java
+++ b/aether-util/src/test/java/org/eclipse/aether/util/version/UnionVersionRangeTest.java
@@ -1,3 +1,5 @@
+package org.eclipse.aether.util.version;
+
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -16,7 +18,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.eclipse.aether.util.version;
 
 import static org.junit.Assert.*;
 
diff --git a/pom.xml b/pom.xml
index 8ea84de..ff33e37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,8 +63,8 @@
 
   <properties>
     <surefire.redirectTestOutputToFile>true</surefire.redirectTestOutputToFile>
-    <checkstyle.skip>true</checkstyle.skip>
     <maven.site.path>aether-archives/aether-LATEST</maven.site.path>
+    <checkstyle.violation.ignore>UnusedImports,LineLength,InnerAssignment,MagicNumber,AvoidNestedBlocks,ParameterNumber,MethodLength,MemberName</checkstyle.violation.ignore>
   </properties>
 
   <modules>