From 3fe271300e996bba1f671b6f698493aa2148058f Mon Sep 17 00:00:00 2001
From: Brett Leslie Porter <brett@apache.org>
Date: Tue, 26 Apr 2005 07:39:27 +0000
Subject: [PATCH] reformat and update copyright

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@164760 13f79535-47bb-0310-9956-ffa450edef68
---
 .../project/DefaultMavenProjectBuilder.java   |  2 +-
 .../apache/maven/project/MavenProject.java    | 23 +++++++------
 .../maven/project/MavenProjectBuilder.java    | 27 ++++++++-------
 .../project/MavenProjectBuildingResult.java   | 26 +++++++--------
 .../project/ProjectBuildingException.java     | 23 +++++++------
 .../project/artifact/MavenMetadataSource.java |  2 +-
 .../ModelInheritanceAssembler.java            | 23 +++++++------
 .../DefaultModelDefaultsInjector.java         |  3 +-
 .../ModelInterpolationException.java          | 30 ++++++++---------
 .../interpolation/ModelInterpolator.java      | 30 ++++++++---------
 .../RegexBasedModelInterpolator.java          |  3 +-
 .../maven/project/path/PathTranslator.java    | 23 +++++++------
 .../validation/DefaultModelValidator.java     | 23 +++++++------
 .../validation/ModelValidationResult.java     | 33 +++++++++++--------
 .../project/validation/ModelValidator.java    | 23 +++++++------
 .../ProjectBaseDirectoryAlignmentTest.java    | 16 +++++++++
 .../CanonicalProjectBuilderTest.java          |  2 +-
 .../ProjectInheritanceTestCase.java           |  2 +-
 .../t00/ProjectInheritanceTest.java           |  5 ++-
 .../t01/ProjectInheritanceTest.java           |  2 +-
 .../RegexBasedModelInterpolatorTest.java      |  3 +-
 21 files changed, 167 insertions(+), 157 deletions(-)

diff --git a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
index a109dc5789..e03be11e8d 100644
--- a/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
+++ b/maven-project/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
@@ -2,7 +2,7 @@ package org.apache.maven.project;
 
 /*
  * Copyright 2001-2005 The Apache Software Foundation.
- *                              
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
diff --git a/maven-project/src/main/java/org/apache/maven/project/MavenProject.java b/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
index 811aafd887..da7bf4e02b 100644
--- a/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
+++ b/maven-project/src/main/java/org/apache/maven/project/MavenProject.java
@@ -1,20 +1,19 @@
 package org.apache.maven.project;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import org.apache.maven.artifact.Artifact;
diff --git a/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java b/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
index 22a31c73d2..6210c23861 100644
--- a/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
+++ b/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuilder.java
@@ -1,27 +1,26 @@
 package org.apache.maven.project;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
 
 import java.io.File;
 import java.util.List;
diff --git a/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java b/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java
index d82d8f108f..dcd55ad17f 100644
--- a/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java
+++ b/maven-project/src/main/java/org/apache/maven/project/MavenProjectBuildingResult.java
@@ -1,20 +1,19 @@
 package org.apache.maven.project;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import org.apache.maven.project.validation.ModelValidationResult;
@@ -35,7 +34,6 @@ public class MavenProjectBuildingResult
     private boolean successful;
 
     /**
-     * 
      * @param project
      */
     public MavenProjectBuildingResult( MavenProject project )
@@ -70,7 +68,7 @@ public class MavenProjectBuildingResult
 
     /**
      * Returns true if the project is valid.
-     * 
+     *
      * @return Returns true if the project is valid.
      */
     public boolean isSuccessful()
diff --git a/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java b/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java
index 776687c0e6..5363b27786 100644
--- a/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java
+++ b/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java
@@ -1,20 +1,19 @@
 package org.apache.maven.project;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /**
diff --git a/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java b/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
index afb51e3741..7c64b379f8 100644
--- a/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
+++ b/maven-project/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
@@ -16,6 +16,7 @@ package org.apache.maven.project.artifact;
  * limitations under the License.
  */
 
+import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.factory.DefaultArtifactFactory;
 import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException;
@@ -23,7 +24,6 @@ import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.resolver.ArtifactResolutionException;
 import org.apache.maven.artifact.resolver.ArtifactResolver;
-import org.apache.maven.artifact.Artifact;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
diff --git a/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java b/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java
index f6b2b4da5b..cc859642f5 100644
--- a/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java
+++ b/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java
@@ -1,20 +1,19 @@
 package org.apache.maven.project.inheritance;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import org.apache.maven.model.Model;
diff --git a/maven-project/src/main/java/org/apache/maven/project/injection/DefaultModelDefaultsInjector.java b/maven-project/src/main/java/org/apache/maven/project/injection/DefaultModelDefaultsInjector.java
index 96a43ce045..a46323dd73 100644
--- a/maven-project/src/main/java/org/apache/maven/project/injection/DefaultModelDefaultsInjector.java
+++ b/maven-project/src/main/java/org/apache/maven/project/injection/DefaultModelDefaultsInjector.java
@@ -121,8 +121,7 @@ public class DefaultModelDefaultsInjector
                 {
                     Xpp3Dom goalConfiguration = (Xpp3Dom) localGoal.getConfiguration();
                     Xpp3Dom defaultGoalConfiguration = (Xpp3Dom) defaultGoal.getConfiguration();
-                    localGoal.setConfiguration(
-                        Xpp3Dom.mergeXpp3Dom( goalConfiguration, defaultGoalConfiguration ) );
+                    localGoal.setConfiguration( Xpp3Dom.mergeXpp3Dom( goalConfiguration, defaultGoalConfiguration ) );
                 }
             }
         }
diff --git a/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java b/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java
index 80d31a44a9..136d7acd32 100644
--- a/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java
+++ b/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolationException.java
@@ -1,32 +1,32 @@
 package org.apache.maven.project.interpolation;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 /**
  * @author jdcasey
- *
- * Created on Feb 2, 2005
+ *         <p/>
+ *         Created on Feb 2, 2005
  */
 public class ModelInterpolationException
     extends Exception
 {
 
-    /** Added: Feb 2, 2005 by jdcasey
+    /**
+     * Added: Feb 2, 2005 by jdcasey
      */
     public ModelInterpolationException( String expression, Throwable cause )
     {
diff --git a/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java b/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
index 760603e717..a70cc6572d 100644
--- a/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
+++ b/maven-project/src/main/java/org/apache/maven/project/interpolation/ModelInterpolator.java
@@ -1,34 +1,34 @@
 package org.apache.maven.project.interpolation;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import org.apache.maven.model.Model;
 
 /**
  * @author jdcasey
- *
- * Created on Feb 2, 2005
+ *         <p/>
+ *         Created on Feb 2, 2005
  */
 public interface ModelInterpolator
 {
 
     String ROLE = ModelInterpolator.class.getName();
 
-    Model interpolate( Model project ) throws ModelInterpolationException;
+    Model interpolate( Model project )
+        throws ModelInterpolationException;
 
 }
\ No newline at end of file
diff --git a/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java b/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
index 7f9a0ab9d5..b4da336f38 100644
--- a/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
+++ b/maven-project/src/main/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolator.java
@@ -106,7 +106,8 @@ public class RegexBasedModelInterpolator
                 Logger logger = getLogger();
                 if ( logger != null )
                 {
-                    logger.debug( "POM interpolation cannot proceed with expression: " + wholeExpr + ". Skipping...", e );
+                    logger.debug( "POM interpolation cannot proceed with expression: " + wholeExpr + ". Skipping...",
+                                  e );
                 }
             }
 
diff --git a/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java b/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java
index 79e495ea3d..a271c563a1 100644
--- a/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java
+++ b/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java
@@ -1,20 +1,19 @@
 package org.apache.maven.project.path;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import org.apache.maven.model.Model;
diff --git a/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java b/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
index f12c7af64f..b11935490f 100644
--- a/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
+++ b/maven-project/src/main/java/org/apache/maven/project/validation/DefaultModelValidator.java
@@ -1,20 +1,19 @@
 package org.apache.maven.project.validation;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import org.apache.maven.model.Dependency;
diff --git a/maven-project/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java b/maven-project/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
index 7be19037ba..6dc1571090 100644
--- a/maven-project/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
+++ b/maven-project/src/main/java/org/apache/maven/project/validation/ModelValidationResult.java
@@ -1,20 +1,19 @@
 package org.apache.maven.project.validation;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import java.util.ArrayList;
@@ -55,18 +54,24 @@ public class ModelValidationResult
     public String toString()
     {
         if ( messages.size() == 0 )
+        {
             return "There was no validation errors.";
+        }
 
         StringBuffer message = new StringBuffer();
 
         if ( messages.size() == 1 )
+        {
             message.append( "There was 1 validation error: " );
+        }
         else
-            message.append( "There was " + messages.size() + " validation errors: " + NEWLINE);
+        {
+            message.append( "There was " + messages.size() + " validation errors: " + NEWLINE );
+        }
 
         for ( int i = 0; i < messages.size(); i++ )
         {
-            message.append( "#" + (i + 1) + ": " + messages.get( i ).toString() + NEWLINE );
+            message.append( "#" + ( i + 1 ) + ": " + messages.get( i ).toString() + NEWLINE );
         }
 
         return message.toString();
diff --git a/maven-project/src/main/java/org/apache/maven/project/validation/ModelValidator.java b/maven-project/src/main/java/org/apache/maven/project/validation/ModelValidator.java
index 7e43d50345..30a857ed33 100644
--- a/maven-project/src/main/java/org/apache/maven/project/validation/ModelValidator.java
+++ b/maven-project/src/main/java/org/apache/maven/project/validation/ModelValidator.java
@@ -1,20 +1,19 @@
 package org.apache.maven.project.validation;
 
-/* ====================================================================
- *   Copyright 2001-2004 The Apache Software Foundation.
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
- *   Licensed under the Apache License, Version 2.0 (the "License");
- *   you may not use this file except in compliance with the License.
- *   You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- *       http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
- *   Unless required by applicable law or agreed to in writing, software
- *   distributed under the License is distributed on an "AS IS" BASIS,
- *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *   See the License for the specific language governing permissions and
- *   limitations under the License.
- * ====================================================================
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 
 import org.apache.maven.model.Model;
diff --git a/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java b/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
index 8711ac7418..e515adc4bf 100644
--- a/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
+++ b/maven-project/src/test/java/org/apache/maven/project/ProjectBaseDirectoryAlignmentTest.java
@@ -1,5 +1,21 @@
 package org.apache.maven.project;
 
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 import org.apache.maven.model.Build;
 import org.apache.maven.model.Resource;
 
diff --git a/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java b/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
index e83a0d43e0..0350dbb931 100644
--- a/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
+++ b/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
@@ -1,7 +1,7 @@
 package org.apache.maven.project.canonical;
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java
index e821f52689..0991117fce 100644
--- a/maven-project/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java
+++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/ProjectInheritanceTestCase.java
@@ -1,7 +1,7 @@
 package org.apache.maven.project.inheritance;
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
index a221ccd370..934910a515 100644
--- a/maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
+++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
@@ -1,7 +1,7 @@
 package org.apache.maven.project.inheritance.t00;
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,7 +66,7 @@ public class ProjectInheritanceTest
         // Value taken from p2
         // ----------------------------------------------------------------------
 
-        assertEquals( "mailing-list", ((MailingList)p4.getMailingLists().get(0)).getName() );
+        assertEquals( "mailing-list", ( (MailingList) p4.getMailingLists().get( 0 ) ).getName() );
 
         // ----------------------------------------------------------------------
         // Value taken from p1
@@ -86,7 +86,6 @@ public class ProjectInheritanceTest
 
         assertEquals( "4.0.0", p4.getModelVersion() );
 
-
         assertEquals( "4.0.0", p4.getModelVersion() );
     }
 }
diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
index 3534a02884..188b87f1c0 100644
--- a/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
+++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
@@ -1,7 +1,7 @@
 package org.apache.maven.project.inheritance.t01;
 
 /*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2005 The Apache Software Foundation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java b/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java
index 6abfedfb99..6cc3e85589 100644
--- a/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java
+++ b/maven-project/src/test/java/org/apache/maven/project/interpolation/RegexBasedModelInterpolatorTest.java
@@ -16,11 +16,10 @@ package org.apache.maven.project.interpolation;
  * limitations under the License.
  */
 
+import junit.framework.TestCase;
 import org.apache.maven.model.Dependency;
 import org.apache.maven.model.Model;
 
-import junit.framework.TestCase;
-
 /**
  * @author jdcasey
  * @version $Id$