diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..02cf4b1
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,84 @@
+#
+# Created with help from www.gitignore.io
+#
+
+
+#######################################################################
+# Intellij
+# Created by https://www.gitignore.io/api/intellij
+#
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+## File-based project format:
+*.iws
+
+## Plugin-specific files:
+
+# IntelliJ
+/out/
+/.idea/
+/target/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+### Intellij Patch ###
+*.iml
+*.ipr
+
+
+#######################################################################
+# Maven
+# Created by https://www.gitignore.io/api/maven
+#
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+
+#######################################################################
+# OSX
+# Created by https://www.gitignore.io/api/osx
+#
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk
+
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..d205732
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,17 @@
+language: java
+install: true
+
+script:
+- mvn verify
+- mvn compile
+- mvn test
+- mvn validate
+- mvn jar:jar
+- mvn jar:test-jar
+- mvn source:jar
+- mvn source:test-jar
+- mvn surefire:test
+- mvn clean package
+- mvn clean install
+jdk:
+  - oraclejdk8
diff --git a/README.md b/README.md
index b721212..ef511f0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
+
 #### About Feather
+
 [Feather](http://zsoltherpai.github.io/feather) is an ultra-lightweight dependency injection ([JSR-330](https://jcp.org/en/jsr/detail?id=330 "JSR-330"))
 library for Java and Android. Dependency injection frameworks are often perceived as "magical" and complex. 
 Feather - with just a few hundred lines of code - is probably the easiest, tiniest, most obvious one, 
diff --git a/feather/src/main/java/org/codejargon/feather/Feather.java b/feather/src/main/java/org/codejargon/feather/Feather.java
index d024f2d..8cf8217 100644
--- a/feather/src/main/java/org/codejargon/feather/Feather.java
+++ b/feather/src/main/java/org/codejargon/feather/Feather.java
@@ -1,18 +1,38 @@
 package org.codejargon.feather;
 
-import javax.inject.*;
+import javax.inject.Provider;
+import javax.inject.Singleton;
+import javax.inject.Inject;
+import javax.inject.Qualifier;
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
 import java.lang.reflect.*;
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedHashSet;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 
+/**
+ * 
+ * @author edwin.njeru
+ *
+ */
 public class Feather {
     private final Map<Key, Provider<?>> providers = new ConcurrentHashMap<>();
     private final Map<Key, Object> singletons = new ConcurrentHashMap<>();
-    private final Map<Class, Object[][]> injectFields = new ConcurrentHashMap<>(0);
+    //private final Map<Class, Object[][]> injectFields = new ConcurrentHashMap<>(0);
 
     /**
      * Constructs Feather with configuration modules
+     * 
+     * @param modules varargs of modules classes
+     * 
+     * @return an instance of Feather
      */
     public static Feather with(Object... modules) {
         return new Feather(Arrays.asList(modules));
@@ -20,6 +40,9 @@ public static Feather with(Object... modules) {
 
     /**
      * Constructs Feather with configuration modules
+     * 
+     * @param modules {@code Iterable<?>} collection of configuration modules
+     * @return
      */
     public static Feather with(Iterable<?> modules) {
         return new Feather(modules);
@@ -73,12 +96,15 @@ public <T> Provider<T> provider(Key<T> key) {
 
     /**
      * Injects fields to the target object
+     * 
+     * @param target Object
      */
     public void injectFields(Object target) {
-        if (!injectFields.containsKey(target.getClass())) {
+        /*if (!injectFields.containsKey(target.getClass())) {
             injectFields.put(target.getClass(), injectFields(target.getClass()));
-        }
-        for (Object[] f: injectFields.get(target.getClass())) {
+        }*/
+        //for (Object[] f: injectFields.get(target.getClass())) {
+        for (Object[] f: injectFields(target.getClass())) {
             Field field = (Field) f[0];
             Key key = (Key) f[2];
             try {
@@ -89,10 +115,11 @@ public void injectFields(Object target) {
         }
     }
 
-    @SuppressWarnings("unchecked")
+    @SuppressWarnings({ "unchecked", "rawtypes" })
     private <T> Provider<T> provider(final Key<T> key, Set<Key> chain) {
         if (!providers.containsKey(key)) {
-            final Constructor constructor = constructor(key);
+            @SuppressWarnings("rawtypes")
+			final Constructor constructor = constructor(key);
             final Provider<?>[] paramProviders = paramProviders(key, constructor.getParameterTypes(), constructor.getGenericParameterTypes(), constructor.getParameterAnnotations(), chain);
             providers.put(key, singletonProvider(key, key.type.getAnnotation(Singleton.class), new Provider() {
                         @Override
@@ -109,7 +136,8 @@ public Object get() {
         return (Provider<T>) providers.get(key);
     }
 
-    private void providerMethod(final Object module, final Method m) {
+    @SuppressWarnings("unchecked")
+	private void providerMethod(final Object module, final Method m) {
         final Key key = Key.of(m.getReturnType(), qualifier(m.getAnnotations()));
         if (providers.containsKey(key)) {
             throw new FeatherException(String.format("%s has multiple providers, module %s", key.toString(), module.getClass()));
@@ -192,6 +220,10 @@ public Object get() {
         return providers;
     }
 
+    /**
+     * @return an array of  fully-constructed and injected instances fetched from an
+     * array of @param paramProviders, which are then used as parameters
+     */
     private static Object[] params(Provider<?>[] paramProviders) {
         Object[] params = new Object[paramProviders.length];
         for (int i = 0; i < paramProviders.length; ++i) {
@@ -200,7 +232,16 @@ private static Object[] params(Provider<?>[] paramProviders) {
         return params;
     }
 
-    private static Set<Key> append(Set<Key> set, Key newKey) {
+    /**
+     * Appends a @{code Key} @param newKey to an existing {@code Set} @param set of
+     * keys, and returns a {@code Set} of key containing the new {@code Key}.
+     * If the {@code Set} of {@code Key} is null, a serializable immutable set containing only 
+     * the @param newKey is returned 
+     *  
+     * @return Set<Key> append {@code Key} {@code Set}
+     */
+    @SuppressWarnings("rawtypes")
+	private static Set<Key> append(Set<Key> set, Key newKey) {
         if (set != null && !set.isEmpty()) {
             Set<Key> appended = new LinkedHashSet<>(set);
             appended.add(newKey);
@@ -210,6 +251,14 @@ private static Set<Key> append(Set<Key> set, Key newKey) {
         }
     }
 
+    /**
+     * Creates a map represented as a two-dimensional array of {@code Inject} annotated
+     * fields with their corresponding {@code Provider} types, or Parameterised types or
+     * type arguments.
+     * 
+     * @param target Class<?> target
+     * @return two-dimensional Object[][] array
+     */
     private static Object[][] injectFields(Class<?> target) {
         Set<Field> fields = fields(target);
         Object[][] fs = new Object[fields.size()][];
@@ -227,6 +276,13 @@ private static Object[][] injectFields(Class<?> target) {
         return fs;
     }
 
+    /**
+     * Returns accessible set of fields ({@code Field}) in a given class type
+     * which are annotated with the {@code Inject} {@code Annotation}
+     * 
+     * @param type Class<?> type
+     * @return Set<Field> fields
+     */
     private static Set<Field> fields(Class<?> type) {
         Class<?> current = type;
         Set<Field> fields = new HashSet<>();
@@ -242,7 +298,16 @@ private static Set<Field> fields(Class<?> type) {
         return fields;
     }
 
-    private static String chain(Set<Key> chain, Key lastKey) {
+    /**
+     * Returns a String representing a concatenation of Keys from a {@code Set}
+     * of {@code Key} and appends the last {@code Key}
+     * 
+     * @param chain Set<Key> chain
+     * @param {@code Key} lastKey
+     * @return "->" concatenated string of {@code Key} names
+     */
+    @SuppressWarnings("rawtypes")
+	private static String chain(Set<Key> chain, Key lastKey) {
         StringBuilder chainString = new StringBuilder();
         for (Key key : chain) {
             chainString.append(key.toString()).append(" -> ");
@@ -250,7 +315,17 @@ private static String chain(Set<Key> chain, Key lastKey) {
         return chainString.append(lastKey.toString()).toString();
     }
 
-    private static Constructor constructor(Key key) {
+    /**
+     * Fetches a constructor which is annotated with {@code Inject} from a {@code Key}. 
+     * If such a constructor does not exist, the noargs constructor is used instead.
+     * If both do not exist and a module provider does not also exist then a 
+     * {@code FeatherException} is thrown
+     * 
+     * @param {@code Key}
+     * @return {@code Constructor}
+     */
+    @SuppressWarnings("rawtypes")
+	private static Constructor constructor(Key key) {
         Constructor inject = null;
         Constructor noarg = null;
         for (Constructor c : key.type.getDeclaredConstructors()) {
@@ -273,6 +348,13 @@ private static Constructor constructor(Key key) {
         }
     }
 
+    /**
+     * Creates a hashSet of methods from a given type which are annotated with the
+     * {@code Provides} annotation
+     * 
+     * @param type Class<?> type
+     * @return Set<Method> containing {@code Provides} annotation
+     */
     private static Set<Method> providers(Class<?> type) {
         Class<?> current = type;
         Set<Method> providers = new HashSet<>();
@@ -288,6 +370,14 @@ private static Set<Method> providers(Class<?> type) {
         return providers;
     }
 
+    /**
+     * Fetches a {@code Qualifier} {@code Annotation} from an array of annotations.
+     * If a {@code Qualifier} {@code Annotation} is not found in the array, a null pointer
+     * is returned
+     * 
+     * @param annotations
+     * @return {@code Qualifier} {@code Annotation}
+     */
     private static Annotation qualifier(Annotation[] annotations) {
         for (Annotation annotation : annotations) {
             if (annotation.annotationType().isAnnotationPresent(Qualifier.class)) {
@@ -297,6 +387,14 @@ private static Annotation qualifier(Annotation[] annotations) {
         return null;
     }
 
+    /**
+     * Checks is a Provider exists in a subclass of the current class we are currently
+     * looping through
+     * 
+     * @param {@code Method}
+     * @param discoveredMethods Set<Method> of discoveredMethods
+     * @return boolean whether or not  a provider exists in a subclass
+     */
     private static boolean providerInSubClass(Method method, Set<Method> discoveredMethods) {
         for (Method discovered : discoveredMethods) {
             if (discovered.getName().equals(method.getName()) && Arrays.equals(method.getParameterTypes(), discovered.getParameterTypes())) {
diff --git a/feather/src/main/java/org/codejargon/feather/FeatherException.java b/feather/src/main/java/org/codejargon/feather/FeatherException.java
index c52f1db..a9469e2 100644
--- a/feather/src/main/java/org/codejargon/feather/FeatherException.java
+++ b/feather/src/main/java/org/codejargon/feather/FeatherException.java
@@ -1,7 +1,12 @@
 package org.codejargon.feather;
 
 public class FeatherException extends RuntimeException {
-    FeatherException(String message) {
+    /**
+	 * 
+	 */
+	private static final long serialVersionUID = -1606897572808444593L;
+
+	FeatherException(String message) {
         super(message);
     }
 
diff --git a/feather/src/main/java/org/codejargon/feather/Provides.java b/feather/src/main/java/org/codejargon/feather/Provides.java
index 309a7bc..544899b 100644
--- a/feather/src/main/java/org/codejargon/feather/Provides.java
+++ b/feather/src/main/java/org/codejargon/feather/Provides.java
@@ -1,6 +1,10 @@
 package org.codejargon.feather;
 
-import java.lang.annotation.*;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
 
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.METHOD)
diff --git a/pom.xml b/pom.xml
index e7652c1..2168e38 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,148 +1,322 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
-    <groupId>org.codejargon.feather</groupId>
-    <artifactId>feather-parent</artifactId>
-    <version>1.0.1-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>Feather Parent</name>
-    <url>https://github.com/zsoltherpai/feather</url>
-    <modules>
-        <module>feather</module>
-    </modules>
-    <description>
+	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>
+	<groupId>org.codejargon.feather</groupId>
+	<artifactId>feather-parent</artifactId>
+	<version>1.0.1-SNAPSHOT</version>
+	<packaging>pom</packaging>
+	<name>Feather Parent</name>
+	<url>https://github.com/zsoltherpai/feather</url>
+	<modules>
+		<module>feather</module>
+	</modules>
+	<description>
         Feather is an ultra-lightweight dependency injection (JSR-330) library for Java and Android.
     </description>
-    <licenses>
-        <license>
-            <name>The Apache Software License, Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <developers>
-        <developer>
-            <name>Zsolt Herpai</name>
-            <email>zsolt.herpai@gmail.com</email>
-        </developer>
-    </developers>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.7</maven.compiler.source>
-        <maven.compiler.target>1.7</maven.compiler.target>
-    </properties>
-    <scm>
-        <connection>scm:git:https://github.com/zsoltherpai/feather.git</connection>
-        <developerConnection>scm:git:git@github.com:zsoltherpai/feather.git</developerConnection>
-        <url>https://github.com/zsoltherpai/feather</url>
-    </scm>
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>1.9.5</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-    <profiles>
-        <profile>
-            <id>ossrh-release</id>
-            <distributionManagement>
-                <snapshotRepository>
-                    <id>ossrh</id>
-                    <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-                </snapshotRepository>
-                <repository>
-                    <id>ossrh</id>
-                    <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
-                </repository>
-            </distributionManagement>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>2.2.1</version>
-                        <executions>
-                            <execution>
-                                <id>attach-sources</id>
-                                <goals>
-                                    <goal>jar-no-fork</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.9.1</version>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.sonatype.plugins</groupId>
-                        <artifactId>nexus-staging-maven-plugin</artifactId>
-                        <version>1.6.3</version>
-                        <extensions>true</extensions>
-                        <configuration>
-                            <serverId>ossrh</serverId>
-                            <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                            <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                        </configuration>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.5</version>
-                        <executions>
-                            <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
-                                <goals>
-                                    <goal>sign</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-compiler-plugin</artifactId>
-                        <version>3.3</version>
+	<licenses>
+		<license>
+			<name>The Apache Software License, Version 2.0</name>
+			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+			<distribution>repo</distribution>
+		</license>
+	</licenses>
+	<developers>
+		<developer>
+			<name>Zsolt Herpai</name>
+			<email>zsolt.herpai@gmail.com</email>
+		</developer>
+	</developers>
+	<properties>
+        <!--General -->
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.compiler.source>1.7</maven.compiler.source>
+		<maven.compiler.target>1.7</maven.compiler.target>
+
+        <!--Plugin versions-->
+        <nexus.staging.maven.plugin.version>1.6.3</nexus.staging.maven.plugin.version>
+        <maven.source.plugin.version>2.2.1</maven.source.plugin.version>
+        <maven.javadoc.plugin.version>2.9.1</maven.javadoc.plugin.version>
+        <maven.compiler.plugin.version>3.3</maven.compiler.plugin.version>
+        <maven.jar.plugin.version>2.4</maven.jar.plugin.version>
+        <spotbugs.maven.plugin.version>3.1.0-RC6</spotbugs.maven.plugin.version>
+        <jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.version>
+        <findbugs.maven.plugin.version>2.5.2</findbugs.maven.plugin.version>
+        <maven.pmd.plugin.version>3.0.1</maven.pmd.plugin.version>
+        <cobertura.maven.plugin.version>2.6</cobertura.maven.plugin.version>
+        <maven.enforcer.plugin.version>3.0.0-M1</maven.enforcer.plugin.version>
+        <maven.project.info.reports.plugin.version>2.9</maven.project.info.reports.plugin.version>
+	</properties>
+	<scm>
+		<connection>scm:git:https://github.com/zsoltherpai/feather.git</connection>
+		<developerConnection>scm:git:git@github.com:zsoltherpai/feather.git</developerConnection>
+		<url>https://github.com/zsoltherpai/feather</url>
+	</scm>
+	<dependencies>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.12</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>1.9.5</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<profiles>
+		<profile>
+			<id>ossrh-release</id>
+			<distributionManagement>
+				<snapshotRepository>
+					<id>ossrh</id>
+					<url>https://oss.sonatype.org/content/repositories/snapshots</url>
+				</snapshotRepository>
+				<repository>
+					<id>ossrh</id>
+					<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+				</repository>
+			</distributionManagement>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-source-plugin</artifactId>
+						<version>2.2.1</version>
+						<executions>
+							<execution>
+								<id>attach-sources</id>
+								<goals>
+									<goal>jar-no-fork</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>2.9.1</version>
+						<executions>
+							<execution>
+								<id>attach-javadocs</id>
+								<goals>
+									<goal>jar</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.sonatype.plugins</groupId>
+						<artifactId>nexus-staging-maven-plugin</artifactId>
+						<version>${nexus.staging.maven.plugin.version}</version>
+						<extensions>true</extensions>
+						<configuration>
+							<serverId>ossrh</serverId>
+							<nexusUrl>https://oss.sonatype.org/</nexusUrl>
+							<autoReleaseAfterClose>true</autoReleaseAfterClose>
+						</configuration>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-gpg-plugin</artifactId>
+						<version>1.5</version>
+						<executions>
+							<execution>
+								<id>sign-artifacts</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-compiler-plugin</artifactId>
+						<version>${maven.compiler.plugin.version}</version>
+						<configuration>
+							<optimize>true</optimize>
+							<debug>false</debug>
+							<source>${maven.compiler.source}</source>
+							<target>${maven.compiler.target}</target>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
+	<build>
+        <resources>
+            <resource>
+                <directory>${basedir}</directory>
+                <includes>
+                    <include>README.md</include>
+                    <include>CHANGELOG.md</include>
+                    <include>LICENSE.txt</include>
+                </includes>
+            </resource>
+        </resources>
+		<plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>${maven.source.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>${maven.javadoc.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                        <phase>package</phase>
+                    </execution>
+                </executions>
+            </plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.3</version>
+				<configuration>
+					<source>${maven.compiler.source}</source>
+					<target>${maven.compiler.target}</target>
+				</configuration>
+			</plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>${maven.jar.plugin.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>${maven.enforcer.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
                         <configuration>
-                            <optimize>true</optimize>
-                            <debug>false</debug>
-                            <source>1.7</source>
-                            <target>1.7</target>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>${maven.compiler.source}</version>
+                                </requireMavenVersion>
+                                <requireJavaVersion>
+                                    <version>${maven.compiler.source}</version>
+                                </requireJavaVersion>
+                            </rules>
                         </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-    <build>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- Setup spotbugs dependency, would normally only be in reporting section. But we
+             need an explicit dependency declaration to make sure we can download it to local repo-->
+            <plugin>
+                <groupId>com.github.spotbugs</groupId>
+                <artifactId>spotbugs-maven-plugin</artifactId>
+                <version>${spotbugs.maven.plugin.version}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>com.github.spotbugs</groupId>
+                        <artifactId>spotbugs</artifactId>
+                        <version>3.1.0</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+
+            <!-- Setup JaCoCo code coverage -->
+            <plugin>
+                <groupId>org.jacoco</groupId>
+                <artifactId>jacoco-maven-plugin</artifactId>
+                <version>${jacoco-maven-plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>jacoco-initialize</id>
+                        <goals>
+                            <goal>prepare-agent</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>jacoco-site</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>report</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+		</plugins>
+	</build>
+
+    <reporting>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.3</version>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>${maven.javadoc.plugin.version}</version>
+                <configuration>
+                    <!--<aggregate>true</aggregate>-->
+                    <linksource>true</linksource>
+                    <links>
+                        <link>http://download.oracle.com/javase/1.8.0/docs/api/</link>
+                        <link>http://download.oracle.com/javaee/1.8/api/</link>
+                        <link>http://commons.apache.org/digester/apidocs/</link>
+                    </links>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-project-info-reports-plugin</artifactId>
+                <version>${maven.project.info.reports.plugin.version}</version>
+                <configuration>
+                    <dependencyLocationsEnabled>false</dependencyLocationsEnabled>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>cobertura-maven-plugin</artifactId>
+                <version>${cobertura.maven.plugin.version}</version>
+                <configuration>
+                    <aggregate>true</aggregate>
+                    <formats>
+                        <format>html</format>
+                        <format>xml</format>
+                    </formats>
+                    <check/>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>${findbugs.maven.plugin.version}</version>
+                <configuration>
+                    <threshold>Normal</threshold>
+                    <effort>Default</effort>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-pmd-plugin</artifactId>
+                <version>${maven.pmd.plugin.version}</version>
                 <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
+                    <targetJdk>${maven.compiler.target}</targetJdk>
                 </configuration>
             </plugin>
         </plugins>
-    </build>
+    </reporting>
 </project>
\ No newline at end of file