From d88cc1086ad6a7c2ee63cc7537b33fe8f9a17d35 Mon Sep 17 00:00:00 2001
From: Gunnar Morling <gunnar.morling@googlemail.com>
Date: Tue, 14 May 2013 22:11:11 +0200
Subject: [PATCH] Updating copyright headers to reference contributor file

---
 copyright.txt                                       |  5 +++++
 core/etc/license.txt                                | 13 -------------
 core/pom.xml                                        |  3 +++
 core/src/main/java/org/mapstruct/Mapper.java        |  3 +++
 core/src/main/java/org/mapstruct/Mappers.java       |  3 +++
 core/src/main/java/org/mapstruct/Mapping.java       |  3 +++
 core/src/main/java/org/mapstruct/Mappings.java      |  3 +++
 core/src/test/java/org/mapstruct/MappersTest.java   |  3 +++
 .../src/test/java/org/mapstruct/test/model/Foo.java |  3 +++
 .../test/java/org/mapstruct/test/model/FooImpl.java |  3 +++
 etc/license.txt                                     |  3 +++
 integrationtest/pom.xml                             |  3 +++
 .../src/main/java/org/mapstruct/itest/Source.java   |  3 +++
 .../org/mapstruct/itest/SourceTargetMapper.java     |  3 +++
 .../src/main/java/org/mapstruct/itest/Target.java   |  3 +++
 .../java/org/mapstruct/itest/ConversionTest.java    |  3 +++
 parent/etc/license.txt                              | 13 -------------
 parent/pom.xml                                      |  4 ++++
 pom.xml                                             |  3 +++
 processor/etc/license.txt                           | 13 -------------
 processor/pom.xml                                   |  3 +++
 .../org/mapstruct/ap/MapperGenerationVisitor.java   |  3 +++
 .../java/org/mapstruct/ap/MappingProcessor.java     |  3 +++
 .../org/mapstruct/ap/conversion/Conversion.java     |  3 +++
 .../org/mapstruct/ap/conversion/Conversions.java    |  3 +++
 .../ap/conversion/EnumStringConversion.java         |  3 +++
 .../mapstruct/ap/conversion/IntLongConversion.java  |  3 +++
 .../ap/conversion/IntStringConversion.java          |  3 +++
 .../ap/conversion/IntegerStringConversion.java      |  3 +++
 .../mapstruct/ap/conversion/ReverseConversion.java  |  3 +++
 .../java/org/mapstruct/ap/model/BeanMapping.java    |  3 +++
 .../main/java/org/mapstruct/ap/model/Mapper.java    |  3 +++
 .../java/org/mapstruct/ap/model/MappingMethod.java  |  3 +++
 .../main/java/org/mapstruct/ap/model/Options.java   |  3 +++
 .../org/mapstruct/ap/model/PropertyMapping.java     |  3 +++
 .../src/main/java/org/mapstruct/ap/model/Type.java  |  3 +++
 .../mapstruct/ap/model/source/MappedProperty.java   |  3 +++
 .../java/org/mapstruct/ap/model/source/Mapping.java |  3 +++
 .../java/org/mapstruct/ap/model/source/Method.java  |  3 +++
 .../org/mapstruct/ap/model/source/Parameter.java    |  3 +++
 .../main/java/org/mapstruct/ap/util/Filters.java    |  3 +++
 .../main/java/org/mapstruct/ap/util/TypeUtil.java   |  3 +++
 .../java/org/mapstruct/ap/writer/ModelWriter.java   |  3 +++
 .../src/main/resources/mapper-implementation.ftl    |  3 +++
 .../ap/test/collection/CollectionMappingTest.java   |  3 +++
 .../org/mapstruct/ap/test/collection/Colour.java    |  3 +++
 .../org/mapstruct/ap/test/collection/Source.java    |  3 +++
 .../ap/test/collection/SourceTargetMapper.java      |  3 +++
 .../org/mapstruct/ap/test/collection/Target.java    |  3 +++
 .../DefaultCollectionImplementationTest.java        |  3 +++
 .../collection/defaultimplementation/Source.java    |  3 +++
 .../collection/defaultimplementation/SourceFoo.java |  3 +++
 .../defaultimplementation/SourceTargetMapper.java   |  3 +++
 .../collection/defaultimplementation/Target.java    |  3 +++
 .../collection/defaultimplementation/TargetFoo.java |  3 +++
 .../erronuous/ErronuousCollectionMappingTest.java   |  7 +++++--
 .../test/collection/erronuous/ErronuousMapper.java  |  3 +++
 .../IterableToNonIterableMappingTest.java           |  3 +++
 .../collection/iterabletononiterable/Source.java    |  3 +++
 .../iterabletononiterable/SourceTargetMapper.java   |  3 +++
 .../iterabletononiterable/StringListMapper.java     |  3 +++
 .../collection/iterabletononiterable/Target.java    |  3 +++
 .../java/org/mapstruct/ap/test/complex/Car.java     |  3 +++
 .../java/org/mapstruct/ap/test/complex/CarDto.java  |  3 +++
 .../org/mapstruct/ap/test/complex/CarMapper.java    |  3 +++
 .../mapstruct/ap/test/complex/CarMapperTest.java    |  3 +++
 .../org/mapstruct/ap/test/complex/Category.java     |  3 +++
 .../org/mapstruct/ap/test/complex/DateMapper.java   |  3 +++
 .../java/org/mapstruct/ap/test/complex/Person.java  |  3 +++
 .../org/mapstruct/ap/test/complex/PersonDto.java    |  3 +++
 .../ap/test/conversion/ConversionTest.java          |  3 +++
 .../org/mapstruct/ap/test/conversion/Source.java    |  3 +++
 .../ap/test/conversion/SourceTargetMapper.java      |  3 +++
 .../org/mapstruct/ap/test/conversion/Target.java    |  3 +++
 .../java/org/mapstruct/ap/testutil/IssueKey.java    |  3 +++
 .../org/mapstruct/ap/testutil/MapperTestBase.java   |  3 +++
 .../java/org/mapstruct/ap/testutil/WithClasses.java |  3 +++
 .../compilation/annotation/CompilationResult.java   |  3 +++
 .../testutil/compilation/annotation/Diagnostic.java |  3 +++
 .../annotation/ExpectedCompilationOutcome.java      |  3 +++
 .../model/CompilationOutcomeDescriptor.java         |  3 +++
 .../compilation/model/DiagnosticDescriptor.java     |  3 +++
 82 files changed, 242 insertions(+), 41 deletions(-)
 create mode 100644 copyright.txt
 delete mode 100644 core/etc/license.txt
 delete mode 100644 parent/etc/license.txt
 delete mode 100644 processor/etc/license.txt

diff --git a/copyright.txt b/copyright.txt
new file mode 100644
index 000000000..19e0e1d6e
--- /dev/null
+++ b/copyright.txt
@@ -0,0 +1,5 @@
+Contributors
+============
+
+Andreas Gudian
+Gunnar Morling
diff --git a/core/etc/license.txt b/core/etc/license.txt
deleted file mode 100644
index b2014c4b4..000000000
--- a/core/etc/license.txt
+++ /dev/null
@@ -1,13 +0,0 @@
- Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
index e9245b570..79703f38d 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -2,6 +2,9 @@
 <!--
 
  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ and/or other contributors as indicated by the @authors tag. See the
+ copyright.txt file in the distribution for a full listing of all
+ contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/mapstruct/Mapper.java b/core/src/main/java/org/mapstruct/Mapper.java
index 4c0801c6f..1a4a6b44a 100644
--- a/core/src/main/java/org/mapstruct/Mapper.java
+++ b/core/src/main/java/org/mapstruct/Mapper.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/mapstruct/Mappers.java b/core/src/main/java/org/mapstruct/Mappers.java
index f3aa5f64c..0cc65c320 100644
--- a/core/src/main/java/org/mapstruct/Mappers.java
+++ b/core/src/main/java/org/mapstruct/Mappers.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/mapstruct/Mapping.java b/core/src/main/java/org/mapstruct/Mapping.java
index e9dc12bc0..82fd6b98b 100644
--- a/core/src/main/java/org/mapstruct/Mapping.java
+++ b/core/src/main/java/org/mapstruct/Mapping.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/core/src/main/java/org/mapstruct/Mappings.java b/core/src/main/java/org/mapstruct/Mappings.java
index 467c19bba..9ff51fcf9 100644
--- a/core/src/main/java/org/mapstruct/Mappings.java
+++ b/core/src/main/java/org/mapstruct/Mappings.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/mapstruct/MappersTest.java b/core/src/test/java/org/mapstruct/MappersTest.java
index c7f69ccb2..d27c36dd4 100644
--- a/core/src/test/java/org/mapstruct/MappersTest.java
+++ b/core/src/test/java/org/mapstruct/MappersTest.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/mapstruct/test/model/Foo.java b/core/src/test/java/org/mapstruct/test/model/Foo.java
index 2596f27a2..ea93b3597 100644
--- a/core/src/test/java/org/mapstruct/test/model/Foo.java
+++ b/core/src/test/java/org/mapstruct/test/model/Foo.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/core/src/test/java/org/mapstruct/test/model/FooImpl.java b/core/src/test/java/org/mapstruct/test/model/FooImpl.java
index 0e700ea51..2d6d2d93f 100644
--- a/core/src/test/java/org/mapstruct/test/model/FooImpl.java
+++ b/core/src/test/java/org/mapstruct/test/model/FooImpl.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/etc/license.txt b/etc/license.txt
index b2014c4b4..32cde1b90 100644
--- a/etc/license.txt
+++ b/etc/license.txt
@@ -1,4 +1,7 @@
  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ and/or other contributors as indicated by the @authors tag. See the
+ copyright.txt file in the distribution for a full listing of all
+ contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/integrationtest/pom.xml b/integrationtest/pom.xml
index 9d9cd8fcf..ae1af64ad 100644
--- a/integrationtest/pom.xml
+++ b/integrationtest/pom.xml
@@ -2,6 +2,9 @@
 <!--
 
  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ and/or other contributors as indicated by the @authors tag. See the
+ copyright.txt file in the distribution for a full listing of all
+ contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/integrationtest/src/main/java/org/mapstruct/itest/Source.java b/integrationtest/src/main/java/org/mapstruct/itest/Source.java
index 47fdc3f57..46bb4b422 100644
--- a/integrationtest/src/main/java/org/mapstruct/itest/Source.java
+++ b/integrationtest/src/main/java/org/mapstruct/itest/Source.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/integrationtest/src/main/java/org/mapstruct/itest/SourceTargetMapper.java b/integrationtest/src/main/java/org/mapstruct/itest/SourceTargetMapper.java
index db4bc609c..8119a16ab 100644
--- a/integrationtest/src/main/java/org/mapstruct/itest/SourceTargetMapper.java
+++ b/integrationtest/src/main/java/org/mapstruct/itest/SourceTargetMapper.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/integrationtest/src/main/java/org/mapstruct/itest/Target.java b/integrationtest/src/main/java/org/mapstruct/itest/Target.java
index 729d639b3..ba3145175 100644
--- a/integrationtest/src/main/java/org/mapstruct/itest/Target.java
+++ b/integrationtest/src/main/java/org/mapstruct/itest/Target.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/integrationtest/src/test/java/org/mapstruct/itest/ConversionTest.java b/integrationtest/src/test/java/org/mapstruct/itest/ConversionTest.java
index f92bda1a5..8a8b3534c 100644
--- a/integrationtest/src/test/java/org/mapstruct/itest/ConversionTest.java
+++ b/integrationtest/src/test/java/org/mapstruct/itest/ConversionTest.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/parent/etc/license.txt b/parent/etc/license.txt
deleted file mode 100644
index b2014c4b4..000000000
--- a/parent/etc/license.txt
+++ /dev/null
@@ -1,13 +0,0 @@
- Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
\ No newline at end of file
diff --git a/parent/pom.xml b/parent/pom.xml
index e9a063c45..dd7d8a77a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2,6 +2,9 @@
 <!--
 
  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ and/or other contributors as indicated by the @authors tag. See the
+ copyright.txt file in the distribution for a full listing of all
+ contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
@@ -160,6 +163,7 @@
                     <strictCheck>true</strictCheck>
                     <excludes>
                         <exclude>.idea/**</exclude>
+                        <exclude>copyright.txt</exclude>
                     </excludes>
                 </configuration>
                 <executions>
diff --git a/pom.xml b/pom.xml
index afd7ee92b..a6e463171 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,6 +2,9 @@
 <!--
 
  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ and/or other contributors as indicated by the @authors tag. See the
+ copyright.txt file in the distribution for a full listing of all
+ contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/processor/etc/license.txt b/processor/etc/license.txt
deleted file mode 100644
index b2014c4b4..000000000
--- a/processor/etc/license.txt
+++ /dev/null
@@ -1,13 +0,0 @@
- Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
\ No newline at end of file
diff --git a/processor/pom.xml b/processor/pom.xml
index 8cf7d2bfd..eb4620386 100644
--- a/processor/pom.xml
+++ b/processor/pom.xml
@@ -2,6 +2,9 @@
 <!--
 
  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ and/or other contributors as indicated by the @authors tag. See the
+ copyright.txt file in the distribution for a full listing of all
+ contributors.
 
  Licensed under the Apache License, Version 2.0 (the "License");
  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/MapperGenerationVisitor.java b/processor/src/main/java/org/mapstruct/ap/MapperGenerationVisitor.java
index 03c76df18..a311dfded 100644
--- a/processor/src/main/java/org/mapstruct/ap/MapperGenerationVisitor.java
+++ b/processor/src/main/java/org/mapstruct/ap/MapperGenerationVisitor.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/MappingProcessor.java b/processor/src/main/java/org/mapstruct/ap/MappingProcessor.java
index aecb94d68..2484aeac4 100644
--- a/processor/src/main/java/org/mapstruct/ap/MappingProcessor.java
+++ b/processor/src/main/java/org/mapstruct/ap/MappingProcessor.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/Conversion.java b/processor/src/main/java/org/mapstruct/ap/conversion/Conversion.java
index 0fb4b4a6b..96f3fdf11 100644
--- a/processor/src/main/java/org/mapstruct/ap/conversion/Conversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/conversion/Conversion.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/Conversions.java b/processor/src/main/java/org/mapstruct/ap/conversion/Conversions.java
index 6f1f50523..e23d923ae 100644
--- a/processor/src/main/java/org/mapstruct/ap/conversion/Conversions.java
+++ b/processor/src/main/java/org/mapstruct/ap/conversion/Conversions.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/EnumStringConversion.java b/processor/src/main/java/org/mapstruct/ap/conversion/EnumStringConversion.java
index 82c7e8d07..bde4815fe 100644
--- a/processor/src/main/java/org/mapstruct/ap/conversion/EnumStringConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/conversion/EnumStringConversion.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/IntLongConversion.java b/processor/src/main/java/org/mapstruct/ap/conversion/IntLongConversion.java
index b0292f0ed..314b4a393 100644
--- a/processor/src/main/java/org/mapstruct/ap/conversion/IntLongConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/conversion/IntLongConversion.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/IntStringConversion.java b/processor/src/main/java/org/mapstruct/ap/conversion/IntStringConversion.java
index f33ba49a9..4bbc0607a 100644
--- a/processor/src/main/java/org/mapstruct/ap/conversion/IntStringConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/conversion/IntStringConversion.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/IntegerStringConversion.java b/processor/src/main/java/org/mapstruct/ap/conversion/IntegerStringConversion.java
index 47f8c63da..64d1594f9 100644
--- a/processor/src/main/java/org/mapstruct/ap/conversion/IntegerStringConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/conversion/IntegerStringConversion.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/conversion/ReverseConversion.java b/processor/src/main/java/org/mapstruct/ap/conversion/ReverseConversion.java
index 62005336a..7fb33a477 100644
--- a/processor/src/main/java/org/mapstruct/ap/conversion/ReverseConversion.java
+++ b/processor/src/main/java/org/mapstruct/ap/conversion/ReverseConversion.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/model/BeanMapping.java b/processor/src/main/java/org/mapstruct/ap/model/BeanMapping.java
index 6f8ae8101..f92d90757 100644
--- a/processor/src/main/java/org/mapstruct/ap/model/BeanMapping.java
+++ b/processor/src/main/java/org/mapstruct/ap/model/BeanMapping.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/model/Mapper.java b/processor/src/main/java/org/mapstruct/ap/model/Mapper.java
index 2a4519eb6..a6d8cc482 100644
--- a/processor/src/main/java/org/mapstruct/ap/model/Mapper.java
+++ b/processor/src/main/java/org/mapstruct/ap/model/Mapper.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/model/MappingMethod.java b/processor/src/main/java/org/mapstruct/ap/model/MappingMethod.java
index 723831955..30d6e0489 100644
--- a/processor/src/main/java/org/mapstruct/ap/model/MappingMethod.java
+++ b/processor/src/main/java/org/mapstruct/ap/model/MappingMethod.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/model/Options.java b/processor/src/main/java/org/mapstruct/ap/model/Options.java
index bde754543..02c673ed1 100644
--- a/processor/src/main/java/org/mapstruct/ap/model/Options.java
+++ b/processor/src/main/java/org/mapstruct/ap/model/Options.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java b/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java
index b1ca022b0..1dc9519f3 100644
--- a/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java
+++ b/processor/src/main/java/org/mapstruct/ap/model/PropertyMapping.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/model/Type.java b/processor/src/main/java/org/mapstruct/ap/model/Type.java
index d365b12c9..411738428 100644
--- a/processor/src/main/java/org/mapstruct/ap/model/Type.java
+++ b/processor/src/main/java/org/mapstruct/ap/model/Type.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/MappedProperty.java b/processor/src/main/java/org/mapstruct/ap/model/source/MappedProperty.java
index 8a0d4f30f..a5a0fe92f 100644
--- a/processor/src/main/java/org/mapstruct/ap/model/source/MappedProperty.java
+++ b/processor/src/main/java/org/mapstruct/ap/model/source/MappedProperty.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java b/processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java
index b1ead8148..77551bc7b 100644
--- a/processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java
+++ b/processor/src/main/java/org/mapstruct/ap/model/source/Mapping.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/Method.java b/processor/src/main/java/org/mapstruct/ap/model/source/Method.java
index 3e1133afe..532748be2 100644
--- a/processor/src/main/java/org/mapstruct/ap/model/source/Method.java
+++ b/processor/src/main/java/org/mapstruct/ap/model/source/Method.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/model/source/Parameter.java b/processor/src/main/java/org/mapstruct/ap/model/source/Parameter.java
index 81982985c..e4edf7947 100644
--- a/processor/src/main/java/org/mapstruct/ap/model/source/Parameter.java
+++ b/processor/src/main/java/org/mapstruct/ap/model/source/Parameter.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/util/Filters.java b/processor/src/main/java/org/mapstruct/ap/util/Filters.java
index 834b9eb2d..1e932efb2 100644
--- a/processor/src/main/java/org/mapstruct/ap/util/Filters.java
+++ b/processor/src/main/java/org/mapstruct/ap/util/Filters.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/util/TypeUtil.java b/processor/src/main/java/org/mapstruct/ap/util/TypeUtil.java
index f0d2fef8a..b4484e36c 100644
--- a/processor/src/main/java/org/mapstruct/ap/util/TypeUtil.java
+++ b/processor/src/main/java/org/mapstruct/ap/util/TypeUtil.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/java/org/mapstruct/ap/writer/ModelWriter.java b/processor/src/main/java/org/mapstruct/ap/writer/ModelWriter.java
index 95c860910..032c8b0ce 100644
--- a/processor/src/main/java/org/mapstruct/ap/writer/ModelWriter.java
+++ b/processor/src/main/java/org/mapstruct/ap/writer/ModelWriter.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/main/resources/mapper-implementation.ftl b/processor/src/main/resources/mapper-implementation.ftl
index b10634a22..f8f36aefd 100644
--- a/processor/src/main/resources/mapper-implementation.ftl
+++ b/processor/src/main/resources/mapper-implementation.ftl
@@ -1,6 +1,9 @@
 <#--
 
      Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+     and/or other contributors as indicated by the @authors tag. See the
+     copyright.txt file in the distribution for a full listing of all
+     contributors.
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/CollectionMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/CollectionMappingTest.java
index 49ec8c944..7ab530460 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/CollectionMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/CollectionMappingTest.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/Colour.java b/processor/src/test/java/org/mapstruct/ap/test/collection/Colour.java
index 62968100e..563af35e9 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/Colour.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/Colour.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/Source.java b/processor/src/test/java/org/mapstruct/ap/test/collection/Source.java
index 069b74b95..f80218111 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/Source.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/Source.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/SourceTargetMapper.java
index 476b83ec4..b522c333c 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/SourceTargetMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/SourceTargetMapper.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/Target.java b/processor/src/test/java/org/mapstruct/ap/test/collection/Target.java
index 4e872da28..6bea9d25b 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/Target.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/Target.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/DefaultCollectionImplementationTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/DefaultCollectionImplementationTest.java
index b02859ad2..a9c6d2634 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/DefaultCollectionImplementationTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/DefaultCollectionImplementationTest.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/Source.java b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/Source.java
index 601716fb4..4b7d2ed91 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/Source.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/Source.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/SourceFoo.java b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/SourceFoo.java
index 31c372218..aa3dec200 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/SourceFoo.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/SourceFoo.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/SourceTargetMapper.java
index 6aa597ee7..4953c6a89 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/SourceTargetMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/SourceTargetMapper.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/Target.java b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/Target.java
index 729afbd2b..c8fcc1f3e 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/Target.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/Target.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/TargetFoo.java b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/TargetFoo.java
index af6bce8a1..e9bb7f73c 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/TargetFoo.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/defaultimplementation/TargetFoo.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/erronuous/ErronuousCollectionMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/erronuous/ErronuousCollectionMappingTest.java
index 6e78daa71..e6dda2f0d 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/erronuous/ErronuousCollectionMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/erronuous/ErronuousCollectionMappingTest.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -33,8 +36,8 @@ public class ErronuousCollectionMappingTest extends MapperTestBase {
     @ExpectedCompilationOutcome(
         value = CompilationResult.FAILED,
         diagnostics = {
-            @Diagnostic(type = ErronuousMapper.class, kind = Kind.ERROR, line = 25),
-            @Diagnostic(type = ErronuousMapper.class, kind = Kind.ERROR, line = 27)
+            @Diagnostic(type = ErronuousMapper.class, kind = Kind.ERROR, line = 28),
+            @Diagnostic(type = ErronuousMapper.class, kind = Kind.ERROR, line = 30)
         }
     )
     public void shouldFailToGenerateMappingFromListToString() {
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/erronuous/ErronuousMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/erronuous/ErronuousMapper.java
index 9eaf9a22e..c1f7b4abc 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/erronuous/ErronuousMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/erronuous/ErronuousMapper.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/IterableToNonIterableMappingTest.java b/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/IterableToNonIterableMappingTest.java
index 6afe868eb..cebe4ed1a 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/IterableToNonIterableMappingTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/IterableToNonIterableMappingTest.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/Source.java b/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/Source.java
index 91268f967..a599ad3b2 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/Source.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/Source.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/SourceTargetMapper.java
index 84890e492..23cd7c841 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/SourceTargetMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/SourceTargetMapper.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/StringListMapper.java b/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/StringListMapper.java
index c362efc1d..bceb0ff74 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/StringListMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/StringListMapper.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/Target.java b/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/Target.java
index 00cd2ebd3..fac754f1d 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/Target.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/collection/iterabletononiterable/Target.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/complex/Car.java b/processor/src/test/java/org/mapstruct/ap/test/complex/Car.java
index 993bbb857..4857de531 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/complex/Car.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/Car.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/complex/CarDto.java b/processor/src/test/java/org/mapstruct/ap/test/complex/CarDto.java
index 8dabeb940..760fcdca5 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/complex/CarDto.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/CarDto.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapper.java b/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapper.java
index 73fcfc137..1701d3806 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapper.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapperTest.java b/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapperTest.java
index 5e179d3f6..9654689ae 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapperTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/CarMapperTest.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/complex/Category.java b/processor/src/test/java/org/mapstruct/ap/test/complex/Category.java
index 40647826f..e4ca9a11e 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/complex/Category.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/Category.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/complex/DateMapper.java b/processor/src/test/java/org/mapstruct/ap/test/complex/DateMapper.java
index 9eecf3fac..a5594bce2 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/complex/DateMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/DateMapper.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/complex/Person.java b/processor/src/test/java/org/mapstruct/ap/test/complex/Person.java
index 2ee12356c..85e4270ab 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/complex/Person.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/Person.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/complex/PersonDto.java b/processor/src/test/java/org/mapstruct/ap/test/complex/PersonDto.java
index 8f60d77eb..9acc6490d 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/complex/PersonDto.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/complex/PersonDto.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/ConversionTest.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/ConversionTest.java
index dcb86f69d..f4f475946 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/ConversionTest.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/ConversionTest.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/Source.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/Source.java
index 6c7aba349..15b65e51b 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/Source.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/Source.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/SourceTargetMapper.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/SourceTargetMapper.java
index 27c06a8dc..5b3908cc4 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/SourceTargetMapper.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/SourceTargetMapper.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/test/conversion/Target.java b/processor/src/test/java/org/mapstruct/ap/test/conversion/Target.java
index 589348cdf..d29421b72 100644
--- a/processor/src/test/java/org/mapstruct/ap/test/conversion/Target.java
+++ b/processor/src/test/java/org/mapstruct/ap/test/conversion/Target.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/IssueKey.java b/processor/src/test/java/org/mapstruct/ap/testutil/IssueKey.java
index e746bdaeb..517236eda 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/IssueKey.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/IssueKey.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/MapperTestBase.java b/processor/src/test/java/org/mapstruct/ap/testutil/MapperTestBase.java
index a72c024da..4d171229e 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/MapperTestBase.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/MapperTestBase.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/WithClasses.java b/processor/src/test/java/org/mapstruct/ap/testutil/WithClasses.java
index b8a393ca0..2c4f58f56 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/WithClasses.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/WithClasses.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/annotation/CompilationResult.java b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/annotation/CompilationResult.java
index 412857c86..13c5c82d3 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/annotation/CompilationResult.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/annotation/CompilationResult.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/annotation/Diagnostic.java b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/annotation/Diagnostic.java
index f2cb3144d..4a3a38a1c 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/annotation/Diagnostic.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/annotation/Diagnostic.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/annotation/ExpectedCompilationOutcome.java b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/annotation/ExpectedCompilationOutcome.java
index cf6b5ca71..24e23e3cc 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/annotation/ExpectedCompilationOutcome.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/annotation/ExpectedCompilationOutcome.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/CompilationOutcomeDescriptor.java b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/CompilationOutcomeDescriptor.java
index fc70f097f..1f808876d 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/CompilationOutcomeDescriptor.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/CompilationOutcomeDescriptor.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
diff --git a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java
index 924d2d942..79c7f7515 100644
--- a/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java
+++ b/processor/src/test/java/org/mapstruct/ap/testutil/compilation/model/DiagnosticDescriptor.java
@@ -1,5 +1,8 @@
 /**
  *  Copyright 2012-2013 Gunnar Morling (http://www.gunnarmorling.de/)
+ *  and/or other contributors as indicated by the @authors tag. See the
+ *  copyright.txt file in the distribution for a full listing of all
+ *  contributors.
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.