diff --git a/pom.xml b/pom.xml
index 7e5929e2a..0de24e24d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -598,10 +598,12 @@
                 <configuration>
                     <quiet>true</quiet>
                     <additionalparam>-Xdoclint:none</additionalparam>
+                    <source>8</source>
                     <links>
                         <link>http://download.oracle.com/javaee/7/api/</link>
                         <link>http://download.oracle.com/javase/8/docs/api/</link>
                         <link>http://myfaces.apache.org/core22/myfaces-api/apidocs/</link>
+                        <link>http://docs.oracle.com/javase/8/docs/api/</link>
                     </links>
                 </configuration>
             </plugin>
@@ -636,10 +638,12 @@
                 <configuration>
                     <quiet>true</quiet>
                     <additionalparam>-Xdoclint:none</additionalparam>
+                    <source>8</source>
                     <links>
                         <link>http://download.oracle.com/javaee/7/api/</link>
                         <link>http://download.oracle.com/javase/8/docs/api/</link>
                         <link>http://myfaces.apache.org/core22/myfaces-api/apidocs/</link>
+                        <link>http://docs.oracle.com/javase/8/docs/api/</link>
                     </links>
                 </configuration>
                 <reportSets>
diff --git a/webbeans-spi/src/main/java/org/apache/webbeans/spi/DefiningClassService.java b/webbeans-spi/src/main/java/org/apache/webbeans/spi/DefiningClassService.java
index 3bda2cd91..e86340683 100644
--- a/webbeans-spi/src/main/java/org/apache/webbeans/spi/DefiningClassService.java
+++ b/webbeans-spi/src/main/java/org/apache/webbeans/spi/DefiningClassService.java
@@ -20,7 +20,7 @@
 
 /**
  * SPI interface to implement the proxy defining logic.
- * It enables to switch from unsafe to classloader logic for instance for java >= 9.
+ * It enables to switch from unsafe to classloader logic for instance for java @gt;= 9.
  */
 public interface DefiningClassService
 {
diff --git a/webbeans-spi/src/main/java/org/apache/webbeans/spi/ResourceInjectionService.java b/webbeans-spi/src/main/java/org/apache/webbeans/spi/ResourceInjectionService.java
index a50dc9300..1c014c042 100644
--- a/webbeans-spi/src/main/java/org/apache/webbeans/spi/ResourceInjectionService.java
+++ b/webbeans-spi/src/main/java/org/apache/webbeans/spi/ResourceInjectionService.java
@@ -58,7 +58,7 @@ public interface ResourceInjectionService
      * For example;
      * <p>
      * <code>
-     * {@link @Produces} &#064;MyPersistenceContext PersistenceContext EntityManager manager;
+     * @javax.enterprise.inject.Produces &#064;MyPersistenceContext PersistenceContext EntityManager manager;
      * </code>
      * </p>
      * <p>
diff --git a/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/OpenWebBeansPlugin.java b/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/OpenWebBeansPlugin.java
index eea2b7e9e..a6c072d73 100644
--- a/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/OpenWebBeansPlugin.java
+++ b/webbeans-spi/src/main/java/org/apache/webbeans/spi/plugins/OpenWebBeansPlugin.java
@@ -29,11 +29,11 @@
  *    plugin lifecycle like {@code #startUp()} and {@code #shutDown()}
  *  </li>
  *  <li>
- *    injection execution will be called every time a been get's
+ *    injection execution will be called every time a been gets
  *    injected like {@code #injectResource(Type, Annotation[])}
  *  </li>
  * </ol> 
- * @see PluginLoader for documentation of the whole mechanism
+ * see org.apache.webbeans.plugins.PluginLoader for documentation of the whole mechanism
  */
 public interface OpenWebBeansPlugin
 {
@@ -47,7 +47,6 @@ public interface OpenWebBeansPlugin
      * At shutdown, the plugin must release all locked resources.
      * This is called once before the very plugin gets destroyed.
      * This is usually the case when the WebApplication gets stopped.
-     * @throws WebBeansConfigurationException
      */
     void shutDown();
     
@@ -56,7 +55,6 @@ public interface OpenWebBeansPlugin
      * Make sure that the given class is ok for simple web bean conditions, 
      * otherwise throw a {@code WebBeansConfigurationException}
      * @param clazz the class to check
-     * @throws WebBeansConfigurationException if the given clazz cannot be used as simple web bean.
      */
     void isManagedBean(Class<?> clazz);