diff --git a/org.eclipse.sisu.plexus.extender/META-INF/MANIFEST.MF b/org.eclipse.sisu.plexus.extender/META-INF/MANIFEST.MF
index 55f68d1..853f5e3 100644
--- a/org.eclipse.sisu.plexus.extender/META-INF/MANIFEST.MF
+++ b/org.eclipse.sisu.plexus.extender/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
 Fragment-Host: org.eclipse.sisu.inject.extender
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse Sisu
-Bundle-Copyright: Copyright (c) 2010, 2015 Sonatype, Inc. and others
+Bundle-Copyright: Copyright (c) 2010-present Sonatype, Inc. and others
 Bundle-DocURL: http://www.eclipse.org/sisu/
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Import-Package: org.eclipse.sisu.plexus
diff --git a/org.eclipse.sisu.plexus.extender/build.properties b/org.eclipse.sisu.plexus.extender/build.properties
index 5416d29..9775300 100644
--- a/org.eclipse.sisu.plexus.extender/build.properties
+++ b/org.eclipse.sisu.plexus.extender/build.properties
@@ -1,12 +1,12 @@
 ###############################################################################
-# Copyright (c) 2010, 2015 Sonatype, Inc.
+# Copyright (c) 2010-present Sonatype, Inc.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # Contributors:
-#    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+#   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
 ###############################################################################
 source.. = src/
 output.. = target/classes/
diff --git a/org.eclipse.sisu.plexus.extender/pom.xml b/org.eclipse.sisu.plexus.extender/pom.xml
index ba21dd8..b804df0 100644
--- a/org.eclipse.sisu.plexus.extender/pom.xml
+++ b/org.eclipse.sisu.plexus.extender/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- ~ Copyright (c) 2010, 2015 Sonatype, Inc.
+ ~ Copyright (c) 2010-present Sonatype, Inc.
  ~ All rights reserved. This program and the accompanying materials
  ~ are made available under the terms of the Eclipse Public License v1.0
  ~ which accompanies this distribution, and is available at
  ~ http://www.eclipse.org/legal/epl-v10.html
  ~
  ~ Contributors:
- ~    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ ~   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/org.eclipse.sisu.plexus.site/category.xml b/org.eclipse.sisu.plexus.site/category.xml
index 201f574..6dd32a0 100644
--- a/org.eclipse.sisu.plexus.site/category.xml
+++ b/org.eclipse.sisu.plexus.site/category.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- ~ Copyright (c) 2010, 2015 Sonatype, Inc.
+ ~ Copyright (c) 2010-present Sonatype, Inc.
  ~ All rights reserved. This program and the accompanying materials
  ~ are made available under the terms of the Eclipse Public License v1.0
  ~ which accompanies this distribution, and is available at
  ~ http://www.eclipse.org/legal/epl-v10.html
  ~
  ~ Contributors:
- ~    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ ~   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
 -->
 
 <site>
diff --git a/org.eclipse.sisu.plexus.site/pom.xml b/org.eclipse.sisu.plexus.site/pom.xml
index d1ffdfc..f2c2d58 100644
--- a/org.eclipse.sisu.plexus.site/pom.xml
+++ b/org.eclipse.sisu.plexus.site/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- ~ Copyright (c) 2010, 2015 Sonatype, Inc.
+ ~ Copyright (c) 2010-present Sonatype, Inc.
  ~ All rights reserved. This program and the accompanying materials
  ~ are made available under the terms of the Eclipse Public License v1.0
  ~ which accompanies this distribution, and is available at
  ~ http://www.eclipse.org/legal/epl-v10.html
  ~
  ~ Contributors:
- ~    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ ~   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/org.eclipse.sisu.plexus.tests/pom.xml b/org.eclipse.sisu.plexus.tests/pom.xml
index f6001ed..8d66817 100644
--- a/org.eclipse.sisu.plexus.tests/pom.xml
+++ b/org.eclipse.sisu.plexus.tests/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- ~ Copyright (c) 2010, 2015 Sonatype, Inc.
+ ~ Copyright (c) 2010-present Sonatype, Inc.
  ~ All rights reserved. This program and the accompanying materials
  ~ are made available under the terms of the Eclipse Public License v1.0
  ~ which accompanies this distribution, and is available at
  ~ http://www.eclipse.org/legal/epl-v10.html
  ~
  ~ Contributors:
- ~    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ ~   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ArrayConstantTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ArrayConstantTest.java
index 24f30d7..2136871 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ArrayConstantTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ArrayConstantTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/BadBean.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/BadBean.java
index 053bea1..4f3005d 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/BadBean.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/BadBean.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/BeanConstantTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/BeanConstantTest.java
index 56f3a8d..818e048 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/BeanConstantTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/BeanConstantTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ClassRealmConverterTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ClassRealmConverterTest.java
index a8849a5..fdcdb5b 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ClassRealmConverterTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ClassRealmConverterTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/CollectionConstantTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/CollectionConstantTest.java
index 2103db1..24a3036 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/CollectionConstantTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/CollectionConstantTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ComponentAnnotationTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ComponentAnnotationTest.java
index f872d94..8b4b75e 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ComponentAnnotationTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ComponentAnnotationTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ConfigurationAnnotationTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ConfigurationAnnotationTest.java
index 6f8d801..d93f8e3 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ConfigurationAnnotationTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ConfigurationAnnotationTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ConfigurationConverter.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ConfigurationConverter.java
index d0d3d4c..8e561b3 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ConfigurationConverter.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/ConfigurationConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/DateConstantTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/DateConstantTest.java
index cd50cfb..5e23e58 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/DateConstantTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/DateConstantTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/DefaultValuesTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/DefaultValuesTest.java
index ec446fa..04fddfa 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/DefaultValuesTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/DefaultValuesTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/HintsTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/HintsTest.java
index bbc27e6..524181a 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/HintsTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/HintsTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/MapConstantTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/MapConstantTest.java
index 44b5092..7d534ab 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/MapConstantTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/MapConstantTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusAnnotatedBeanMetadataTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusAnnotatedBeanMetadataTest.java
index 4d5cfb2..040c5d6 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusAnnotatedBeanMetadataTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusAnnotatedBeanMetadataTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusBeanLocatorTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusBeanLocatorTest.java
index e445267..d9e5319 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusBeanLocatorTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusBeanLocatorTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusBeanMetadataTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusBeanMetadataTest.java
index f0532b1..0e051bb 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusBeanMetadataTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusBeanMetadataTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusConfigurationTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusConfigurationTest.java
index 60716fb..0d1b39b 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusConfigurationTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusConfigurationTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusLifecycleTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusLifecycleTest.java
index 53e7b46..1a18c61 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusLifecycleTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusLifecycleTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusLoggingTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusLoggingTest.java
index b874217..d4723c8 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusLoggingTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusLoggingTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusRequirementTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusRequirementTest.java
index 3fe31f8..0a60daa 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusRequirementTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusRequirementTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java
index c597776..0730773 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/PlexusXmlScannerTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RequirementAnnotationTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RequirementAnnotationTest.java
index ba54ef1..177c1f6 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RequirementAnnotationTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RequirementAnnotationTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RolesTest.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RolesTest.java
index 9ad8fcc..538cf1b 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RolesTest.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/RolesTest.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/SimpleRequirementExample.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/SimpleRequirementExample.java
index 837d4d3..f23ca9c 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/SimpleRequirementExample.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/SimpleRequirementExample.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/SimpleScanningExample.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/SimpleScanningExample.java
index af8118e..4bdbee9 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/SimpleScanningExample.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/SimpleScanningExample.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/TestBean.java b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/TestBean.java
index 2784188..8be41fd 100644
--- a/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/TestBean.java
+++ b/org.eclipse.sisu.plexus.tests/src/org/eclipse/sisu/plexus/TestBean.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/META-INF/MANIFEST.MF b/org.eclipse.sisu.plexus/META-INF/MANIFEST.MF
index a626380..d0e4c2b 100644
--- a/org.eclipse.sisu.plexus/META-INF/MANIFEST.MF
+++ b/org.eclipse.sisu.plexus/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@
 Bundle-Name: Sisu-Plexus (Incubation)
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse Sisu
-Bundle-Copyright: Copyright (c) 2010, 2015 Sonatype, Inc. and others
+Bundle-Copyright: Copyright (c) 2010-present Sonatype, Inc. and others
 Bundle-DocURL: http://www.eclipse.org/sisu/
 Bundle-License: http://www.eclipse.org/legal/epl-v10.html
 Import-Package: javax.inject,
diff --git a/org.eclipse.sisu.plexus/build.properties b/org.eclipse.sisu.plexus/build.properties
index 5416d29..9775300 100644
--- a/org.eclipse.sisu.plexus/build.properties
+++ b/org.eclipse.sisu.plexus/build.properties
@@ -1,12 +1,12 @@
 ###############################################################################
-# Copyright (c) 2010, 2015 Sonatype, Inc.
+# Copyright (c) 2010-present Sonatype, Inc.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 #
 # Contributors:
-#    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+#   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
 ###############################################################################
 source.. = src/
 output.. = target/classes/
diff --git a/org.eclipse.sisu.plexus/pom.xml b/org.eclipse.sisu.plexus/pom.xml
index 7db54de..081c65c 100644
--- a/org.eclipse.sisu.plexus/pom.xml
+++ b/org.eclipse.sisu.plexus/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- ~ Copyright (c) 2010, 2015 Sonatype, Inc.
+ ~ Copyright (c) 2010-present Sonatype, Inc.
  ~ All rights reserved. This program and the accompanying materials
  ~ are made available under the terms of the Eclipse Public License v1.0
  ~ which accompanies this distribution, and is available at
  ~ http://www.eclipse.org/legal/epl-v10.html
  ~
  ~ Contributors:
- ~    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ ~   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/ContainerConfiguration.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/ContainerConfiguration.java
index a29a698..539796a 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/ContainerConfiguration.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/ContainerConfiguration.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/DefaultContainerConfiguration.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/DefaultContainerConfiguration.java
index fde35cf..22115c7 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/DefaultContainerConfiguration.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/DefaultContainerConfiguration.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/DefaultPlexusContainer.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/DefaultPlexusContainer.java
index 08ba6c0..ccd773e 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/DefaultPlexusContainer.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/DefaultPlexusContainer.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/MutablePlexusContainer.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/MutablePlexusContainer.java
index d879c87..7912d7a 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/MutablePlexusContainer.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/MutablePlexusContainer.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusConstants.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusConstants.java
index f9307be..296c263 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusConstants.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusConstants.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusContainer.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusContainer.java
index c0c5d63..92fcb20 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusContainer.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusContainer.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusContainerException.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusContainerException.java
index 07e2343..1dc73ce 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusContainerException.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusContainerException.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusTestCase.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusTestCase.java
index d9f6056..43407de 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusTestCase.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/PlexusTestCase.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/MapOrientedComponent.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/MapOrientedComponent.java
index 651b724..0254c79 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/MapOrientedComponent.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/MapOrientedComponent.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/composition/CycleDetectedInComponentGraphException.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/composition/CycleDetectedInComponentGraphException.java
index 09b3ae2..6a53065 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/composition/CycleDetectedInComponentGraphException.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/composition/CycleDetectedInComponentGraphException.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/AbstractComponentConfigurator.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/AbstractComponentConfigurator.java
index 0e6975c..066196c 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/AbstractComponentConfigurator.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/AbstractComponentConfigurator.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/BasicComponentConfigurator.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/BasicComponentConfigurator.java
index 89caf25..8232034 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/BasicComponentConfigurator.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/BasicComponentConfigurator.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/ComponentConfigurationException.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/ComponentConfigurationException.java
index 8a0b015..947214f 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/ComponentConfigurationException.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/ComponentConfigurationException.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/ComponentConfigurator.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/ComponentConfigurator.java
index b81d2ba..2c8e4d8 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/ComponentConfigurator.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/ComponentConfigurator.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/ConfigurationListener.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/ConfigurationListener.java
index 13c18d5..b659d57 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/ConfigurationListener.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/ConfigurationListener.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/MapOrientedComponentConfigurator.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/MapOrientedComponentConfigurator.java
index bf86625..7f6a2bf 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/MapOrientedComponentConfigurator.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/MapOrientedComponentConfigurator.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/AbstractConfigurationConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/AbstractConfigurationConverter.java
index f22f674..c77434d 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/AbstractConfigurationConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/AbstractConfigurationConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/ConfigurationConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/ConfigurationConverter.java
index 830e2f3..f29c095 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/ConfigurationConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/ConfigurationConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/ParameterizedConfigurationConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/ParameterizedConfigurationConverter.java
index 768590f..bc4ba4a 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/ParameterizedConfigurationConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/ParameterizedConfigurationConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/AbstractBasicConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/AbstractBasicConverter.java
index 50f9e16..a22dfe2 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/AbstractBasicConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/AbstractBasicConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/BooleanConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/BooleanConverter.java
index 2323d88..341e09e 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/BooleanConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/BooleanConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/ByteConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/ByteConverter.java
index 12222a8..b08d714 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/ByteConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/ByteConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/CharConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/CharConverter.java
index 5f7a4fc..c323ae6 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/CharConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/CharConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/ClassConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/ClassConverter.java
index 35724f1..965b281 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/ClassConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/ClassConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/DateConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/DateConverter.java
index 73d1833..e883e9f 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/DateConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/DateConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/DoubleConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/DoubleConverter.java
index 236e6b2..922fd55 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/DoubleConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/DoubleConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/EnumConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/EnumConverter.java
index df790f3..19d5c59 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/EnumConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/EnumConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/FileConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/FileConverter.java
index b25537d..dee684c 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/FileConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/FileConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/FloatConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/FloatConverter.java
index a79c320..7d827b3 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/FloatConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/FloatConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/IntConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/IntConverter.java
index dc90824..6be6079 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/IntConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/IntConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/LongConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/LongConverter.java
index 0301240..5283746 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/LongConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/LongConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/ShortConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/ShortConverter.java
index d58343d..5902bac 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/ShortConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/ShortConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/StringBufferConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/StringBufferConverter.java
index 5e0b781..71b5663 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/StringBufferConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/StringBufferConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/StringBuilderConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/StringBuilderConverter.java
index af63f27..9620aea 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/StringBuilderConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/StringBuilderConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/StringConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/StringConverter.java
index 99b0258..2be7353 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/StringConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/StringConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/UriConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/UriConverter.java
index 984d2e5..31ce7e0 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/UriConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/UriConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/UrlConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/UrlConverter.java
index d3be61f..9bdafb3 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/UrlConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/basic/UrlConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/AbstractCollectionConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/AbstractCollectionConverter.java
index 92806f7..bd1f535 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/AbstractCollectionConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/AbstractCollectionConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/ArrayConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/ArrayConverter.java
index 415e4c3..5c18dd8 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/ArrayConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/ArrayConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/CollectionConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/CollectionConverter.java
index 852b78c..c244b21 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/CollectionConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/CollectionConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/MapConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/MapConverter.java
index 102528b..5bd4d46 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/MapConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/MapConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/ObjectWithFieldsConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/ObjectWithFieldsConverter.java
index 9c2fdc8..8413175 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/ObjectWithFieldsConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/ObjectWithFieldsConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/PlexusConfigurationConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/PlexusConfigurationConverter.java
index 566dd7e..a4b370c 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/PlexusConfigurationConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/PlexusConfigurationConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/PropertiesConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/PropertiesConverter.java
index 6807458..291f3fb 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/PropertiesConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/composite/PropertiesConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/lookup/ConverterLookup.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/lookup/ConverterLookup.java
index 667319d..9dd4401 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/lookup/ConverterLookup.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/lookup/ConverterLookup.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/lookup/DefaultConverterLookup.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/lookup/DefaultConverterLookup.java
index 4b62a3e..69f53e1 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/lookup/DefaultConverterLookup.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/lookup/DefaultConverterLookup.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/special/ClassRealmConverter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/special/ClassRealmConverter.java
index af4e028..adc40cc 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/special/ClassRealmConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/converters/special/ClassRealmConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/expression/DefaultExpressionEvaluator.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/expression/DefaultExpressionEvaluator.java
index a1d17b3..52e3f55 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/expression/DefaultExpressionEvaluator.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/expression/DefaultExpressionEvaluator.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluationException.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluationException.java
index 09aee10..21980e4 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluationException.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluationException.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluator.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluator.java
index 97725d0..5ee1f7c 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluator.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/expression/ExpressionEvaluator.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/expression/TypeAwareExpressionEvaluator.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/expression/TypeAwareExpressionEvaluator.java
index a185b4d..80323a3 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/expression/TypeAwareExpressionEvaluator.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/configurator/expression/TypeAwareExpressionEvaluator.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/factory/AbstractComponentFactory.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/factory/AbstractComponentFactory.java
index 8fe44be..2c52fed 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/factory/AbstractComponentFactory.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/factory/AbstractComponentFactory.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/factory/ComponentFactory.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/factory/ComponentFactory.java
index adb88b1..7b043e9 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/factory/ComponentFactory.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/factory/ComponentFactory.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/factory/ComponentInstantiationException.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/factory/ComponentInstantiationException.java
index 0af78eb..b77f117 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/factory/ComponentInstantiationException.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/factory/ComponentInstantiationException.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentDependency.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentDependency.java
index 70b1401..61d1620 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentDependency.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentDependency.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentDescriptor.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentDescriptor.java
index d396e65..e8ef696 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentDescriptor.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentDescriptor.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentRequirement.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentRequirement.java
index 58055d2..91834c3 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentRequirement.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentRequirement.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentRequirementList.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentRequirementList.java
index 17fed21..49af279 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentRequirementList.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentRequirementList.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentSetDescriptor.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentSetDescriptor.java
index 2ef1f52..057eaac 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentSetDescriptor.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/ComponentSetDescriptor.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/exception/ComponentLifecycleException.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/exception/ComponentLifecycleException.java
index 2d828f3..a294f06 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/exception/ComponentLifecycleException.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/exception/ComponentLifecycleException.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/exception/ComponentLookupException.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/exception/ComponentLookupException.java
index c38994c..9e093c2 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/exception/ComponentLookupException.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/exception/ComponentLookupException.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/exception/ComponentRepositoryException.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/exception/ComponentRepositoryException.java
index ced5b57..e2ef484 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/exception/ComponentRepositoryException.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/component/repository/exception/ComponentRepositoryException.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/configuration/DefaultPlexusConfiguration.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/configuration/DefaultPlexusConfiguration.java
index 7f47258..3b3cb5c 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/configuration/DefaultPlexusConfiguration.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/configuration/DefaultPlexusConfiguration.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/configuration/PlexusConfiguration.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/configuration/PlexusConfiguration.java
index dcfe253..5349e1c 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/configuration/PlexusConfiguration.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/configuration/PlexusConfiguration.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/configuration/PlexusConfigurationException.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/configuration/PlexusConfigurationException.java
index 3f4bc4a..81dd227 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/configuration/PlexusConfigurationException.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/configuration/PlexusConfigurationException.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/configuration/xml/XmlPlexusConfiguration.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/configuration/xml/XmlPlexusConfiguration.java
index 1ae8270..84b106d 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/configuration/xml/XmlPlexusConfiguration.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/configuration/xml/XmlPlexusConfiguration.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/context/Context.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/context/Context.java
index 0ad3fd0..91002e5 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/context/Context.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/context/Context.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/context/ContextException.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/context/ContextException.java
index 4944ad4..8fec351 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/context/ContextException.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/context/ContextException.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/context/ContextMapAdapter.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/context/ContextMapAdapter.java
index 4e075da..f3a498e 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/context/ContextMapAdapter.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/context/ContextMapAdapter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/context/DefaultContext.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/context/DefaultContext.java
index 01eead4..f88e3ed 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/context/DefaultContext.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/context/DefaultContext.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/AbstractLogEnabled.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/AbstractLogEnabled.java
index 9c2bd71..0eb0abf 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/AbstractLogEnabled.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/AbstractLogEnabled.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/AbstractLogger.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/AbstractLogger.java
index e12165e..a48d18f 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/AbstractLogger.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/AbstractLogger.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/AbstractLoggerManager.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/AbstractLoggerManager.java
index 6b06b72..5b7805d 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/AbstractLoggerManager.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/AbstractLoggerManager.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/BaseLoggerManager.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/BaseLoggerManager.java
index 111c177..2294380 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/BaseLoggerManager.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/BaseLoggerManager.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/LogEnabled.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/LogEnabled.java
index 8509853..d71634f 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/LogEnabled.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/LogEnabled.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/Logger.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/Logger.java
index 0d95dde..2c27c1d 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/Logger.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/Logger.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/LoggerManager.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/LoggerManager.java
index 3bf3734..2a11815 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/LoggerManager.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/LoggerManager.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/console/ConsoleLogger.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/console/ConsoleLogger.java
index ef1dc46..896a08d 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/console/ConsoleLogger.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/console/ConsoleLogger.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/console/ConsoleLoggerManager.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/console/ConsoleLoggerManager.java
index 37695ed..3ffda05 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/console/ConsoleLoggerManager.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/logging/console/ConsoleLoggerManager.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Configurable.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Configurable.java
index 4f98378..72fcd1a 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Configurable.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Configurable.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Contextualizable.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Contextualizable.java
index 7efd569..0f7696f 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Contextualizable.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Contextualizable.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Disposable.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Disposable.java
index 7aa2320..97f9ac2 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Disposable.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Disposable.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Initializable.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Initializable.java
index 3a3ee5f..66d1193 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Initializable.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Initializable.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/InitializationException.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/InitializationException.java
index ada3466..a0e6354 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/InitializationException.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/InitializationException.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/PlexusContainerLocator.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/PlexusContainerLocator.java
index 1d68d5f..ba94b05 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/PlexusContainerLocator.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/PlexusContainerLocator.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/ServiceLocator.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/ServiceLocator.java
index f31cb35..474efad 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/ServiceLocator.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/ServiceLocator.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Serviceable.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Serviceable.java
index 7d6b242..3491d8d 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Serviceable.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Serviceable.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Startable.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Startable.java
index 3fbfbc1..b7b5606 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Startable.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Startable.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/StartingException.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/StartingException.java
index adb040b..490523f 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/StartingException.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/StartingException.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/StoppingException.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/StoppingException.java
index 07feda5..4945a5d 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/StoppingException.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/StoppingException.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Suspendable.java b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Suspendable.java
index fc886ad..f181629 100644
--- a/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Suspendable.java
+++ b/org.eclipse.sisu.plexus/src/org/codehaus/plexus/personality/plexus/lifecycle/phase/Suspendable.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *
  * Minimal facade required to be binary-compatible with legacy Plexus API
  *******************************************************************************/
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ClassRealmManager.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ClassRealmManager.java
index 496f846..8306316 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ClassRealmManager.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ClassRealmManager.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ComponentDescriptorBeanModule.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ComponentDescriptorBeanModule.java
index ce35855..9a591bd 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ComponentDescriptorBeanModule.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ComponentDescriptorBeanModule.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ComponentImpl.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ComponentImpl.java
index 51867c9..569a38d 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ComponentImpl.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ComponentImpl.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/CompositeBeanHelper.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/CompositeBeanHelper.java
index be2a644..7890527 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/CompositeBeanHelper.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/CompositeBeanHelper.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ConfigurationImpl.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ConfigurationImpl.java
index 21775f9..1a0c149 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ConfigurationImpl.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ConfigurationImpl.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/DefaultPlexusBeanLocator.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/DefaultPlexusBeanLocator.java
index f435b5c..fd50610 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/DefaultPlexusBeanLocator.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/DefaultPlexusBeanLocator.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/DefaultPlexusBeans.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/DefaultPlexusBeans.java
index 6225204..e666a6d 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/DefaultPlexusBeans.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/DefaultPlexusBeans.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/HintedPlexusBeans.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/HintedPlexusBeans.java
index cb58317..779c163 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/HintedPlexusBeans.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/HintedPlexusBeans.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/Hints.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/Hints.java
index e4fc369..050a5e9 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/Hints.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/Hints.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/LazyPlexusBean.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/LazyPlexusBean.java
index 2526671..1270183 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/LazyPlexusBean.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/LazyPlexusBean.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/MissingPlexusBean.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/MissingPlexusBean.java
index a3f61f2..69c886e 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/MissingPlexusBean.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/MissingPlexusBean.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/OptionalPropertyBinding.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/OptionalPropertyBinding.java
index 27e5dbe..93a110e 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/OptionalPropertyBinding.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/OptionalPropertyBinding.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedBeanModule.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedBeanModule.java
index d5046f4..97b0c23 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedBeanModule.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedBeanModule.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedMetadata.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedMetadata.java
index c7d1c7e..8d935a6 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedMetadata.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusAnnotatedMetadata.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBean.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBean.java
index b676d87..c313019 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBean.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBean.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanBinder.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanBinder.java
index 093c424..0a14fc3 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanBinder.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanBinder.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanConverter.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanConverter.java
index bc89213..2f074c8 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanLocator.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanLocator.java
index 26669ae..76326af 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanLocator.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanLocator.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanMetadata.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanMetadata.java
index 4400626..380b542 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanMetadata.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanMetadata.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanModule.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanModule.java
index 2416f34..2937c85 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanModule.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanModule.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanSource.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanSource.java
index 8bead37..bad94a7 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanSource.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBeanSource.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBindingModule.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBindingModule.java
index db62ac4..590d6d3 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBindingModule.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBindingModule.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java
index d53ebed..3b6ba8d 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusBundlePlan.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusConfigurations.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusConfigurations.java
index 6849b29..6cf187a 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusConfigurations.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusConfigurations.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusDateTypeConverter.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusDateTypeConverter.java
index a6bcfff..eb64c86 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusDateTypeConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusDateTypeConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusLifecycleManager.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusLifecycleManager.java
index 78b2ef5..6c7546d 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusLifecycleManager.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusLifecycleManager.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusPropertyBinder.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusPropertyBinder.java
index 1df0ef2..ed98264 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusPropertyBinder.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusPropertyBinder.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusRequirements.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusRequirements.java
index f9dd455..2ac7985 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusRequirements.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusRequirements.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusSpaceModule.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusSpaceModule.java
index ea7591e..56472fa 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusSpaceModule.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusSpaceModule.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusTypeBinder.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusTypeBinder.java
index 5cef414..e561b87 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusTypeBinder.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusTypeBinder.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusTypeListener.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusTypeListener.java
index 602467c..d6e3840 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusTypeListener.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusTypeListener.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusTypeRegistry.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusTypeRegistry.java
index 6a34bf3..759f762 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusTypeRegistry.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusTypeRegistry.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusTypeVisitor.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusTypeVisitor.java
index ce10453..61e4fbb 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusTypeVisitor.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusTypeVisitor.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlBeanConverter.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlBeanConverter.java
index f354f75..6cfcf40 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlBeanConverter.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlBeanConverter.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlBeanModule.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlBeanModule.java
index e4b34d7..a592ef5 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlBeanModule.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlBeanModule.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlMetadata.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlMetadata.java
index bd9c51a..5c1062a 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlMetadata.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlMetadata.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlScanner.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlScanner.java
index 9bdde2c..463ad67 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlScanner.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PlexusXmlScanner.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ProvidedPropertyBinding.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ProvidedPropertyBinding.java
index b6a9e4b..4424010 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ProvidedPropertyBinding.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/ProvidedPropertyBinding.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PseudoPlexusContainer.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PseudoPlexusContainer.java
index c3f8a72..ad8354d 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PseudoPlexusContainer.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/PseudoPlexusContainer.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/RealmFilteredBeans.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/RealmFilteredBeans.java
index 69994f6..5a58914 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/RealmFilteredBeans.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/RealmFilteredBeans.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/RequirementImpl.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/RequirementImpl.java
index f09cd41..3556ec1 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/RequirementImpl.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/RequirementImpl.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/Roles.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/Roles.java
index e8276f7..8d94c3b 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/Roles.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/Roles.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/Strategies.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/Strategies.java
index 7befc1d..b9a7dde 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/Strategies.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/Strategies.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 package org.eclipse.sisu.plexus;
 
diff --git a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/package-info.java b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/package-info.java
index 89a4b6c..6c2981d 100644
--- a/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/package-info.java
+++ b/org.eclipse.sisu.plexus/src/org/eclipse/sisu/plexus/package-info.java
@@ -1,12 +1,12 @@
 /*******************************************************************************
- * Copyright (c) 2010, 2015 Sonatype, Inc.
+ * Copyright (c) 2010-present Sonatype, Inc.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
  *
  * Contributors:
- *    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ *   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
  *******************************************************************************/
 /**
  * Sisu-Plexus backend implementation.
diff --git a/pom.xml b/pom.xml
index 518b7fa..34a5373 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
- ~ Copyright (c) 2010, 2015 Sonatype, Inc.
+ ~ Copyright (c) 2010-present Sonatype, Inc.
  ~ All rights reserved. This program and the accompanying materials
  ~ are made available under the terms of the Eclipse Public License v1.0
  ~ which accompanies this distribution, and is available at
  ~ http://www.eclipse.org/legal/epl-v10.html
  ~
  ~ Contributors:
- ~    Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
+ ~   Stuart McCulloch (Sonatype, Inc.) - initial API and implementation
 -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">