diff --git a/artifact/plugin.jelly b/artifact/plugin.jelly
index 005dd4f7..340d0948 100644
--- a/artifact/plugin.jelly
+++ b/artifact/plugin.jelly
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/artifact/plugin.properties b/artifact/plugin.properties
index dd29fbc3..fef8ad75 100644
--- a/artifact/plugin.properties
+++ b/artifact/plugin.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/artifact/project.properties b/artifact/project.properties
index 33f8877d..6d62e178 100644
--- a/artifact/project.properties
+++ b/artifact/project.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/artifact/project.xml b/artifact/project.xml
index ed36889e..ae1ff907 100644
--- a/artifact/project.xml
+++ b/artifact/project.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/artifact/src/main/org/apache/maven/artifact/PomRewriter.java b/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
index 8aa2eb13..a8710915 100644
--- a/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
+++ b/artifact/src/main/org/apache/maven/artifact/PomRewriter.java
@@ -1,11 +1,12 @@
 package org.apache.maven.artifact;
 
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  *
diff --git a/artifact/src/main/org/apache/maven/artifact/deployer/ArtifactDeployer.java b/artifact/src/main/org/apache/maven/artifact/deployer/ArtifactDeployer.java
index ca02311b..0632b1d7 100644
--- a/artifact/src/main/org/apache/maven/artifact/deployer/ArtifactDeployer.java
+++ b/artifact/src/main/org/apache/maven/artifact/deployer/ArtifactDeployer.java
@@ -1,11 +1,12 @@
 package org.apache.maven.artifact.deployer;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java b/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
index 22162a19..c96cb959 100644
--- a/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
+++ b/artifact/src/main/org/apache/maven/artifact/deployer/DefaultArtifactDeployer.java
@@ -1,11 +1,12 @@
 package org.apache.maven.artifact.deployer;
 
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  *
diff --git a/artifact/src/main/org/apache/maven/artifact/deployer/DeployBean.java b/artifact/src/main/org/apache/maven/artifact/deployer/DeployBean.java
index 91ccb5b4..fc42137d 100644
--- a/artifact/src/main/org/apache/maven/artifact/deployer/DeployBean.java
+++ b/artifact/src/main/org/apache/maven/artifact/deployer/DeployBean.java
@@ -1,11 +1,12 @@
 package org.apache.maven.artifact.deployer;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/artifact/src/main/org/apache/maven/artifact/deployer/NamedArtifactDeployer.java b/artifact/src/main/org/apache/maven/artifact/deployer/NamedArtifactDeployer.java
index ec764e7a..938dc0b0 100644
--- a/artifact/src/main/org/apache/maven/artifact/deployer/NamedArtifactDeployer.java
+++ b/artifact/src/main/org/apache/maven/artifact/deployer/NamedArtifactDeployer.java
@@ -1,11 +1,12 @@
 package org.apache.maven.artifact.deployer;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/artifact/src/main/org/apache/maven/artifact/deployer/NamedArtifactTypeHandler.java b/artifact/src/main/org/apache/maven/artifact/deployer/NamedArtifactTypeHandler.java
index 0dc99271..a65f8dca 100644
--- a/artifact/src/main/org/apache/maven/artifact/deployer/NamedArtifactTypeHandler.java
+++ b/artifact/src/main/org/apache/maven/artifact/deployer/NamedArtifactTypeHandler.java
@@ -1,11 +1,12 @@
 package org.apache.maven.artifact.deployer;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java b/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java
index a2d32139..a5a91c27 100755
--- a/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java
+++ b/artifact/src/main/org/apache/maven/artifact/deployer/RepositoryBuilder.java
@@ -1,11 +1,12 @@
 package org.apache.maven.artifact.deployer;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/artifact/src/main/org/apache/maven/artifact/deployer/UploadMeter.java b/artifact/src/main/org/apache/maven/artifact/deployer/UploadMeter.java
index 76049459..0a2ad783 100755
--- a/artifact/src/main/org/apache/maven/artifact/deployer/UploadMeter.java
+++ b/artifact/src/main/org/apache/maven/artifact/deployer/UploadMeter.java
@@ -1,11 +1,12 @@
 package org.apache.maven.artifact.deployer;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/artifact/src/plugin-test/maven.xml b/artifact/src/plugin-test/maven.xml
index 6e3bf5cd..be5a1c34 100644
--- a/artifact/src/plugin-test/maven.xml
+++ b/artifact/src/plugin-test/maven.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/artifact/src/plugin-test/project.xml b/artifact/src/plugin-test/project.xml
index 58a5b126..2fb86978 100644
--- a/artifact/src/plugin-test/project.xml
+++ b/artifact/src/plugin-test/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java b/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
index 555d54cd..b29d972b 100644
--- a/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
+++ b/artifact/src/test/java/org/apache/maven/artifact/PomRewriterTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.artifact;
 
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  *
diff --git a/artifact/xdocs/authentication.xml b/artifact/xdocs/authentication.xml
index 5be3e461..c4a7a689 100644
--- a/artifact/xdocs/authentication.xml
+++ b/artifact/xdocs/authentication.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/artifact/xdocs/changes.xml b/artifact/xdocs/changes.xml
index 2ab6a7af..279615cd 100644
--- a/artifact/xdocs/changes.xml
+++ b/artifact/xdocs/changes.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/artifact/xdocs/examples.xml b/artifact/xdocs/examples.xml
index 55a28025..b472cf09 100644
--- a/artifact/xdocs/examples.xml
+++ b/artifact/xdocs/examples.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/artifact/xdocs/goals.xml b/artifact/xdocs/goals.xml
index 7d454dd4..cdf36421 100644
--- a/artifact/xdocs/goals.xml
+++ b/artifact/xdocs/goals.xml
@@ -1,5 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
+<!-- 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+ -->
 <document>
   <properties>
     <title>Maven Artifact Plugin Goals</title>
diff --git a/artifact/xdocs/index.xml b/artifact/xdocs/index.xml
index d30792db..a01f4182 100644
--- a/artifact/xdocs/index.xml
+++ b/artifact/xdocs/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/artifact/xdocs/navigation.xml b/artifact/xdocs/navigation.xml
index 000bb9ee..71762fe7 100644
--- a/artifact/xdocs/navigation.xml
+++ b/artifact/xdocs/navigation.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/artifact/xdocs/properties.xml b/artifact/xdocs/properties.xml
index 445ad2b0..2053810f 100644
--- a/artifact/xdocs/properties.xml
+++ b/artifact/xdocs/properties.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
-  /*
-  * Copyright 2001-2004 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.
-  */
--->
-
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+ -->
 <document>
 
   <properties>
diff --git a/artifact/xdocs/protocols.xml b/artifact/xdocs/protocols.xml
index 5b11d5d7..b263b9a7 100644
--- a/artifact/xdocs/protocols.xml
+++ b/artifact/xdocs/protocols.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/artifact/xdocs/security.xml b/artifact/xdocs/security.xml
index ad5287dc..eab7084e 100644
--- a/artifact/xdocs/security.xml
+++ b/artifact/xdocs/security.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/artifact/xdocs/tags.xml b/artifact/xdocs/tags.xml
index d0498cbc..f0d2dbb5 100644
--- a/artifact/xdocs/tags.xml
+++ b/artifact/xdocs/tags.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/changelog/plugin.jelly b/changelog/plugin.jelly
index e4611af6..ec3f676d 100644
--- a/changelog/plugin.jelly
+++ b/changelog/plugin.jelly
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/changelog/plugin.properties b/changelog/plugin.properties
index 6bc679e7..7ba58aac 100644
--- a/changelog/plugin.properties
+++ b/changelog/plugin.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/changelog/project.properties b/changelog/project.properties
index 33f8877d..6d62e178 100644
--- a/changelog/project.properties
+++ b/changelog/project.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/changelog/project.xml b/changelog/project.xml
index 70bfb16d..5aeee00a 100644
--- a/changelog/project.xml
+++ b/changelog/project.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/changelog/src/main/org/apache/maven/changelog/AbstractChangeLogGenerator.java b/changelog/src/main/org/apache/maven/changelog/AbstractChangeLogGenerator.java
index 7de2fda2..08c42532 100644
--- a/changelog/src/main/org/apache/maven/changelog/AbstractChangeLogGenerator.java
+++ b/changelog/src/main/org/apache/maven/changelog/AbstractChangeLogGenerator.java
@@ -1,11 +1,12 @@
 package org.apache.maven.changelog;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/changelog/ChangeLog.java b/changelog/src/main/org/apache/maven/changelog/ChangeLog.java
index e7d4ff28..3f8efc41 100644
--- a/changelog/src/main/org/apache/maven/changelog/ChangeLog.java
+++ b/changelog/src/main/org/apache/maven/changelog/ChangeLog.java
@@ -1,11 +1,12 @@
 package org.apache.maven.changelog;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/changelog/ChangeLogEntry.java b/changelog/src/main/org/apache/maven/changelog/ChangeLogEntry.java
index 7ab58630..acfaeb72 100644
--- a/changelog/src/main/org/apache/maven/changelog/ChangeLogEntry.java
+++ b/changelog/src/main/org/apache/maven/changelog/ChangeLogEntry.java
@@ -1,11 +1,12 @@
 package org.apache.maven.changelog;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/changelog/ChangeLogFactory.java b/changelog/src/main/org/apache/maven/changelog/ChangeLogFactory.java
index 96529f92..c2a5ce2f 100644
--- a/changelog/src/main/org/apache/maven/changelog/ChangeLogFactory.java
+++ b/changelog/src/main/org/apache/maven/changelog/ChangeLogFactory.java
@@ -1,11 +1,12 @@
 package org.apache.maven.changelog;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/changelog/ChangeLogFile.java b/changelog/src/main/org/apache/maven/changelog/ChangeLogFile.java
index 1f5d911a..dc208a8f 100644
--- a/changelog/src/main/org/apache/maven/changelog/ChangeLogFile.java
+++ b/changelog/src/main/org/apache/maven/changelog/ChangeLogFile.java
@@ -1,11 +1,12 @@
 package org.apache.maven.changelog;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/changelog/ChangeLogGenerator.java b/changelog/src/main/org/apache/maven/changelog/ChangeLogGenerator.java
index 61087181..5c28b229 100644
--- a/changelog/src/main/org/apache/maven/changelog/ChangeLogGenerator.java
+++ b/changelog/src/main/org/apache/maven/changelog/ChangeLogGenerator.java
@@ -1,11 +1,12 @@
 package org.apache.maven.changelog;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/changelog/ChangeLogParser.java b/changelog/src/main/org/apache/maven/changelog/ChangeLogParser.java
index f7892403..a4b91566 100644
--- a/changelog/src/main/org/apache/maven/changelog/ChangeLogParser.java
+++ b/changelog/src/main/org/apache/maven/changelog/ChangeLogParser.java
@@ -1,11 +1,12 @@
 package org.apache.maven.changelog;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/changelog/ChangeLogSet.java b/changelog/src/main/org/apache/maven/changelog/ChangeLogSet.java
index c9724485..59f20a57 100644
--- a/changelog/src/main/org/apache/maven/changelog/ChangeLogSet.java
+++ b/changelog/src/main/org/apache/maven/changelog/ChangeLogSet.java
@@ -1,11 +1,12 @@
 package org.apache.maven.changelog;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogFactory.java b/changelog/src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogFactory.java
index e589dce9..782fd322 100644
--- a/changelog/src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogFactory.java
+++ b/changelog/src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogFactory.java
@@ -1,11 +1,12 @@
 package org.apache.maven.clearcaselib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogGenerator.java b/changelog/src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogGenerator.java
index 2c8bd4d6..d35d5f7f 100644
--- a/changelog/src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogGenerator.java
+++ b/changelog/src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogGenerator.java
@@ -1,11 +1,12 @@
 package org.apache.maven.clearcaselib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogParser.java b/changelog/src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogParser.java
index 4475a8c2..3869252d 100644
--- a/changelog/src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogParser.java
+++ b/changelog/src/main/org/apache/maven/clearcaselib/ClearcaseChangeLogParser.java
@@ -1,11 +1,12 @@
 package org.apache.maven.clearcaselib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogFactory.java b/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogFactory.java
index ef08179c..f9859528 100644
--- a/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogFactory.java
+++ b/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogFactory.java
@@ -1,11 +1,12 @@
 package org.apache.maven.cvslib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java b/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java
index a6b96e51..ee8cc395 100644
--- a/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java
+++ b/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogGenerator.java
@@ -1,11 +1,12 @@
 package org.apache.maven.cvslib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogParser.java b/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogParser.java
index 9b218de5..2474cc2f 100644
--- a/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogParser.java
+++ b/changelog/src/main/org/apache/maven/cvslib/CvsChangeLogParser.java
@@ -1,11 +1,12 @@
 package org.apache.maven.cvslib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/cvslib/CvsConnection.java b/changelog/src/main/org/apache/maven/cvslib/CvsConnection.java
index 93bd0e49..257e353c 100644
--- a/changelog/src/main/org/apache/maven/cvslib/CvsConnection.java
+++ b/changelog/src/main/org/apache/maven/cvslib/CvsConnection.java
@@ -1,11 +1,12 @@
 package org.apache.maven.cvslib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/cvslib/CvsLogListener.java b/changelog/src/main/org/apache/maven/cvslib/CvsLogListener.java
index 61279bf2..3205e364 100644
--- a/changelog/src/main/org/apache/maven/cvslib/CvsLogListener.java
+++ b/changelog/src/main/org/apache/maven/cvslib/CvsLogListener.java
@@ -1,11 +1,12 @@
 package org.apache.maven.cvslib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/mkslib/MksChangeLogFactory.java b/changelog/src/main/org/apache/maven/mkslib/MksChangeLogFactory.java
index 1fc0175b..8be92698 100644
--- a/changelog/src/main/org/apache/maven/mkslib/MksChangeLogFactory.java
+++ b/changelog/src/main/org/apache/maven/mkslib/MksChangeLogFactory.java
@@ -1,11 +1,12 @@
 package org.apache.maven.mkslib;
 
 /* ====================================================================
- *   Copyright 2006 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/mkslib/MksChangeLogGenerator.java b/changelog/src/main/org/apache/maven/mkslib/MksChangeLogGenerator.java
index cb1890c9..3ca87826 100644
--- a/changelog/src/main/org/apache/maven/mkslib/MksChangeLogGenerator.java
+++ b/changelog/src/main/org/apache/maven/mkslib/MksChangeLogGenerator.java
@@ -1,11 +1,12 @@
 package org.apache.maven.mkslib;
 
 /* ====================================================================
- *   Copyright 2006 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/mkslib/MksChangeLogParser.java b/changelog/src/main/org/apache/maven/mkslib/MksChangeLogParser.java
index 7f6de076..8dd6b4ed 100644
--- a/changelog/src/main/org/apache/maven/mkslib/MksChangeLogParser.java
+++ b/changelog/src/main/org/apache/maven/mkslib/MksChangeLogParser.java
@@ -1,11 +1,12 @@
 package org.apache.maven.mkslib;
 
 /* ====================================================================
- *   Copyright 2006 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/perforcelib/PerforceChangeLogFactory.java b/changelog/src/main/org/apache/maven/perforcelib/PerforceChangeLogFactory.java
index 0b7c7d9a..69de1889 100644
--- a/changelog/src/main/org/apache/maven/perforcelib/PerforceChangeLogFactory.java
+++ b/changelog/src/main/org/apache/maven/perforcelib/PerforceChangeLogFactory.java
@@ -1,11 +1,12 @@
 package org.apache.maven.perforcelib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/perforcelib/PerforceChangeLogGenerator.java b/changelog/src/main/org/apache/maven/perforcelib/PerforceChangeLogGenerator.java
index 507c1707..a6dbd2c5 100644
--- a/changelog/src/main/org/apache/maven/perforcelib/PerforceChangeLogGenerator.java
+++ b/changelog/src/main/org/apache/maven/perforcelib/PerforceChangeLogGenerator.java
@@ -1,11 +1,12 @@
 package org.apache.maven.perforcelib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/perforcelib/PerforceChangeLogParser.java b/changelog/src/main/org/apache/maven/perforcelib/PerforceChangeLogParser.java
index 97451b0a..ee6a719d 100644
--- a/changelog/src/main/org/apache/maven/perforcelib/PerforceChangeLogParser.java
+++ b/changelog/src/main/org/apache/maven/perforcelib/PerforceChangeLogParser.java
@@ -1,11 +1,12 @@
 package org.apache.maven.perforcelib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogFactory.java b/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogFactory.java
index f24da078..76ad6c5f 100644
--- a/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogFactory.java
+++ b/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogFactory.java
@@ -1,11 +1,12 @@
 package org.apache.maven.starteamlib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogGenerator.java b/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogGenerator.java
index a8a6d9b7..359ad3a5 100644
--- a/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogGenerator.java
+++ b/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogGenerator.java
@@ -1,11 +1,12 @@
 package org.apache.maven.starteamlib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogParser.java b/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogParser.java
index 8d350b2a..25b7c3b4 100644
--- a/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogParser.java
+++ b/changelog/src/main/org/apache/maven/starteamlib/StarteamChangeLogParser.java
@@ -1,11 +1,12 @@
 package org.apache.maven.starteamlib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogFactory.java b/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogFactory.java
index 2ab2d5e7..4ee95519 100644
--- a/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogFactory.java
+++ b/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogFactory.java
@@ -1,11 +1,12 @@
 package org.apache.maven.svnlib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogGenerator.java b/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogGenerator.java
index 85755268..916fde57 100644
--- a/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogGenerator.java
+++ b/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogGenerator.java
@@ -1,11 +1,12 @@
 package org.apache.maven.svnlib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java b/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java
index 10c772e6..ecdf90aa 100644
--- a/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java
+++ b/changelog/src/main/org/apache/maven/svnlib/SvnChangeLogParser.java
@@ -1,11 +1,12 @@
 package org.apache.maven.svnlib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/util/AsyncStreamReader.java b/changelog/src/main/org/apache/maven/util/AsyncStreamReader.java
index caf85859..7241495d 100644
--- a/changelog/src/main/org/apache/maven/util/AsyncStreamReader.java
+++ b/changelog/src/main/org/apache/maven/util/AsyncStreamReader.java
@@ -1,11 +1,12 @@
 package org.apache.maven.util;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/main/org/apache/maven/util/RepositoryUtils.java b/changelog/src/main/org/apache/maven/util/RepositoryUtils.java
index e034a120..aa4f3941 100755
--- a/changelog/src/main/org/apache/maven/util/RepositoryUtils.java
+++ b/changelog/src/main/org/apache/maven/util/RepositoryUtils.java
@@ -1,11 +1,12 @@
 package org.apache.maven.util;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/plugin-resources/changelog.jsl b/changelog/src/plugin-resources/changelog.jsl
index e171b016..88bfeff6 100644
--- a/changelog/src/plugin-resources/changelog.jsl
+++ b/changelog/src/plugin-resources/changelog.jsl
@@ -3,11 +3,12 @@
 <!--
  * ========================================================================
  * 
- * Copyright 2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/changelog/src/test/org/apache/maven/changelog/ChangeLogEntryTest.java b/changelog/src/test/org/apache/maven/changelog/ChangeLogEntryTest.java
index a6475b77..2400dfce 100644
--- a/changelog/src/test/org/apache/maven/changelog/ChangeLogEntryTest.java
+++ b/changelog/src/test/org/apache/maven/changelog/ChangeLogEntryTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.changelog;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/test/org/apache/maven/changelog/ChangeLogFileTest.java b/changelog/src/test/org/apache/maven/changelog/ChangeLogFileTest.java
index 3313e135..933c8c0e 100644
--- a/changelog/src/test/org/apache/maven/changelog/ChangeLogFileTest.java
+++ b/changelog/src/test/org/apache/maven/changelog/ChangeLogFileTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.changelog;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/test/org/apache/maven/clearcaselib/ClearcaseChangeLogParserTest.java b/changelog/src/test/org/apache/maven/clearcaselib/ClearcaseChangeLogParserTest.java
index 2088002e..5da8cd31 100644
--- a/changelog/src/test/org/apache/maven/clearcaselib/ClearcaseChangeLogParserTest.java
+++ b/changelog/src/test/org/apache/maven/clearcaselib/ClearcaseChangeLogParserTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.clearcaselib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogFactoryTest.java b/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogFactoryTest.java
index b0d046ca..93f5275a 100644
--- a/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogFactoryTest.java
+++ b/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogFactoryTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.cvslib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java b/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java
index cba73026..c5528831 100644
--- a/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java
+++ b/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogGeneratorTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.cvslib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogParserTest.java b/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogParserTest.java
index e9a60ec3..aab02e98 100644
--- a/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogParserTest.java
+++ b/changelog/src/test/org/apache/maven/cvslib/CvsChangeLogParserTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.cvslib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/test/org/apache/maven/cvslib/CvsConnectionTest.java b/changelog/src/test/org/apache/maven/cvslib/CvsConnectionTest.java
index fc7725e9..18032a51 100644
--- a/changelog/src/test/org/apache/maven/cvslib/CvsConnectionTest.java
+++ b/changelog/src/test/org/apache/maven/cvslib/CvsConnectionTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.cvslib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/test/org/apache/maven/cvslib/CvsLogListenerTest.java b/changelog/src/test/org/apache/maven/cvslib/CvsLogListenerTest.java
index 58d47e49..6e4d1d65 100644
--- a/changelog/src/test/org/apache/maven/cvslib/CvsLogListenerTest.java
+++ b/changelog/src/test/org/apache/maven/cvslib/CvsLogListenerTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.cvslib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/test/org/apache/maven/mkslib/MksChangeLogParserTest.java b/changelog/src/test/org/apache/maven/mkslib/MksChangeLogParserTest.java
index 61e6d0a1..673b3d70 100644
--- a/changelog/src/test/org/apache/maven/mkslib/MksChangeLogParserTest.java
+++ b/changelog/src/test/org/apache/maven/mkslib/MksChangeLogParserTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.mkslib;
 
 /* ====================================================================
- *   Copyright 2006 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/test/org/apache/maven/perforcelib/PerforceChangeLogGeneratorTest.java b/changelog/src/test/org/apache/maven/perforcelib/PerforceChangeLogGeneratorTest.java
index b41f3e65..4b47c811 100644
--- a/changelog/src/test/org/apache/maven/perforcelib/PerforceChangeLogGeneratorTest.java
+++ b/changelog/src/test/org/apache/maven/perforcelib/PerforceChangeLogGeneratorTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.perforcelib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/test/org/apache/maven/perforcelib/PerforceChangeLogParserTest.java b/changelog/src/test/org/apache/maven/perforcelib/PerforceChangeLogParserTest.java
index 653adf86..2422eba8 100644
--- a/changelog/src/test/org/apache/maven/perforcelib/PerforceChangeLogParserTest.java
+++ b/changelog/src/test/org/apache/maven/perforcelib/PerforceChangeLogParserTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.perforcelib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/test/org/apache/maven/starteamlib/StarteamChangeLogFactoryTest.java b/changelog/src/test/org/apache/maven/starteamlib/StarteamChangeLogFactoryTest.java
index b21b8748..d2c20df6 100644
--- a/changelog/src/test/org/apache/maven/starteamlib/StarteamChangeLogFactoryTest.java
+++ b/changelog/src/test/org/apache/maven/starteamlib/StarteamChangeLogFactoryTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.starteamlib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/test/org/apache/maven/starteamlib/StarteamChangeLogParser2Test.java b/changelog/src/test/org/apache/maven/starteamlib/StarteamChangeLogParser2Test.java
index 23995a75..2b44e719 100644
--- a/changelog/src/test/org/apache/maven/starteamlib/StarteamChangeLogParser2Test.java
+++ b/changelog/src/test/org/apache/maven/starteamlib/StarteamChangeLogParser2Test.java
@@ -1,11 +1,12 @@
 package org.apache.maven.starteamlib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/test/org/apache/maven/starteamlib/StarteamChangeLogParserTest.java b/changelog/src/test/org/apache/maven/starteamlib/StarteamChangeLogParserTest.java
index 0f6e37e0..0c3948f4 100644
--- a/changelog/src/test/org/apache/maven/starteamlib/StarteamChangeLogParserTest.java
+++ b/changelog/src/test/org/apache/maven/starteamlib/StarteamChangeLogParserTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.starteamlib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java b/changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java
index 581260cf..acc863fe 100644
--- a/changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java
+++ b/changelog/src/test/org/apache/maven/svnlib/SvnChangeLogParserTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.svnlib;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/src/test/org/apache/maven/util/RepositoryTest.java b/changelog/src/test/org/apache/maven/util/RepositoryTest.java
index 1033680f..37739835 100644
--- a/changelog/src/test/org/apache/maven/util/RepositoryTest.java
+++ b/changelog/src/test/org/apache/maven/util/RepositoryTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.util;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/changelog/xdocs/changes.xml b/changelog/xdocs/changes.xml
index 4a581d99..372be2ca 100644
--- a/changelog/xdocs/changes.xml
+++ b/changelog/xdocs/changes.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/changelog/xdocs/goals.xml b/changelog/xdocs/goals.xml
index 63d35c22..1d6f11cd 100644
--- a/changelog/xdocs/goals.xml
+++ b/changelog/xdocs/goals.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/changelog/xdocs/index.xml b/changelog/xdocs/index.xml
index 1f397c47..b5588c10 100644
--- a/changelog/xdocs/index.xml
+++ b/changelog/xdocs/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/changelog/xdocs/navigation.xml b/changelog/xdocs/navigation.xml
index 254d071a..0b1a072b 100644
--- a/changelog/xdocs/navigation.xml
+++ b/changelog/xdocs/navigation.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/changelog/xdocs/properties.xml b/changelog/xdocs/properties.xml
index b51850a2..f01f705f 100644
--- a/changelog/xdocs/properties.xml
+++ b/changelog/xdocs/properties.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/changelog/xdocs/tags.xml b/changelog/xdocs/tags.xml
index e341d91d..712a67d4 100644
--- a/changelog/xdocs/tags.xml
+++ b/changelog/xdocs/tags.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0"?>
+<!-- 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+ -->
 <document>
   <properties>
     <title>Plugin tags</title>
diff --git a/dist/plugin.jelly b/dist/plugin.jelly
index 9e602be9..ba8cd70d 100644
--- a/dist/plugin.jelly
+++ b/dist/plugin.jelly
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/dist/plugin.properties b/dist/plugin.properties
index ae348462..eab55619 100644
--- a/dist/plugin.properties
+++ b/dist/plugin.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/dist/project.properties b/dist/project.properties
index 33f8877d..6d62e178 100644
--- a/dist/project.properties
+++ b/dist/project.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/dist/project.xml b/dist/project.xml
index b62b029e..686fa438 100644
--- a/dist/project.xml
+++ b/dist/project.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/dist/src/main/org/apache/maven/dist/DistributionArtifactTypeHandler.java b/dist/src/main/org/apache/maven/dist/DistributionArtifactTypeHandler.java
index 4c8663fa..a2ade6fa 100644
--- a/dist/src/main/org/apache/maven/dist/DistributionArtifactTypeHandler.java
+++ b/dist/src/main/org/apache/maven/dist/DistributionArtifactTypeHandler.java
@@ -1,11 +1,12 @@
 package org.apache.maven.dist;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/dist/src/plugin-test/maven.xml b/dist/src/plugin-test/maven.xml
index cc22965e..b151c00a 100644
--- a/dist/src/plugin-test/maven.xml
+++ b/dist/src/plugin-test/maven.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/dist/src/plugin-test/project.xml b/dist/src/plugin-test/project.xml
index 85f7b3f8..8fe1c3b5 100644
--- a/dist/src/plugin-test/project.xml
+++ b/dist/src/plugin-test/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/dist/src/test/org/apache/maven/dist/DistributionArtifactTypeHandlerTest.java b/dist/src/test/org/apache/maven/dist/DistributionArtifactTypeHandlerTest.java
index 87c9c026..b8790e86 100644
--- a/dist/src/test/org/apache/maven/dist/DistributionArtifactTypeHandlerTest.java
+++ b/dist/src/test/org/apache/maven/dist/DistributionArtifactTypeHandlerTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.dist;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/dist/xdocs/changes.xml b/dist/xdocs/changes.xml
index e3fdcef3..9bbe43ca 100644
--- a/dist/xdocs/changes.xml
+++ b/dist/xdocs/changes.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/dist/xdocs/goals.xml b/dist/xdocs/goals.xml
index f4f66a92..a3d09451 100644
--- a/dist/xdocs/goals.xml
+++ b/dist/xdocs/goals.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/dist/xdocs/index.xml b/dist/xdocs/index.xml
index ae2af934..5b3ac0c0 100644
--- a/dist/xdocs/index.xml
+++ b/dist/xdocs/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/dist/xdocs/navigation.xml b/dist/xdocs/navigation.xml
index 39b146dd..62028284 100644
--- a/dist/xdocs/navigation.xml
+++ b/dist/xdocs/navigation.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/dist/xdocs/properties.xml b/dist/xdocs/properties.xml
index 28233be5..f05c5890 100644
--- a/dist/xdocs/properties.xml
+++ b/dist/xdocs/properties.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/plugin.jelly b/linkcheck/plugin.jelly
index c11dc2fb..b43cd378 100644
--- a/linkcheck/plugin.jelly
+++ b/linkcheck/plugin.jelly
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/plugin.properties b/linkcheck/plugin.properties
index 69e926d6..f97950e2 100644
--- a/linkcheck/plugin.properties
+++ b/linkcheck/plugin.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/linkcheck/project.properties b/linkcheck/project.properties
index 1a852fb4..bdb49aa8 100644
--- a/linkcheck/project.properties
+++ b/linkcheck/project.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/linkcheck/project.xml b/linkcheck/project.xml
index 483cd068..1a812e2e 100644
--- a/linkcheck/project.xml
+++ b/linkcheck/project.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/FileToCheck.java b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/FileToCheck.java
index 47bbeea5..b8178b57 100644
--- a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/FileToCheck.java
+++ b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/FileToCheck.java
@@ -1,11 +1,12 @@
 package org.apache.maven.plugin.linkcheck;
 
 /* ====================================================================
- *   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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/LinkCheck.java b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/LinkCheck.java
index 9044f025..a5691628 100644
--- a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/LinkCheck.java
+++ b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/LinkCheck.java
@@ -1,11 +1,12 @@
 package org.apache.maven.plugin.linkcheck;
 
 /* ====================================================================
- *   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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/LinkCheckResult.java b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/LinkCheckResult.java
index 49b25cec..5c4a1244 100644
--- a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/LinkCheckResult.java
+++ b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/LinkCheckResult.java
@@ -1,11 +1,12 @@
 package org.apache.maven.plugin.linkcheck;
 
 /* ====================================================================
- *   Copyright 2001-2006 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/LinkMatcher.java b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/LinkMatcher.java
index fb83bf3e..8d3b3118 100644
--- a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/LinkMatcher.java
+++ b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/LinkMatcher.java
@@ -1,11 +1,12 @@
 package org.apache.maven.plugin.linkcheck;
 
 /* ====================================================================
- *   Copyright 2001-2006 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/FileLinkValidator.java b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/FileLinkValidator.java
index 3ab73618..1a15cbe9 100644
--- a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/FileLinkValidator.java
+++ b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/FileLinkValidator.java
@@ -1,11 +1,12 @@
 package org.apache.maven.plugin.linkcheck.validation;
 
 /* ====================================================================
- *   Copyright 2001-2006 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/HTTPLinkValidator.java b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/HTTPLinkValidator.java
index edf275c4..8613adad 100644
--- a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/HTTPLinkValidator.java
+++ b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/HTTPLinkValidator.java
@@ -1,11 +1,12 @@
 package org.apache.maven.plugin.linkcheck.validation;
 
 /* ====================================================================
- *   Copyright 2001-2006 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/LinkValidationItem.java b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/LinkValidationItem.java
index 39a9798a..e3f3bcf1 100644
--- a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/LinkValidationItem.java
+++ b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/LinkValidationItem.java
@@ -1,11 +1,12 @@
 package org.apache.maven.plugin.linkcheck.validation;
 
 /* ====================================================================
- *   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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/LinkValidationResult.java b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/LinkValidationResult.java
index 5ea876d6..7f3b6856 100644
--- a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/LinkValidationResult.java
+++ b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/LinkValidationResult.java
@@ -3,11 +3,12 @@ package org.apache.maven.plugin.linkcheck.validation;
 import java.io.Serializable;
 
 /* ====================================================================
- *   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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/LinkValidator.java b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/LinkValidator.java
index fde44528..5ff62ede 100644
--- a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/LinkValidator.java
+++ b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/LinkValidator.java
@@ -1,11 +1,12 @@
 package org.apache.maven.plugin.linkcheck.validation;
 
 /* ====================================================================
- *   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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/LinkValidatorManager.java b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/LinkValidatorManager.java
index 6176cda4..23e8b1c2 100644
--- a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/LinkValidatorManager.java
+++ b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/LinkValidatorManager.java
@@ -1,11 +1,12 @@
 package org.apache.maven.plugin.linkcheck.validation;
 
 /* ====================================================================
- *   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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/MailtoLinkValidator.java b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/MailtoLinkValidator.java
index ead6d459..3a61c72f 100644
--- a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/MailtoLinkValidator.java
+++ b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/MailtoLinkValidator.java
@@ -1,11 +1,12 @@
 package org.apache.maven.plugin.linkcheck.validation;
 
 /* ====================================================================
- *   Copyright 2001-2006 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/OfflineHTTPLinkValidator.java b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/OfflineHTTPLinkValidator.java
index 7aef4953..8b008374 100644
--- a/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/OfflineHTTPLinkValidator.java
+++ b/linkcheck/src/main/org/apache/maven/plugin/linkcheck/validation/OfflineHTTPLinkValidator.java
@@ -1,11 +1,12 @@
 package org.apache.maven.plugin.linkcheck.validation;
 
 /* ====================================================================
- *   Copyright 2001-2006 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/linkcheck/src/plugin-resources/linkcheck-temp.xml b/linkcheck/src/plugin-resources/linkcheck-temp.xml
index 2aaca8f6..82c3402e 100644
--- a/linkcheck/src/plugin-resources/linkcheck-temp.xml
+++ b/linkcheck/src/plugin-resources/linkcheck-temp.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2006 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/plugin-resources/linkcheck.jsl b/linkcheck/src/plugin-resources/linkcheck.jsl
index 7f2c9da3..bbba4674 100644
--- a/linkcheck/src/plugin-resources/linkcheck.jsl
+++ b/linkcheck/src/plugin-resources/linkcheck.jsl
@@ -2,11 +2,12 @@
 <!--
  * ========================================================================
  * 
- * Copyright 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/plugin-test/defaultTest/maven.xml b/linkcheck/src/plugin-test/defaultTest/maven.xml
index 8ee27906..fc64335c 100644
--- a/linkcheck/src/plugin-test/defaultTest/maven.xml
+++ b/linkcheck/src/plugin-test/defaultTest/maven.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/plugin-test/defaultTest/project.properties b/linkcheck/src/plugin-test/defaultTest/project.properties
index 5c601033..abe941cd 100644
--- a/linkcheck/src/plugin-test/defaultTest/project.properties
+++ b/linkcheck/src/plugin-test/defaultTest/project.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2004 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/linkcheck/src/plugin-test/defaultTest/project.xml b/linkcheck/src/plugin-test/defaultTest/project.xml
index 6e76392f..a421db35 100644
--- a/linkcheck/src/plugin-test/defaultTest/project.xml
+++ b/linkcheck/src/plugin-test/defaultTest/project.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * Copyright 2001-2006 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/plugin-test/defaultTest/xdocs/&test.html b/linkcheck/src/plugin-test/defaultTest/xdocs/&test.html
index c15af79b..6bf3c379 100644
--- a/linkcheck/src/plugin-test/defaultTest/xdocs/&test.html
+++ b/linkcheck/src/plugin-test/defaultTest/xdocs/&test.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/plugin-test/defaultTest/xdocs/nolink.html b/linkcheck/src/plugin-test/defaultTest/xdocs/nolink.html
index 29c81d40..a73c2dfe 100644
--- a/linkcheck/src/plugin-test/defaultTest/xdocs/nolink.html
+++ b/linkcheck/src/plugin-test/defaultTest/xdocs/nolink.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/plugin-test/defaultTest/xdocs/test-resources/nolink.html b/linkcheck/src/plugin-test/defaultTest/xdocs/test-resources/nolink.html
index 29c81d40..a73c2dfe 100644
--- a/linkcheck/src/plugin-test/defaultTest/xdocs/test-resources/nolink.html
+++ b/linkcheck/src/plugin-test/defaultTest/xdocs/test-resources/nolink.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/plugin-test/defaultTest/xdocs/test-resources/test1/test1.html b/linkcheck/src/plugin-test/defaultTest/xdocs/test-resources/test1/test1.html
index b647623a..5e522708 100644
--- a/linkcheck/src/plugin-test/defaultTest/xdocs/test-resources/test1/test1.html
+++ b/linkcheck/src/plugin-test/defaultTest/xdocs/test-resources/test1/test1.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/plugin-test/defaultTest/xdocs/test-resources/test1/test2.html b/linkcheck/src/plugin-test/defaultTest/xdocs/test-resources/test1/test2.html
index 4aaa4814..f82db61f 100644
--- a/linkcheck/src/plugin-test/defaultTest/xdocs/test-resources/test1/test2.html
+++ b/linkcheck/src/plugin-test/defaultTest/xdocs/test-resources/test1/test2.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/plugin-test/defaultTest/xdocs/test.html b/linkcheck/src/plugin-test/defaultTest/xdocs/test.html
index f76152b2..14583414 100644
--- a/linkcheck/src/plugin-test/defaultTest/xdocs/test.html
+++ b/linkcheck/src/plugin-test/defaultTest/xdocs/test.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
@@ -12,8 +13,7 @@
  * 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.
- */
+ * limi
  -->
 <html>
 	<head>
diff --git a/linkcheck/src/plugin-test/defaultTest/xdocs/test1/test1.html b/linkcheck/src/plugin-test/defaultTest/xdocs/test1/test1.html
index 10ef3fda..af7fe8d1 100644
--- a/linkcheck/src/plugin-test/defaultTest/xdocs/test1/test1.html
+++ b/linkcheck/src/plugin-test/defaultTest/xdocs/test1/test1.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/plugin-test/defaultTest/xdocs/testExcludes.html b/linkcheck/src/plugin-test/defaultTest/xdocs/testExcludes.html
index b65ec6cc..0110d17e 100644
--- a/linkcheck/src/plugin-test/defaultTest/xdocs/testExcludes.html
+++ b/linkcheck/src/plugin-test/defaultTest/xdocs/testExcludes.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/plugin-test/maven.xml b/linkcheck/src/plugin-test/maven.xml
index eae49a53..6b736835 100644
--- a/linkcheck/src/plugin-test/maven.xml
+++ b/linkcheck/src/plugin-test/maven.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2006 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/plugin-test/project.xml b/linkcheck/src/plugin-test/project.xml
index 852ff113..3a1b73c6 100644
--- a/linkcheck/src/plugin-test/project.xml
+++ b/linkcheck/src/plugin-test/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/plugin-test/testEmptyReportWithMaven1.0/maven.xml b/linkcheck/src/plugin-test/testEmptyReportWithMaven1.0/maven.xml
index 057141aa..d9555e60 100644
--- a/linkcheck/src/plugin-test/testEmptyReportWithMaven1.0/maven.xml
+++ b/linkcheck/src/plugin-test/testEmptyReportWithMaven1.0/maven.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/test-resources/index-all.html b/linkcheck/src/test-resources/index-all.html
index d9a805e7..2d2958d7 100644
--- a/linkcheck/src/test-resources/index-all.html
+++ b/linkcheck/src/test-resources/index-all.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/test-resources/nolink.html b/linkcheck/src/test-resources/nolink.html
index 29c81d40..a73c2dfe 100644
--- a/linkcheck/src/test-resources/nolink.html
+++ b/linkcheck/src/test-resources/nolink.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/test-resources/test-resources/nolink.html b/linkcheck/src/test-resources/test-resources/nolink.html
index 29c81d40..a73c2dfe 100644
--- a/linkcheck/src/test-resources/test-resources/nolink.html
+++ b/linkcheck/src/test-resources/test-resources/nolink.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/test-resources/test-resources/test1/test1.html b/linkcheck/src/test-resources/test-resources/test1/test1.html
index 4d442f41..9374ad87 100644
--- a/linkcheck/src/test-resources/test-resources/test1/test1.html
+++ b/linkcheck/src/test-resources/test-resources/test1/test1.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/test-resources/test-resources/test1/test2.html b/linkcheck/src/test-resources/test-resources/test1/test2.html
index 4aaa4814..f82db61f 100644
--- a/linkcheck/src/test-resources/test-resources/test1/test2.html
+++ b/linkcheck/src/test-resources/test-resources/test1/test2.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/test-resources/test1/test1.html b/linkcheck/src/test-resources/test1/test1.html
index 10ef3fda..af7fe8d1 100644
--- a/linkcheck/src/test-resources/test1/test1.html
+++ b/linkcheck/src/test-resources/test1/test1.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/test-resources/testA.html b/linkcheck/src/test-resources/testA.html
index 870d3605..ae3d92f6 100644
--- a/linkcheck/src/test-resources/testA.html
+++ b/linkcheck/src/test-resources/testA.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/test-resources/testExcludes.html b/linkcheck/src/test-resources/testExcludes.html
index b65ec6cc..0110d17e 100644
--- a/linkcheck/src/test-resources/testExcludes.html
+++ b/linkcheck/src/test-resources/testExcludes.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/src/test/org/apache/maven/plugin/linkcheck/LinkCheckTest.java b/linkcheck/src/test/org/apache/maven/plugin/linkcheck/LinkCheckTest.java
index f028d1fd..cd4c8ba7 100644
--- a/linkcheck/src/test/org/apache/maven/plugin/linkcheck/LinkCheckTest.java
+++ b/linkcheck/src/test/org/apache/maven/plugin/linkcheck/LinkCheckTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.plugin.linkcheck;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/linkcheck/src/test/org/apache/maven/plugin/linkcheck/validation/HTTPLinkValidatorTest.java b/linkcheck/src/test/org/apache/maven/plugin/linkcheck/validation/HTTPLinkValidatorTest.java
index 963c312c..5579cca8 100644
--- a/linkcheck/src/test/org/apache/maven/plugin/linkcheck/validation/HTTPLinkValidatorTest.java
+++ b/linkcheck/src/test/org/apache/maven/plugin/linkcheck/validation/HTTPLinkValidatorTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.plugin.linkcheck.validation;
 
 /* ====================================================================
- *   Copyright 2001-2006 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/linkcheck/xdocs/changes.xml b/linkcheck/xdocs/changes.xml
index 6e160dcc..ce63f9ec 100644
--- a/linkcheck/xdocs/changes.xml
+++ b/linkcheck/xdocs/changes.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/xdocs/goals.xml b/linkcheck/xdocs/goals.xml
index 9e943ab0..e91f6441 100644
--- a/linkcheck/xdocs/goals.xml
+++ b/linkcheck/xdocs/goals.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/xdocs/index.xml b/linkcheck/xdocs/index.xml
index ce8b728c..3a0a28a8 100644
--- a/linkcheck/xdocs/index.xml
+++ b/linkcheck/xdocs/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/xdocs/navigation.xml b/linkcheck/xdocs/navigation.xml
index 0cd88a07..fad08f6b 100644
--- a/linkcheck/xdocs/navigation.xml
+++ b/linkcheck/xdocs/navigation.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/linkcheck/xdocs/properties.xml b/linkcheck/xdocs/properties.xml
index 3569307e..07925c1e 100644
--- a/linkcheck/xdocs/properties.xml
+++ b/linkcheck/xdocs/properties.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/multiproject/plugin.jelly b/multiproject/plugin.jelly
index 45386859..f3e14d17 100644
--- a/multiproject/plugin.jelly
+++ b/multiproject/plugin.jelly
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/multiproject/plugin.properties b/multiproject/plugin.properties
index bf9d794a..899c0076 100644
--- a/multiproject/plugin.properties
+++ b/multiproject/plugin.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/multiproject/project.properties b/multiproject/project.properties
index 33f8877d..6d62e178 100644
--- a/multiproject/project.properties
+++ b/multiproject/project.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/multiproject/project.xml b/multiproject/project.xml
index 09b0754c..8a7fcb17 100644
--- a/multiproject/project.xml
+++ b/multiproject/project.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/multiproject/src/main/org/apache/maven/multiproject/harmonizer/DependencyHarmonizer.java b/multiproject/src/main/org/apache/maven/multiproject/harmonizer/DependencyHarmonizer.java
index 7a78077d..14b5b846 100644
--- a/multiproject/src/main/org/apache/maven/multiproject/harmonizer/DependencyHarmonizer.java
+++ b/multiproject/src/main/org/apache/maven/multiproject/harmonizer/DependencyHarmonizer.java
@@ -1,11 +1,12 @@
 package org.apache.maven.multiproject.harmonizer;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/multiproject/src/main/org/apache/maven/multiproject/harmonizer/MultiDependency.java b/multiproject/src/main/org/apache/maven/multiproject/harmonizer/MultiDependency.java
index fff3b0d8..ada14e4a 100644
--- a/multiproject/src/main/org/apache/maven/multiproject/harmonizer/MultiDependency.java
+++ b/multiproject/src/main/org/apache/maven/multiproject/harmonizer/MultiDependency.java
@@ -1,11 +1,12 @@
 package org.apache.maven.multiproject.harmonizer;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/multiproject/src/plugin-resources/templates/dependency-convergence-report.xml b/multiproject/src/plugin-resources/templates/dependency-convergence-report.xml
index 98a3fc1b..f663b34d 100644
--- a/multiproject/src/plugin-resources/templates/dependency-convergence-report.xml
+++ b/multiproject/src/plugin-resources/templates/dependency-convergence-report.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="$encoding"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/multiproject/src/plugin-resources/templates/navigation-aggregate.xml b/multiproject/src/plugin-resources/templates/navigation-aggregate.xml
index bf1337c2..271cff4f 100644
--- a/multiproject/src/plugin-resources/templates/navigation-aggregate.xml
+++ b/multiproject/src/plugin-resources/templates/navigation-aggregate.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="$encoding"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/multiproject/src/plugin-resources/templates/navigation-independent.xml b/multiproject/src/plugin-resources/templates/navigation-independent.xml
index 074e71b5..c99164c5 100644
--- a/multiproject/src/plugin-resources/templates/navigation-independent.xml
+++ b/multiproject/src/plugin-resources/templates/navigation-independent.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="$encoding"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/multiproject/src/plugin-resources/templates/projects-overview.jelly b/multiproject/src/plugin-resources/templates/projects-overview.jelly
index be31fb3a..fb74f0c4 100644
--- a/multiproject/src/plugin-resources/templates/projects-overview.jelly
+++ b/multiproject/src/plugin-resources/templates/projects-overview.jelly
@@ -3,11 +3,12 @@
 <!--
  * ========================================================================
  * 
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/multiproject/xdocs/changes.xml b/multiproject/xdocs/changes.xml
index 961c7ecb..b131a7b0 100644
--- a/multiproject/xdocs/changes.xml
+++ b/multiproject/xdocs/changes.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/multiproject/xdocs/faq.fml b/multiproject/xdocs/faq.fml
index 4cb16923..8812d8b8 100644
--- a/multiproject/xdocs/faq.fml
+++ b/multiproject/xdocs/faq.fml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/multiproject/xdocs/goals.xml b/multiproject/xdocs/goals.xml
index 68f52376..337112fe 100644
--- a/multiproject/xdocs/goals.xml
+++ b/multiproject/xdocs/goals.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/multiproject/xdocs/index.xml b/multiproject/xdocs/index.xml
index 1d4bb3a9..75e25614 100644
--- a/multiproject/xdocs/index.xml
+++ b/multiproject/xdocs/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/multiproject/xdocs/navigation.xml b/multiproject/xdocs/navigation.xml
index 6e05da2f..f1250e42 100644
--- a/multiproject/xdocs/navigation.xml
+++ b/multiproject/xdocs/navigation.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/multiproject/xdocs/properties.xml b/multiproject/xdocs/properties.xml
index 9603a2e1..a7317083 100644
--- a/multiproject/xdocs/properties.xml
+++ b/multiproject/xdocs/properties.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/multiproject/xdocs/reports.xml b/multiproject/xdocs/reports.xml
index 7d8ce1fd..05756009 100644
--- a/multiproject/xdocs/reports.xml
+++ b/multiproject/xdocs/reports.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index d4e4772a..7146c04f 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2006 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/plugin.properties b/xdoc/plugin.properties
index e44c1288..cc02f4bc 100644
--- a/xdoc/plugin.properties
+++ b/xdoc/plugin.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/xdoc/project.properties b/xdoc/project.properties
index 33f8877d..6d62e178 100644
--- a/xdoc/project.properties
+++ b/xdoc/project.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/xdoc/project.xml b/xdoc/project.xml
index 2a728a8f..cc5e7d32 100644
--- a/xdoc/project.xml
+++ b/xdoc/project.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/dtd/maven-xdoc-1.10.1.dtd b/xdoc/src/dtd/maven-xdoc-1.10.1.dtd
index 8a830f8d..05a97363 100644
--- a/xdoc/src/dtd/maven-xdoc-1.10.1.dtd
+++ b/xdoc/src/dtd/maven-xdoc-1.10.1.dtd
@@ -11,13 +11,14 @@
     PUBLIC "-//Apache Software Foundation//DTD XDOC 1.0//EN"
     SYSTEM "http://www.apache.org/dtds/xdoc_1_0.dtd"
 
-    Copyright 2006 The Apache Software Foundation.
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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,
diff --git a/xdoc/src/dtd/maven-xdoc-1.10.dtd b/xdoc/src/dtd/maven-xdoc-1.10.dtd
index 8a830f8d..05a97363 100644
--- a/xdoc/src/dtd/maven-xdoc-1.10.dtd
+++ b/xdoc/src/dtd/maven-xdoc-1.10.dtd
@@ -11,13 +11,14 @@
     PUBLIC "-//Apache Software Foundation//DTD XDOC 1.0//EN"
     SYSTEM "http://www.apache.org/dtds/xdoc_1_0.dtd"
 
-    Copyright 2006 The Apache Software Foundation.
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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,
diff --git a/xdoc/src/main/org/apache/maven/DependencyDescriberBean.java b/xdoc/src/main/org/apache/maven/DependencyDescriberBean.java
index 3f53f0d8..d177ebbb 100644
--- a/xdoc/src/main/org/apache/maven/DependencyDescriberBean.java
+++ b/xdoc/src/main/org/apache/maven/DependencyDescriberBean.java
@@ -1,11 +1,12 @@
 package org.apache.maven;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/xdoc/src/main/org/apache/maven/DescribedDependency.java b/xdoc/src/main/org/apache/maven/DescribedDependency.java
index 7b919881..3a21a433 100644
--- a/xdoc/src/main/org/apache/maven/DescribedDependency.java
+++ b/xdoc/src/main/org/apache/maven/DescribedDependency.java
@@ -1,11 +1,12 @@
 package org.apache.maven;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/xdoc/src/main/org/apache/maven/NavBean.java b/xdoc/src/main/org/apache/maven/NavBean.java
index ecf0bde7..fc71b63f 100644
--- a/xdoc/src/main/org/apache/maven/NavBean.java
+++ b/xdoc/src/main/org/apache/maven/NavBean.java
@@ -1,11 +1,12 @@
 package org.apache.maven;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/xdoc/src/main/org/apache/maven/package.html b/xdoc/src/main/org/apache/maven/package.html
index 832f4144..5aa1a6e7 100644
--- a/xdoc/src/main/org/apache/maven/package.html
+++ b/xdoc/src/main/org/apache/maven/package.html
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/main/org/apache/maven/xdoc/GrabClassLoaderTag.java b/xdoc/src/main/org/apache/maven/xdoc/GrabClassLoaderTag.java
index ab472bdd..ed51145d 100644
--- a/xdoc/src/main/org/apache/maven/xdoc/GrabClassLoaderTag.java
+++ b/xdoc/src/main/org/apache/maven/xdoc/GrabClassLoaderTag.java
@@ -1,11 +1,12 @@
 package org.apache.maven.xdoc;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/xdoc/src/main/org/apache/maven/xdoc/UnGrabClassLoaderTag.java b/xdoc/src/main/org/apache/maven/xdoc/UnGrabClassLoaderTag.java
index c86ff63a..bebb5140 100644
--- a/xdoc/src/main/org/apache/maven/xdoc/UnGrabClassLoaderTag.java
+++ b/xdoc/src/main/org/apache/maven/xdoc/UnGrabClassLoaderTag.java
@@ -1,11 +1,12 @@
 package org.apache.maven.xdoc;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/xdoc/src/main/org/apache/maven/xdoc/XdocTagLibrary.java b/xdoc/src/main/org/apache/maven/xdoc/XdocTagLibrary.java
index d2999895..6f84291c 100644
--- a/xdoc/src/main/org/apache/maven/xdoc/XdocTagLibrary.java
+++ b/xdoc/src/main/org/apache/maven/xdoc/XdocTagLibrary.java
@@ -1,11 +1,12 @@
 package org.apache.maven.xdoc;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/xdoc/src/main/org/apache/maven/xdoc/util/LocaleUtil.java b/xdoc/src/main/org/apache/maven/xdoc/util/LocaleUtil.java
index 03490760..cdce0636 100644
--- a/xdoc/src/main/org/apache/maven/xdoc/util/LocaleUtil.java
+++ b/xdoc/src/main/org/apache/maven/xdoc/util/LocaleUtil.java
@@ -1,11 +1,12 @@
 package org.apache.maven.xdoc.util;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
@@ -26,7 +27,7 @@ import java.util.StringTokenizer;
  * Utility class to handle the <code>java.util.Locale</code> object.
  * 
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton </a>
- * @version $Id:$
+ * @version $Id$
  */
 public final class LocaleUtil extends Object {
 
diff --git a/xdoc/src/main/org/apache/maven/xdoc/util/ScmUtil.java b/xdoc/src/main/org/apache/maven/xdoc/util/ScmUtil.java
index 93b46353..e1dfc4be 100644
--- a/xdoc/src/main/org/apache/maven/xdoc/util/ScmUtil.java
+++ b/xdoc/src/main/org/apache/maven/xdoc/util/ScmUtil.java
@@ -1,11 +1,12 @@
 package org.apache.maven.xdoc.util;
 
 /* ====================================================================
- *   Copyright 2001-2006 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/xdoc/src/plugin-resources/dtd/maven-xdoc.dtd b/xdoc/src/plugin-resources/dtd/maven-xdoc.dtd
index 8a830f8d..05a97363 100644
--- a/xdoc/src/plugin-resources/dtd/maven-xdoc.dtd
+++ b/xdoc/src/plugin-resources/dtd/maven-xdoc.dtd
@@ -11,13 +11,14 @@
     PUBLIC "-//Apache Software Foundation//DTD XDOC 1.0//EN"
     SYSTEM "http://www.apache.org/dtds/xdoc_1_0.dtd"
 
-    Copyright 2006 The Apache Software Foundation.
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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,
diff --git a/xdoc/src/plugin-resources/navigation.jelly b/xdoc/src/plugin-resources/navigation.jelly
index ba818e90..01547d5a 100644
--- a/xdoc/src/plugin-resources/navigation.jelly
+++ b/xdoc/src/plugin-resources/navigation.jelly
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-resources/site.jsl b/xdoc/src/plugin-resources/site.jsl
index e7f96104..3c23a790 100644
--- a/xdoc/src/plugin-resources/site.jsl
+++ b/xdoc/src/plugin-resources/site.jsl
@@ -3,11 +3,12 @@
 <!--
  * ========================================================================
  * 
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-resources/sitemap.jsl b/xdoc/src/plugin-resources/sitemap.jsl
index 91ddaaac..9e1796d8 100644
--- a/xdoc/src/plugin-resources/sitemap.jsl
+++ b/xdoc/src/plugin-resources/sitemap.jsl
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
 /*
- * Copyright 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  *
diff --git a/xdoc/src/plugin-resources/templates/dependencies.xml b/xdoc/src/plugin-resources/templates/dependencies.xml
index 650fed57..c65f76ca 100644
--- a/xdoc/src/plugin-resources/templates/dependencies.xml
+++ b/xdoc/src/plugin-resources/templates/dependencies.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="$encoding" ?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-resources/templates/development-process.jelly b/xdoc/src/plugin-resources/templates/development-process.jelly
index cb0c9ff6..671edec4 100644
--- a/xdoc/src/plugin-resources/templates/development-process.jelly
+++ b/xdoc/src/plugin-resources/templates/development-process.jelly
@@ -3,11 +3,12 @@
 <!--
  * ========================================================================
  * 
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-resources/templates/downloads.jelly b/xdoc/src/plugin-resources/templates/downloads.jelly
index a4bf0b2f..85aed7cf 100644
--- a/xdoc/src/plugin-resources/templates/downloads.jelly
+++ b/xdoc/src/plugin-resources/templates/downloads.jelly
@@ -3,11 +3,12 @@
 <!--
  * ========================================================================
  * 
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-resources/templates/index.xml b/xdoc/src/plugin-resources/templates/index.xml
index 438fc8ad..7480fbb2 100644
--- a/xdoc/src/plugin-resources/templates/index.xml
+++ b/xdoc/src/plugin-resources/templates/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="$encoding" ?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-resources/templates/issue-tracking.xml b/xdoc/src/plugin-resources/templates/issue-tracking.xml
index 90e8047d..74a36d01 100644
--- a/xdoc/src/plugin-resources/templates/issue-tracking.xml
+++ b/xdoc/src/plugin-resources/templates/issue-tracking.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="$encoding" ?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-resources/templates/mail-lists.xml b/xdoc/src/plugin-resources/templates/mail-lists.xml
index fe863180..7d7bfc6b 100644
--- a/xdoc/src/plugin-resources/templates/mail-lists.xml
+++ b/xdoc/src/plugin-resources/templates/mail-lists.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="$encoding" ?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-resources/templates/maven-reports.xml b/xdoc/src/plugin-resources/templates/maven-reports.xml
index 62bc8064..9a34bcd3 100644
--- a/xdoc/src/plugin-resources/templates/maven-reports.xml
+++ b/xdoc/src/plugin-resources/templates/maven-reports.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="$encoding" ?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-resources/templates/project-info.xml b/xdoc/src/plugin-resources/templates/project-info.xml
index 6dea8171..6d6edc49 100644
--- a/xdoc/src/plugin-resources/templates/project-info.xml
+++ b/xdoc/src/plugin-resources/templates/project-info.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="$encoding" ?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-resources/templates/scm-usage.xml b/xdoc/src/plugin-resources/templates/scm-usage.xml
index 0dac73de..f5d28e89 100644
--- a/xdoc/src/plugin-resources/templates/scm-usage.xml
+++ b/xdoc/src/plugin-resources/templates/scm-usage.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="$encoding" ?>
 <!--
 /*
- * Copyright 2001-2006 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-resources/templates/scm/clearcase.xml b/xdoc/src/plugin-resources/templates/scm/clearcase.xml
index 8cc4bfee..2e39bd07 100644
--- a/xdoc/src/plugin-resources/templates/scm/clearcase.xml
+++ b/xdoc/src/plugin-resources/templates/scm/clearcase.xml
@@ -1,3 +1,21 @@
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+ -->
 <section key="template.scm.section2.title"
     bundle="plugin-resources.templates.templates"
     name="Overview">
diff --git a/xdoc/src/plugin-resources/templates/scm/cvs.xml b/xdoc/src/plugin-resources/templates/scm/cvs.xml
index 58affbbe..a2c045c9 100644
--- a/xdoc/src/plugin-resources/templates/scm/cvs.xml
+++ b/xdoc/src/plugin-resources/templates/scm/cvs.xml
@@ -1,3 +1,21 @@
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+ -->
 <section key="template.cvs.section2.title"
     bundle="plugin-resources.templates.templates"
     name="Overview">
diff --git a/xdoc/src/plugin-resources/templates/scm/noscm.xml b/xdoc/src/plugin-resources/templates/scm/noscm.xml
index 7ce5532b..34e9b00f 100644
--- a/xdoc/src/plugin-resources/templates/scm/noscm.xml
+++ b/xdoc/src/plugin-resources/templates/scm/noscm.xml
@@ -1,3 +1,21 @@
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+ -->
 <section key="template.noscm.section1.title"
     bundle="plugin-resources.templates.templates"
     name="SCM connections">
diff --git a/xdoc/src/plugin-resources/templates/scm/perforce.xml b/xdoc/src/plugin-resources/templates/scm/perforce.xml
index 87dcd8b2..6c1f7a3a 100644
--- a/xdoc/src/plugin-resources/templates/scm/perforce.xml
+++ b/xdoc/src/plugin-resources/templates/scm/perforce.xml
@@ -1,3 +1,21 @@
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+ -->
 <section key="templatescm.section2.title"
     bundle="plugin-resources.templates.templates"
     name="Overview">
diff --git a/xdoc/src/plugin-resources/templates/scm/starteam.xml b/xdoc/src/plugin-resources/templates/scm/starteam.xml
index db021069..01ef4557 100644
--- a/xdoc/src/plugin-resources/templates/scm/starteam.xml
+++ b/xdoc/src/plugin-resources/templates/scm/starteam.xml
@@ -1,3 +1,21 @@
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+ -->
 <section key="template.scm.section2.title"
     bundle="plugin-resources.templates.templates"
     name="Overview">
diff --git a/xdoc/src/plugin-resources/templates/scm/svn.xml b/xdoc/src/plugin-resources/templates/scm/svn.xml
index 7cc88ccf..46600447 100644
--- a/xdoc/src/plugin-resources/templates/scm/svn.xml
+++ b/xdoc/src/plugin-resources/templates/scm/svn.xml
@@ -1,3 +1,21 @@
+<!--
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+ -->
 <section key="template.svn.section2.title"
     bundle="plugin-resources.templates.templates"
     name="Overview">
diff --git a/xdoc/src/plugin-resources/templates/team-list.xml b/xdoc/src/plugin-resources/templates/team-list.xml
index bbb10543..e320ecc5 100644
--- a/xdoc/src/plugin-resources/templates/team-list.xml
+++ b/xdoc/src/plugin-resources/templates/team-list.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="$encoding" ?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-resources/templates/templates.properties b/xdoc/src/plugin-resources/templates/templates.properties
index ba1bb092..9c8934f3 100644
--- a/xdoc/src/plugin-resources/templates/templates.properties
+++ b/xdoc/src/plugin-resources/templates/templates.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2006 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/xdoc/src/plugin-resources/templates/templates_de.properties b/xdoc/src/plugin-resources/templates/templates_de.properties
index 2d49e96c..7a891f0e 100644
--- a/xdoc/src/plugin-resources/templates/templates_de.properties
+++ b/xdoc/src/plugin-resources/templates/templates_de.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2006 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/xdoc/src/plugin-resources/templates/templates_fr.properties b/xdoc/src/plugin-resources/templates/templates_fr.properties
index d510725b..39de2b2d 100644
--- a/xdoc/src/plugin-resources/templates/templates_fr.properties
+++ b/xdoc/src/plugin-resources/templates/templates_fr.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2006 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/xdoc/src/plugin-test/maven.xml b/xdoc/src/plugin-test/maven.xml
index a64563dc..f0c8d340 100644
--- a/xdoc/src/plugin-test/maven.xml
+++ b/xdoc/src/plugin-test/maven.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/project.xml b/xdoc/src/plugin-test/project.xml
index 84774026..697743a2 100644
--- a/xdoc/src/plugin-test/project.xml
+++ b/xdoc/src/plugin-test/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test01/common/links.xml b/xdoc/src/plugin-test/test01/common/links.xml
index 06d3571f..dac3ea93 100644
--- a/xdoc/src/plugin-test/test01/common/links.xml
+++ b/xdoc/src/plugin-test/test01/common/links.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test01/maven.xml b/xdoc/src/plugin-test/test01/maven.xml
index 67d660a0..49ba07d7 100644
--- a/xdoc/src/plugin-test/test01/maven.xml
+++ b/xdoc/src/plugin-test/test01/maven.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test01/project.xml b/xdoc/src/plugin-test/test01/project.xml
index a639b07e..1973a921 100644
--- a/xdoc/src/plugin-test/test01/project.xml
+++ b/xdoc/src/plugin-test/test01/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test01/testdocs/testjsltosite.xml b/xdoc/src/plugin-test/test01/testdocs/testjsltosite.xml
index 67b4e860..7572f79b 100644
--- a/xdoc/src/plugin-test/test01/testdocs/testjsltosite.xml
+++ b/xdoc/src/plugin-test/test01/testdocs/testjsltosite.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test01/xdocs-replacement/navigation.xml b/xdoc/src/plugin-test/test01/xdocs-replacement/navigation.xml
index 0ef2a56d..711eda8a 100644
--- a/xdoc/src/plugin-test/test01/xdocs-replacement/navigation.xml
+++ b/xdoc/src/plugin-test/test01/xdocs-replacement/navigation.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml b/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
index 4e3be1a7..0f4110d4 100644
--- a/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
+++ b/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test02/maven.xml b/xdoc/src/plugin-test/test02/maven.xml
index bb88b157..51845bb6 100644
--- a/xdoc/src/plugin-test/test02/maven.xml
+++ b/xdoc/src/plugin-test/test02/maven.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test02/project.properties b/xdoc/src/plugin-test/test02/project.properties
index 9a67992d..9af68508 100644
--- a/xdoc/src/plugin-test/test02/project.properties
+++ b/xdoc/src/plugin-test/test02/project.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/xdoc/src/plugin-test/test02/project.xml b/xdoc/src/plugin-test/test02/project.xml
index 923c9687..7badc25c 100644
--- a/xdoc/src/plugin-test/test02/project.xml
+++ b/xdoc/src/plugin-test/test02/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test02/xdocs/myfile.export.xml b/xdoc/src/plugin-test/test02/xdocs/myfile.export.xml
index 13cd1c11..7861f1c5 100644
--- a/xdoc/src/plugin-test/test02/xdocs/myfile.export.xml
+++ b/xdoc/src/plugin-test/test02/xdocs/myfile.export.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test02/xdocs/subdir/testjsltosite.xml b/xdoc/src/plugin-test/test02/xdocs/subdir/testjsltosite.xml
index 5d4a920d..26a475a5 100644
--- a/xdoc/src/plugin-test/test02/xdocs/subdir/testjsltosite.xml
+++ b/xdoc/src/plugin-test/test02/xdocs/subdir/testjsltosite.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test02/xdocs/xml_copy_only.xml b/xdoc/src/plugin-test/test02/xdocs/xml_copy_only.xml
index 13cd1c11..7861f1c5 100644
--- a/xdoc/src/plugin-test/test02/xdocs/xml_copy_only.xml
+++ b/xdoc/src/plugin-test/test02/xdocs/xml_copy_only.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test04/maven.xml b/xdoc/src/plugin-test/test04/maven.xml
index 981a3dc1..e6d8b7c1 100644
--- a/xdoc/src/plugin-test/test04/maven.xml
+++ b/xdoc/src/plugin-test/test04/maven.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test04/project.properties b/xdoc/src/plugin-test/test04/project.properties
index a08adff3..16e36cc9 100644
--- a/xdoc/src/plugin-test/test04/project.properties
+++ b/xdoc/src/plugin-test/test04/project.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/xdoc/src/plugin-test/test04/project.xml b/xdoc/src/plugin-test/test04/project.xml
index 9d0ab5a1..e1652528 100644
--- a/xdoc/src/plugin-test/test04/project.xml
+++ b/xdoc/src/plugin-test/test04/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test04/xdocs/myfile_i18n.xml b/xdoc/src/plugin-test/test04/xdocs/myfile_i18n.xml
index 19c2f273..10cf4d6d 100644
--- a/xdoc/src/plugin-test/test04/xdocs/myfile_i18n.xml
+++ b/xdoc/src/plugin-test/test04/xdocs/myfile_i18n.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test04/xdocs/navigation.xml b/xdoc/src/plugin-test/test04/xdocs/navigation.xml
index 41b43540..441c8b8c 100644
--- a/xdoc/src/plugin-test/test04/xdocs/navigation.xml
+++ b/xdoc/src/plugin-test/test04/xdocs/navigation.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test04/xdocs/subdir/subdir2/testjsltosite2.xml b/xdoc/src/plugin-test/test04/xdocs/subdir/subdir2/testjsltosite2.xml
index 7838f860..59d2e2d4 100644
--- a/xdoc/src/plugin-test/test04/xdocs/subdir/subdir2/testjsltosite2.xml
+++ b/xdoc/src/plugin-test/test04/xdocs/subdir/subdir2/testjsltosite2.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/test04/xdocs/subdir/testjsltosite.xml b/xdoc/src/plugin-test/test04/xdocs/subdir/testjsltosite.xml
index 7838f860..59d2e2d4 100644
--- a/xdoc/src/plugin-test/test04/xdocs/subdir/testjsltosite.xml
+++ b/xdoc/src/plugin-test/test04/xdocs/subdir/testjsltosite.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/testDependenciesComment/maven.xml b/xdoc/src/plugin-test/testDependenciesComment/maven.xml
index 901d3a70..ecea0d3f 100644
--- a/xdoc/src/plugin-test/testDependenciesComment/maven.xml
+++ b/xdoc/src/plugin-test/testDependenciesComment/maven.xml
@@ -1,10 +1,11 @@
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/plugin-test/testDependenciesComment/project.xml b/xdoc/src/plugin-test/testDependenciesComment/project.xml
index 788adf32..52087c25 100644
--- a/xdoc/src/plugin-test/testDependenciesComment/project.xml
+++ b/xdoc/src/plugin-test/testDependenciesComment/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/test-resources/navigation.xml b/xdoc/src/test-resources/navigation.xml
index 419a63c0..a5eb19e1 100644
--- a/xdoc/src/test-resources/navigation.xml
+++ b/xdoc/src/test-resources/navigation.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/test/org/apache/maven/NavBeanTest.java b/xdoc/src/test/org/apache/maven/NavBeanTest.java
index 67640827..34d110e1 100644
--- a/xdoc/src/test/org/apache/maven/NavBeanTest.java
+++ b/xdoc/src/test/org/apache/maven/NavBeanTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/xdoc/src/test/org/apache/maven/xdoc/util/LocaleUtilTest.java b/xdoc/src/test/org/apache/maven/xdoc/util/LocaleUtilTest.java
index b0a89648..c1d5f7c2 100644
--- a/xdoc/src/test/org/apache/maven/xdoc/util/LocaleUtilTest.java
+++ b/xdoc/src/test/org/apache/maven/xdoc/util/LocaleUtilTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.xdoc.util;
 
 /* ====================================================================
- *   Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/xdoc/src/test/org/apache/maven/xdoc/util/ScmUtilTest.java b/xdoc/src/test/org/apache/maven/xdoc/util/ScmUtilTest.java
index d2ea5a5a..543c9130 100644
--- a/xdoc/src/test/org/apache/maven/xdoc/util/ScmUtilTest.java
+++ b/xdoc/src/test/org/apache/maven/xdoc/util/ScmUtilTest.java
@@ -1,11 +1,12 @@
 package org.apache.maven.xdoc.util;
 
 /* ====================================================================
- *   Copyright 2006 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 to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements.  See the NOTICE file distributed with
+ *   this work for additional information regarding copyright ownership.
+ *   The ASF licenses this file to You 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
  *
diff --git a/xdoc/src/test/project.properties b/xdoc/src/test/project.properties
index 81629208..0aa96652 100644
--- a/xdoc/src/test/project.properties
+++ b/xdoc/src/test/project.properties
@@ -1,9 +1,10 @@
 # -------------------------------------------------------------------
-# Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You 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
 #  
diff --git a/xdoc/src/test/project.xml b/xdoc/src/test/project.xml
index 0e1f5122..09faec07 100644
--- a/xdoc/src/test/project.xml
+++ b/xdoc/src/test/project.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/test/xdocs/alpha/index.xml b/xdoc/src/test/xdocs/alpha/index.xml
index 04739902..02fb4ea1 100644
--- a/xdoc/src/test/xdocs/alpha/index.xml
+++ b/xdoc/src/test/xdocs/alpha/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/test/xdocs/alpha/one/index.xml b/xdoc/src/test/xdocs/alpha/one/index.xml
index 7dc0ba67..29550b0d 100644
--- a/xdoc/src/test/xdocs/alpha/one/index.xml
+++ b/xdoc/src/test/xdocs/alpha/one/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/test/xdocs/alpha/two/index.xml b/xdoc/src/test/xdocs/alpha/two/index.xml
index 34e3bea5..33d8914d 100644
--- a/xdoc/src/test/xdocs/alpha/two/index.xml
+++ b/xdoc/src/test/xdocs/alpha/two/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/test/xdocs/beta/index.xml b/xdoc/src/test/xdocs/beta/index.xml
index 16028135..1edba1fa 100644
--- a/xdoc/src/test/xdocs/beta/index.xml
+++ b/xdoc/src/test/xdocs/beta/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/test/xdocs/beta/one/index.xml b/xdoc/src/test/xdocs/beta/one/index.xml
index 6b44be40..7e6f168d 100644
--- a/xdoc/src/test/xdocs/beta/one/index.xml
+++ b/xdoc/src/test/xdocs/beta/one/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/test/xdocs/beta/two/index.xml b/xdoc/src/test/xdocs/beta/two/index.xml
index 9c8d6b59..a076bfae 100644
--- a/xdoc/src/test/xdocs/beta/two/index.xml
+++ b/xdoc/src/test/xdocs/beta/two/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/test/xdocs/index.xml b/xdoc/src/test/xdocs/index.xml
index 66be7956..d8811010 100644
--- a/xdoc/src/test/xdocs/index.xml
+++ b/xdoc/src/test/xdocs/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/test/xdocs/navigation.xml b/xdoc/src/test/xdocs/navigation.xml
index e7ca30ca..303a97bc 100644
--- a/xdoc/src/test/xdocs/navigation.xml
+++ b/xdoc/src/test/xdocs/navigation.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/xsd/maven-navigation-1.10.1.xsd b/xdoc/src/xsd/maven-navigation-1.10.1.xsd
index e3cf867d..e15d2aed 100644
--- a/xdoc/src/xsd/maven-navigation-1.10.1.xsd
+++ b/xdoc/src/xsd/maven-navigation-1.10.1.xsd
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/src/xsd/maven-navigation-1.10.xsd b/xdoc/src/xsd/maven-navigation-1.10.xsd
index e3cf867d..e15d2aed 100644
--- a/xdoc/src/xsd/maven-navigation-1.10.xsd
+++ b/xdoc/src/xsd/maven-navigation-1.10.xsd
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- 
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/xdocs/changes.xml b/xdoc/xdocs/changes.xml
index 59316916..378359bc 100644
--- a/xdoc/xdocs/changes.xml
+++ b/xdoc/xdocs/changes.xml
@@ -2,11 +2,12 @@
 
 <!-- 
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/xdocs/faq.fml b/xdoc/xdocs/faq.fml
index 5508d390..fc485a98 100644
--- a/xdoc/xdocs/faq.fml
+++ b/xdoc/xdocs/faq.fml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/xdocs/goals.xml b/xdoc/xdocs/goals.xml
index 2aa80f4a..bdd7488d 100644
--- a/xdoc/xdocs/goals.xml
+++ b/xdoc/xdocs/goals.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/xdocs/index.xml b/xdoc/xdocs/index.xml
index a5d9d5de..6518e3bc 100644
--- a/xdoc/xdocs/index.xml
+++ b/xdoc/xdocs/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!--
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  *
diff --git a/xdoc/xdocs/navigation.xml b/xdoc/xdocs/navigation.xml
index 82b56c04..4815ea82 100644
--- a/xdoc/xdocs/navigation.xml
+++ b/xdoc/xdocs/navigation.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/xdocs/properties.xml b/xdoc/xdocs/properties.xml
index ecc35532..38ec2d4b 100644
--- a/xdoc/xdocs/properties.xml
+++ b/xdoc/xdocs/properties.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <!-- 
 /*
- * Copyright 2001-2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/xdocs/reference/escapeXml.xml b/xdoc/xdocs/reference/escapeXml.xml
index 0cec33da..78eed527 100644
--- a/xdoc/xdocs/reference/escapeXml.xml
+++ b/xdoc/xdocs/reference/escapeXml.xml
@@ -1,11 +1,12 @@
 <!--
  * ========================================================================
  * 
- * Copyright 2004 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  * 
diff --git a/xdoc/xdocs/reference/i18n.xml b/xdoc/xdocs/reference/i18n.xml
index c582f4df..3df552ac 100644
--- a/xdoc/xdocs/reference/i18n.xml
+++ b/xdoc/xdocs/reference/i18n.xml
@@ -1,20 +1,23 @@
 <?xml version="1.0"?>
-<!-- 
-  /*
-  * 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.
-  */
+<!--
+ * ========================================================================
+ * 
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ * 
+ * ========================================================================
 -->
 <document>
   <properties>
diff --git a/xdoc/xdocs/reference/index.xml b/xdoc/xdocs/reference/index.xml
index 19a664ba..eb1a3d66 100644
--- a/xdoc/xdocs/reference/index.xml
+++ b/xdoc/xdocs/reference/index.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!--
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  *
diff --git a/xdoc/xdocs/reference/navfile.xml b/xdoc/xdocs/reference/navfile.xml
index 6d018317..1be9eab0 100644
--- a/xdoc/xdocs/reference/navfile.xml
+++ b/xdoc/xdocs/reference/navfile.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0"?>
 <!--
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  *
diff --git a/xdoc/xdocs/reference/xdocs.xml b/xdoc/xdocs/reference/xdocs.xml
index 9541d0b3..226f95b6 100644
--- a/xdoc/xdocs/reference/xdocs.xml
+++ b/xdoc/xdocs/reference/xdocs.xml
@@ -5,11 +5,12 @@
 
 <!--
 /*
- * 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 to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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
  *
diff --git a/xdoc/xdocs/tags.xml b/xdoc/xdocs/tags.xml
index fb04c2da..94cd7439 100644
--- a/xdoc/xdocs/tags.xml
+++ b/xdoc/xdocs/tags.xml
@@ -1,3 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+ -->
 <document>
   <properties>
     <title>Plugin tags</title>