From fc12c6f95bcf121f6dde372d81ed3408011c3b5d Mon Sep 17 00:00:00 2001
From: "felipe.felix" <felipe.felix@danone.com>
Date: Mon, 24 Aug 2026 15:59:14 -0700
Subject: [PATCH 1/3] feat!: migrate project to latest eclipse 2026-06 release

---
 .mvn/jvm.config                               |  2 +
 org.mapstruct.eclipse.feature/feature.xml     |  6 +--
 .../mapstruct-eclipse.target                  | 12 +++++
 org.mapstruct.eclipse.target/pom.xml          | 39 ++++++++++++++
 org.mapstruct.eclipse/META-INF/MANIFEST.MF    |  8 +--
 ...gAnnotationCompletionProposalComputer.java |  2 +-
 .../internal/quickfix/MapStructQuickFix.java  | 52 +++++--------------
 parent/pom.xml                                | 41 +++++++++------
 pom.xml                                       |  1 +
 9 files changed, 99 insertions(+), 64 deletions(-)
 create mode 100644 .mvn/jvm.config
 create mode 100644 org.mapstruct.eclipse.target/mapstruct-eclipse.target
 create mode 100644 org.mapstruct.eclipse.target/pom.xml

diff --git a/.mvn/jvm.config b/.mvn/jvm.config
new file mode 100644
index 0000000..4129597
--- /dev/null
+++ b/.mvn/jvm.config
@@ -0,0 +1,2 @@
+-Djdk.xml.maxGeneralEntitySizeLimit=0
+-Djdk.xml.totalEntitySizeLimit=0
diff --git a/org.mapstruct.eclipse.feature/feature.xml b/org.mapstruct.eclipse.feature/feature.xml
index 11e91f1..c1ab68e 100644
--- a/org.mapstruct.eclipse.feature/feature.xml
+++ b/org.mapstruct.eclipse.feature/feature.xml
@@ -50,7 +50,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
    </copyright>
 
-   <license url="http://www.apache.org/licenses/LICENSE-2.0">
+   <license url="https://www.apache.org/licenses/LICENSE-2.0">
       Copyright 2012-2017 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
@@ -70,8 +70,8 @@ limitations under the License.
    </license>
 
    <url>
-      <update label="MapStruct Eclipse Plugin Update Site" url="https://dl.bintray.com/mapstruct/mapstruct-eclipse-site/"/>
-      <discovery label="MapStruct" url="http://www.mapstruct.org"/>
+      <update label="MapStruct Eclipse Plugin Project" url="https://github.com/mapstruct/mapstruct-eclipse"/>
+      <discovery label="MapStruct" url="https://mapstruct.org"/>
    </url>
 
    <requires>
diff --git a/org.mapstruct.eclipse.target/mapstruct-eclipse.target b/org.mapstruct.eclipse.target/mapstruct-eclipse.target
new file mode 100644
index 0000000..f580a5c
--- /dev/null
+++ b/org.mapstruct.eclipse.target/mapstruct-eclipse.target
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.8"?>
+<target name="MapStruct Eclipse Target Platform" sequenceNumber="1">
+    <locations>
+        <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
+            <repository location="https://download.eclipse.org/releases/2026-06"/>
+            <unit id="org.eclipse.platform.ide" version="0.0.0"/>
+            <unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
+            <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
+        </location>
+    </locations>
+</target>
diff --git a/org.mapstruct.eclipse.target/pom.xml b/org.mapstruct.eclipse.target/pom.xml
new file mode 100644
index 0000000..f2985c9
--- /dev/null
+++ b/org.mapstruct.eclipse.target/pom.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+     Copyright 2012-2017 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.
+     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.
+
+-->
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.mapstruct</groupId>
+        <artifactId>mapstruct-eclipse-parent</artifactId>
+        <version>0.1.0-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
+    </parent>
+
+    <artifactId>org.mapstruct.eclipse.target</artifactId>
+    <packaging>eclipse-target-definition</packaging>
+
+    <name>MapStruct Eclipse target platform</name>
+
+</project>
diff --git a/org.mapstruct.eclipse/META-INF/MANIFEST.MF b/org.mapstruct.eclipse/META-INF/MANIFEST.MF
index 9e41db6..a69403f 100644
--- a/org.mapstruct.eclipse/META-INF/MANIFEST.MF
+++ b/org.mapstruct.eclipse/META-INF/MANIFEST.MF
@@ -9,9 +9,9 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.jdt.core,
  org.eclipse.jdt.ui,
  org.eclipse.jface.text,
- org.eclipse.ui.ide;bundle-version="3.10.0",
- org.eclipse.core.resources;bundle-version="3.9.0",
- org.eclipse.ui.editors;bundle-version="3.8.200"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+ org.eclipse.ui.ide,
+ org.eclipse.core.resources,
+ org.eclipse.ui.editors
+Bundle-RequiredExecutionEnvironment: JavaSE-21
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: MapStruct.org
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/MappingAnnotationCompletionProposalComputer.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/MappingAnnotationCompletionProposalComputer.java
index d3301b5..a7f0575 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/MappingAnnotationCompletionProposalComputer.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/MappingAnnotationCompletionProposalComputer.java
@@ -65,7 +65,7 @@ protected List<ICompletionProposal> getProposals(final ICompilationUnit compilat
 
         List<ICompletionProposal> returnValue = new ArrayList<ICompletionProposal>();
 
-        ASTParser parser = ASTParser.newParser( AST.JLS8 );
+        ASTParser parser = ASTParser.newParser( AST.getJLSLatest() );
         parser.setKind( ASTParser.K_COMPILATION_UNIT );
         parser.setSource( compilationUnit );
         parser.setResolveBindings( true );
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/MapStructQuickFix.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/MapStructQuickFix.java
index cdbe05c..e640377 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/MapStructQuickFix.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/MapStructQuickFix.java
@@ -18,8 +18,6 @@
  */
 package org.mapstruct.eclipse.internal.quickfix;
 
-import java.util.Iterator;
-
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.CoreException;
@@ -28,22 +26,16 @@
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.dom.AST;
 import org.eclipse.jdt.core.dom.ASTNode;
+import org.eclipse.jdt.core.dom.ASTParser;
 import org.eclipse.jdt.core.dom.CompilationUnit;
 import org.eclipse.jdt.core.dom.ImportDeclaration;
 import org.eclipse.jdt.core.dom.PrimitiveType;
 import org.eclipse.jdt.core.dom.rewrite.ASTRewrite;
-import org.eclipse.jdt.internal.ui.JavaPlugin;
-import org.eclipse.jdt.internal.ui.JavaPluginImages;
-import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility;
-import org.eclipse.jdt.internal.ui.text.correction.ASTResolving;
+import org.eclipse.jdt.ui.ISharedImages;
+import org.eclipse.jdt.ui.JavaUI;
 import org.eclipse.jdt.ui.SharedASTProvider;
-import org.eclipse.jface.text.Position;
-import org.eclipse.jface.text.source.Annotation;
-import org.eclipse.jface.text.source.IAnnotationModel;
 import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IMarkerResolution2;
-import org.eclipse.ui.texteditor.MarkerAnnotation;
 import org.mapstruct.eclipse.internal.quickfix.visitors.FindMethodByPositionVisitor;
 
 /**
@@ -51,7 +43,6 @@
  *
  * @author Andreas Gudian
  */
-@SuppressWarnings("restriction")
 public abstract class MapStructQuickFix implements IMarkerResolution2 {
 
     @Override
@@ -62,12 +53,11 @@ public void run(IMarker marker) {
             IJavaElement javaElement = JavaCore.create( resource );
 
             compilationUnit = (ICompilationUnit) javaElement.getAdapter( ICompilationUnit.class );
-            IEditorInput input = EditorUtility.getEditorInput( compilationUnit );
-            if ( input != null ) {
+            if ( compilationUnit != null ) {
                 CompilationUnit astCompilationUnit = toAST( compilationUnit );
 
                 ASTNode locatedNode =
-                    locateASTNodeForSartingOffset( findProblemStart( input, marker ), astCompilationUnit );
+                    locateASTNodeForSartingOffset( findProblemStart( marker ), astCompilationUnit );
                 if ( locatedNode != null ) {
                     ASTRewrite rewrite = getASTRewrite( astCompilationUnit, locatedNode, marker );
 
@@ -87,32 +77,11 @@ public void run(IMarker marker) {
     }
 
     /**
-     * @param input editor input
      * @param marker the marker
-     * @return the offset of the problem, either as currently computed in an open (dirty) editor, or as originally
-     *         stated in the marker
+     * @return marker start offset or -1 when unavailable
      * @throws CoreException
      */
-    private static int findProblemStart(IEditorInput input, IMarker marker) throws CoreException {
-        IAnnotationModel model =
-            JavaPlugin.getDefault().getCompilationUnitDocumentProvider().getAnnotationModel( input );
-        if ( model != null ) {
-            Iterator<Annotation> iter = model.getAnnotationIterator();
-
-            while ( iter.hasNext() ) {
-                Annotation curr = iter.next();
-                if ( curr instanceof MarkerAnnotation ) {
-                    MarkerAnnotation annot = (MarkerAnnotation) curr;
-                    if ( marker.equals( annot.getMarker() ) ) {
-                        Position pos = model.getPosition( annot );
-                        if ( pos != null ) {
-                            return pos.getOffset();
-                        }
-                    }
-                }
-            }
-        }
-
+    private static int findProblemStart(IMarker marker) throws CoreException {
         Integer charStart = (Integer) marker.getAttribute( IMarker.CHAR_START );
 
         return charStart != null ? charStart : -1;
@@ -210,13 +179,16 @@ public String getDescription() {
 
     @Override
     public Image getImage() {
-        return JavaPluginImages.get( JavaPluginImages.IMG_CORRECTION_CHANGE );
+        return JavaUI.getSharedImages().getImage( ISharedImages.IMG_OBJS_PUBLIC );
     }
 
     private static CompilationUnit toAST(ICompilationUnit unit) {
         CompilationUnit astRoot = SharedASTProvider.getAST( unit, SharedASTProvider.WAIT_YES, null );
         if ( astRoot == null ) {
-            astRoot = ASTResolving.createQuickFixAST( unit, null );
+            ASTParser parser = ASTParser.newParser( AST.getJLSLatest() );
+            parser.setSource( unit );
+            parser.setResolveBindings( true );
+            astRoot = (CompilationUnit) parser.createAST( null );
         }
         return astRoot;
     }
diff --git a/parent/pom.xml b/parent/pom.xml
index df5b630..f921b0f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -31,14 +31,14 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <tycho.version>0.22.0</tycho.version>
-        <tycho-extras.version>0.22.0</tycho-extras.version>
+        <tycho.version>4.0.12</tycho.version>
+        <eclipse.release.repository>https://download.eclipse.org/releases/2026-06</eclipse.release.repository>
     </properties>
 
     <licenses>
         <license>
             <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
             <distribution>repo</distribution>
         </license>
     </licenses>
@@ -68,9 +68,9 @@
 
     <repositories>
         <repository>
-            <id>eclipse-luna</id>
+            <id>eclipse-release</id>
             <layout>p2</layout>
-            <url>http://download.eclipse.org/releases/luna</url>
+            <url>${eclipse.release.repository}</url>
         </repository>
     </repositories>
 
@@ -81,17 +81,19 @@
                     <groupId>org.eclipse.tycho</groupId>
                     <artifactId>tycho-packaging-plugin</artifactId>
                     <version>${tycho.version}</version>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.eclipse.tycho.extras</groupId>
-                            <artifactId>tycho-buildtimestamp-jgit</artifactId>
-                            <version>${tycho-extras.version}</version>
-                        </dependency>
-                    </dependencies>
+                </plugin>
+                <plugin>
+                    <groupId>org.eclipse.tycho</groupId>
+                    <artifactId>target-platform-configuration</artifactId>
+                    <version>${tycho.version}</version>
                     <configuration>
-                        <timestampProvider>jgit</timestampProvider>
-                        <jgit.ignore>pom.xml</jgit.ignore>
-                        <jgit.dirtyWorkingTree>warning</jgit.dirtyWorkingTree>
+                        <target>
+                            <artifact>
+                                <groupId>${project.groupId}</groupId>
+                                <artifactId>org.mapstruct.eclipse.target</artifactId>
+                                <version>${project.version}</version>
+                            </artifact>
+                        </target>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -115,7 +117,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.2</version>
+                    <version>3.1.4</version>
                 </plugin>
             </plugins>
         </pluginManagement>
@@ -126,6 +128,10 @@
                 <version>${tycho.version}</version>
                 <extensions>true</extensions>
             </plugin>
+            <plugin>
+                <groupId>org.eclipse.tycho</groupId>
+                <artifactId>target-platform-configuration</artifactId>
+            </plugin>
             <plugin>
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
@@ -141,6 +147,9 @@
                         <exclude>.gitattributes</exclude>
                         <exclude>.gitignore</exclude>
                         <exclude>.checkstyle</exclude>
+                        <exclude>.mvn/**</exclude>
+                        <exclude>**/*.target</exclude>
+                        <exclude>**/.tycho-consumer-pom.xml</exclude>
                     </excludes>
                 </configuration>
                 <executions>
diff --git a/pom.xml b/pom.xml
index 82eb112..7c47a47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,7 @@
 
     <modules>
         <module>build-config</module>
+        <module>org.mapstruct.eclipse.target</module>
         <module>org.mapstruct.eclipse</module>
         <module>org.mapstruct.eclipse.feature</module>
         <module>org.mapstruct.eclipse.repository</module>

From 7e1c4e7a4b658c6926e0f8d14944e4d277070887 Mon Sep 17 00:00:00 2001
From: "felipe.felix" <felipe.felix@danone.com>
Date: Mon, 24 Aug 2026 16:06:43 -0700
Subject: [PATCH 2/3] feat: harden checkstyle to newer conventions

---
 .../src/main/resources/build-config/checkstyle.xml  | 13 ++++++-------
 org.mapstruct.eclipse/pom.xml                       |  4 +++-
 parent/pom.xml                                      |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/build-config/src/main/resources/build-config/checkstyle.xml b/build-config/src/main/resources/build-config/checkstyle.xml
index ac0e835..6a0f868 100644
--- a/build-config/src/main/resources/build-config/checkstyle.xml
+++ b/build-config/src/main/resources/build-config/checkstyle.xml
@@ -7,6 +7,7 @@
 <!-- Based on sun_checks.xml from the CheckStyle distribution -->
 
 <module name="Checker">
+    <property name="cacheFile" value="${checkstyle.cache.file}"/>
     <!--
         If you set the basedir property below, then all reported file
         names will be relative to the specified directory. See
@@ -29,6 +30,10 @@
 
     <module name="FileLength"/>
 
+    <module name="LineLength">
+        <property name="max" value="120"/>
+    </module>
+
     <!-- Following interprets the header file as regular expressions. -->
     <!-- <module name="RegexpHeader"/>                                -->
 
@@ -60,11 +65,9 @@
 
     <module name="TreeWalker">
 
-        <property name="cacheFile" value="${checkstyle.cache.file}"/>
-
         <!-- Required for SuppressionCommentFilter -->
-        <module name="FileContentsHolder"/>
         <module name="SuppressWarningsHolder"/>
+        <module name="SuppressionCommentFilter"/>
 
         <!-- Checks for Javadoc comments.                     -->
         <!-- See http://checkstyle.sf.net/config_javadoc.html -->
@@ -114,9 +117,6 @@
 
         <!-- Checks for Size Violations.                    -->
         <!-- See http://checkstyle.sf.net/config_sizes.html -->
-        <module name="LineLength">
-            <property name="max" value="120"/>
-        </module>
         <module name="MethodLength"/>
         <module name="ParameterNumber">
             <property name="max" value="10"/>
@@ -196,7 +196,6 @@
 
     </module>
 
-    <module name="SuppressionCommentFilter"/>
     <module name="SuppressWarningsFilter"/>
 
 </module>
diff --git a/org.mapstruct.eclipse/pom.xml b/org.mapstruct.eclipse/pom.xml
index dc6fbdd..fc48d2c 100644
--- a/org.mapstruct.eclipse/pom.xml
+++ b/org.mapstruct.eclipse/pom.xml
@@ -42,7 +42,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
                 <configuration>
-                    <sourceDirectory>src</sourceDirectory>
+                    <sourceDirectories>
+                        <sourceDirectory>src</sourceDirectory>
+                    </sourceDirectories>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/parent/pom.xml b/parent/pom.xml
index f921b0f..cc06487 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -104,7 +104,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-checkstyle-plugin</artifactId>
-                    <version>2.12.1</version>
+                    <version>3.6.0</version>
                     <configuration>
                         <configLocation>${basedir}/../build-config/src/main/resources/build-config/checkstyle.xml</configLocation>
                         <consoleOutput>true</consoleOutput>

From 2d6f27529a7326b140f1276721c823cd8b1070da Mon Sep 17 00:00:00 2001
From: "felipe.felix" <felipe.felix@danone.com>
Date: Mon, 24 Aug 2026 16:38:12 -0700
Subject: [PATCH 3/3] fix: normalize license 4.6 usage across files

---
 .../build.properties                          | 14 ++++++
 org.mapstruct.eclipse/build.properties        | 14 ++++++
 .../internal/MapStructAPIConstants.java       | 15 +++++-
 .../eclipse/internal/MapStructPlugIn.java     | 15 +++++-
 ...tAnnotationCompletionProposalComputer.java | 15 +++++-
 ...rAnnotationCompletionProposalComputer.java | 15 +++++-
 ...gAnnotationCompletionProposalComputer.java | 15 +++++-
 .../PropertyNameProposalCollector.java        | 15 +++++-
 .../MapStructMarkerResolutionGenerator.java   | 15 +++++-
 .../internal/quickfix/MapStructQuickFix.java  | 15 +++++-
 .../internal/quickfix/QuickFixFactory.java    | 15 +++++-
 .../factories/CantMapPropertyQFFactory.java   | 15 +++++-
 .../UnmappedTargetPropertyQFFactory.java      | 15 +++++-
 ...IgnoreTargetMappingAnnotationQuickFix.java | 15 +++++-
 .../quickfix/fixes/AddMethodQuickFix.java     | 15 +++++-
 .../visitors/FindAnnotationByNameVisitor.java | 15 +++++-
 .../visitors/FindMethodByPositionVisitor.java | 15 +++++-
 .../eclipse/internal/util/Bindings.java       | 15 +++++-
 .../eclipse/internal/util/Ranges.java         | 15 +++++-
 parent/pom.xml                                | 49 +++++++++++++------
 pom.xml                                       | 15 ------
 21 files changed, 300 insertions(+), 47 deletions(-)

diff --git a/org.mapstruct.eclipse.feature/build.properties b/org.mapstruct.eclipse.feature/build.properties
index 747e3b2..0bb0c80 100644
--- a/org.mapstruct.eclipse.feature/build.properties
+++ b/org.mapstruct.eclipse.feature/build.properties
@@ -17,4 +17,18 @@
 #  limitations under the License.
 #
 
+#
+# //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.
+# //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.
+#
+
 bin.includes = feature.xml
diff --git a/org.mapstruct.eclipse/build.properties b/org.mapstruct.eclipse/build.properties
index 03921e9..73f01fd 100644
--- a/org.mapstruct.eclipse/build.properties
+++ b/org.mapstruct.eclipse/build.properties
@@ -17,6 +17,20 @@
 #  limitations under the License.
 #
 
+#
+# //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.
+# //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.
+#
+
 source.. = src/
 bin.includes = .,\
                META-INF/,\
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/MapStructAPIConstants.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/MapStructAPIConstants.java
index 33f80d1..0d7b052 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/MapStructAPIConstants.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/MapStructAPIConstants.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal;
 
 /**
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/MapStructPlugIn.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/MapStructPlugIn.java
index cb8d40b..8039e71 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/MapStructPlugIn.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/MapStructPlugIn.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal;
 
 import org.eclipse.ui.plugin.AbstractUIPlugin;
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/AbstractAnnotationCompletionProposalComputer.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/AbstractAnnotationCompletionProposalComputer.java
index 030aeff..3cab951 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/AbstractAnnotationCompletionProposalComputer.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/AbstractAnnotationCompletionProposalComputer.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal.proposal;
 
 import java.util.Collections;
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/MapperAnnotationCompletionProposalComputer.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/MapperAnnotationCompletionProposalComputer.java
index c0eaaf6..a12b423 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/MapperAnnotationCompletionProposalComputer.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/MapperAnnotationCompletionProposalComputer.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal.proposal;
 
 import java.util.ArrayList;
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/MappingAnnotationCompletionProposalComputer.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/MappingAnnotationCompletionProposalComputer.java
index a7f0575..88fc184 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/MappingAnnotationCompletionProposalComputer.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/MappingAnnotationCompletionProposalComputer.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal.proposal;
 
 import static org.mapstruct.eclipse.internal.MapStructAPIConstants.MAPPINGS_FQ_NAME;
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/visitors/PropertyNameProposalCollector.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/visitors/PropertyNameProposalCollector.java
index bade83a..df9d199 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/visitors/PropertyNameProposalCollector.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/proposal/visitors/PropertyNameProposalCollector.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal.proposal.visitors;
 
 import static org.mapstruct.eclipse.internal.MapStructAPIConstants.CONTEXT_FQ_NAME;
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/MapStructMarkerResolutionGenerator.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/MapStructMarkerResolutionGenerator.java
index 6650dea..983b854 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/MapStructMarkerResolutionGenerator.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/MapStructMarkerResolutionGenerator.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal.quickfix;
 
 import java.util.ArrayList;
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/MapStructQuickFix.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/MapStructQuickFix.java
index e640377..2ef730c 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/MapStructQuickFix.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/MapStructQuickFix.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal.quickfix;
 
 import org.eclipse.core.resources.IMarker;
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/QuickFixFactory.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/QuickFixFactory.java
index ffb3f58..0e41151 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/QuickFixFactory.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/QuickFixFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal.quickfix;
 
 import java.util.List;
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/factories/CantMapPropertyQFFactory.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/factories/CantMapPropertyQFFactory.java
index 68f734a..8e0ae2a 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/factories/CantMapPropertyQFFactory.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/factories/CantMapPropertyQFFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal.quickfix.factories;
 
 import java.util.ArrayList;
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/factories/UnmappedTargetPropertyQFFactory.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/factories/UnmappedTargetPropertyQFFactory.java
index b98349e..d7e6da3 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/factories/UnmappedTargetPropertyQFFactory.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/factories/UnmappedTargetPropertyQFFactory.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal.quickfix.factories;
 
 import java.util.Arrays;
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/fixes/AddIgnoreTargetMappingAnnotationQuickFix.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/fixes/AddIgnoreTargetMappingAnnotationQuickFix.java
index 4eb48ee..31d4588 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/fixes/AddIgnoreTargetMappingAnnotationQuickFix.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/fixes/AddIgnoreTargetMappingAnnotationQuickFix.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal.quickfix.fixes;
 
 import static org.mapstruct.eclipse.internal.MapStructAPIConstants.MAPPINGS_FQ_NAME;
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/fixes/AddMethodQuickFix.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/fixes/AddMethodQuickFix.java
index f2539ba..4c2d067 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/fixes/AddMethodQuickFix.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/fixes/AddMethodQuickFix.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal.quickfix.fixes;
 
 import org.eclipse.core.resources.IMarker;
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/visitors/FindAnnotationByNameVisitor.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/visitors/FindAnnotationByNameVisitor.java
index 14b4baa..d573072 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/visitors/FindAnnotationByNameVisitor.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/visitors/FindAnnotationByNameVisitor.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal.quickfix.visitors;
 
 import org.eclipse.jdt.core.dom.ASTVisitor;
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/visitors/FindMethodByPositionVisitor.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/visitors/FindMethodByPositionVisitor.java
index 7c13b1c..53c8a57 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/visitors/FindMethodByPositionVisitor.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/quickfix/visitors/FindMethodByPositionVisitor.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal.quickfix.visitors;
 
 import org.eclipse.jdt.core.dom.ASTNode;
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/util/Bindings.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/util/Bindings.java
index 97fd8cf..8fd5dc6 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/util/Bindings.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/util/Bindings.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal.util;
 
 import java.util.ArrayList;
diff --git a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/util/Ranges.java b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/util/Ranges.java
index 86412af..5ffda7a 100644
--- a/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/util/Ranges.java
+++ b/org.mapstruct.eclipse/src/org/mapstruct/eclipse/internal/util/Ranges.java
@@ -1,4 +1,4 @@
-/**
+/*
  *  Copyright 2012-2017 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
@@ -16,6 +16,19 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+/*
+ * //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.
+ * //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.
+ */
 package org.mapstruct.eclipse.internal.util;
 
 /**
diff --git a/parent/pom.xml b/parent/pom.xml
index cc06487..cc1b37d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -99,7 +99,7 @@
                 <plugin>
                     <groupId>com.mycila</groupId>
                     <artifactId>license-maven-plugin</artifactId>
-                    <version>2.7</version>
+                    <version>4.6</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -136,21 +136,40 @@
                 <groupId>com.mycila</groupId>
                 <artifactId>license-maven-plugin</artifactId>
                 <configuration>
-                    <header>../LICENSE.txt</header>
                     <strictCheck>true</strictCheck>
-                    <excludes>
-                        <exclude>.idea/**</exclude>
-                        <exclude>**/build-config/checkstyle.xml</exclude>
-                        <exclude>copyright.txt</exclude>
-                        <exclude>**/LICENSE.txt</exclude>
-                        <exclude>README.md</exclude>
-                        <exclude>.gitattributes</exclude>
-                        <exclude>.gitignore</exclude>
-                        <exclude>.checkstyle</exclude>
-                        <exclude>.mvn/**</exclude>
-                        <exclude>**/*.target</exclude>
-                        <exclude>**/.tycho-consumer-pom.xml</exclude>
-                    </excludes>
+                    <useDefaultExcludes>true</useDefaultExcludes>
+                    <licenseSets>
+                        <licenseSet>
+                            <header>${maven.multiModuleProjectDirectory}/LICENSE.txt</header>
+                            <includes>
+                                <include>**/*.java</include>
+                                <include>**/*.xml</include>
+                                <include>**/*.properties</include>
+                                <include>**/*.MF</include>
+                            </includes>
+                            <excludes>
+                                <exclude>**/pom.xml</exclude>
+                                <exclude>**/target/**</exclude>
+                                <exclude>**/generated-sources/**</exclude>
+                                <exclude>**/generated-test-sources/**</exclude>
+                                <exclude>**/.tycho-consumer-pom.xml</exclude>
+                                <exclude>**/build-config/checkstyle.xml</exclude>
+                                <exclude>**/LICENSE.txt</exclude>
+                                <exclude>**/*.target</exclude>
+                                <exclude>**/*.png</exclude>
+                                <exclude>**/*.jar</exclude>
+                                <exclude>**/*.zip</exclude>
+                                <exclude>**/META-INF/MANIFEST.MF</exclude>
+                                <exclude>copyright.txt</exclude>
+                                <exclude>README.md</exclude>
+                                <exclude>.idea/**</exclude>
+                                <exclude>.gitattributes</exclude>
+                                <exclude>.gitignore</exclude>
+                                <exclude>.checkstyle</exclude>
+                                <exclude>.mvn/**</exclude>
+                            </excludes>
+                        </licenseSet>
+                    </licenseSets>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/pom.xml b/pom.xml
index 7c47a47..1cdd456 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,19 +44,4 @@
         <module>org.mapstruct.eclipse.repository</module>
     </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.mycila</groupId>
-                <artifactId>license-maven-plugin</artifactId>
-                <configuration>
-                    <header>LICENSE.txt</header>
-                    <excludes>
-                        <exclude>copyright.txt</exclude>
-                    </excludes>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
 </project>