From edd8db658c121ca8cc568fe3b5311cd8bda7b350 Mon Sep 17 00:00:00 2001
From: Edwin Njeru <mailnjeru@gmail.com>
Date: Wed, 21 Mar 2018 11:10:59 +0300
Subject: [PATCH 1/3] added missing files

---
 pom.xml                                       | 20 +++++++++++--------
 .../keeper/book/{ => api}/Account.java        |  2 +-
 .../book/{ => api}/AccountAttributes.java     |  2 +-
 .../ghacupha/keeper/book/{ => api}/Entry.java |  6 +++---
 .../book/{ => api}/EntryAttributes.java       |  2 +-
 .../keeper/book/{ => api}/Transaction.java    |  2 +-
 .../{internal => base}/AccountDetails.java    |  6 +++---
 .../book/{internal => base}/AccountImpl.java  |  8 ++++----
 .../{internal => base}/AccountingEntry.java   |  8 ++++----
 .../AccountingTransaction.java                | 10 +++++-----
 .../AccoutingEntryDecorator.java              |  8 ++++----
 .../book/{internal => base}/EntryDetails.java |  6 +++---
 .../TransactionalEntry.java                   | 10 +++++-----
 .../ghacupha/keeper/book/AccountTest.java     | 12 +++++++----
 .../keeper/book/EntryDetailsTest.java         |  3 ++-
 .../AccountingTransactionTest.java            | 10 +++++-----
 16 files changed, 62 insertions(+), 53 deletions(-)
 rename src/main/java/io/github/ghacupha/keeper/book/{ => api}/Account.java (97%)
 rename src/main/java/io/github/ghacupha/keeper/book/{ => api}/AccountAttributes.java (98%)
 rename src/main/java/io/github/ghacupha/keeper/book/{ => api}/Entry.java (92%)
 rename src/main/java/io/github/ghacupha/keeper/book/{ => api}/EntryAttributes.java (98%)
 rename src/main/java/io/github/ghacupha/keeper/book/{ => api}/Transaction.java (98%)
 rename src/main/java/io/github/ghacupha/keeper/book/{internal => base}/AccountDetails.java (97%)
 rename src/main/java/io/github/ghacupha/keeper/book/{internal => base}/AccountImpl.java (96%)
 rename src/main/java/io/github/ghacupha/keeper/book/{internal => base}/AccountingEntry.java (96%)
 rename src/main/java/io/github/ghacupha/keeper/book/{internal => base}/AccountingTransaction.java (94%)
 rename src/main/java/io/github/ghacupha/keeper/book/{internal => base}/AccoutingEntryDecorator.java (85%)
 rename src/main/java/io/github/ghacupha/keeper/book/{internal => base}/EntryDetails.java (97%)
 rename src/main/java/io/github/ghacupha/keeper/book/{internal => base}/TransactionalEntry.java (84%)
 rename src/test/java/io/github/ghacupha/keeper/book/{internal => base}/AccountingTransactionTest.java (95%)

diff --git a/pom.xml b/pom.xml
index d64633d..5b45e2e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,9 +43,11 @@
         <surefireArgLine>-Dapp.env=LOCAL -Dapp.domain=localhost -Dapp.port=9901</surefireArgLine>
         <failsafeArgLine>-Dapp.env=LOCAL -Dapp.domain=localhost -Dapp.port=9901</failsafeArgLine>
         <env.TRAVIS_JOB_ID />
-        <maven.compile.targetLevel>1.8</maven.compile.targetLevel>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compile.targetLevel>9</maven.compile.targetLevel>
+        <maven.compiler.source>9</maven.compiler.source>
+        <maven.compiler.target>9</maven.compiler.target>
+        <maven.compiler.executable>javac9</maven.compiler.executable>
+        <maven.compiler.fork>true</maven.compiler.fork>
         <maven-changes-plugin.version>2.12.1</maven-changes-plugin.version>
         <project.reporting.outputDirectory>"documentation"</project.reporting.outputDirectory>
         <jacoco.it.execution.data.file>${project.build.directory}/coverage-reports/jacoco-it.exec</jacoco.it.execution.data.file>
@@ -399,7 +401,7 @@
         </pluginManagement>
 
         <plugins>
-            <plugin>
+            <!--<plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
                 <version>2.0.0.RELEASE</version>
@@ -421,7 +423,7 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>
+            </plugin>-->
                 <plugin>
                     <groupId>org.sonatype.plugins</groupId>
                     <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -446,10 +448,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.7.0</version>
+                <version>${maven-compiler-plugin.version}</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
+                    <fork>${maven.compiler.fork}</fork>
+                    <executable>${maven.compiler.executable}</executable>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/src/main/java/io/github/ghacupha/keeper/book/Account.java b/src/main/java/io/github/ghacupha/keeper/book/api/Account.java
similarity index 97%
rename from src/main/java/io/github/ghacupha/keeper/book/Account.java
rename to src/main/java/io/github/ghacupha/keeper/book/api/Account.java
index 2c1142c..d8d94c0 100644
--- a/src/main/java/io/github/ghacupha/keeper/book/Account.java
+++ b/src/main/java/io/github/ghacupha/keeper/book/api/Account.java
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package io.github.ghacupha.keeper.book;
+package io.github.ghacupha.keeper.book.api;
 
 import io.github.ghacupha.keeper.book.balance.AccountBalance;
 import io.github.ghacupha.keeper.book.unit.time.TimePoint;
diff --git a/src/main/java/io/github/ghacupha/keeper/book/AccountAttributes.java b/src/main/java/io/github/ghacupha/keeper/book/api/AccountAttributes.java
similarity index 98%
rename from src/main/java/io/github/ghacupha/keeper/book/AccountAttributes.java
rename to src/main/java/io/github/ghacupha/keeper/book/api/AccountAttributes.java
index c7b76a0..4d6c875 100644
--- a/src/main/java/io/github/ghacupha/keeper/book/AccountAttributes.java
+++ b/src/main/java/io/github/ghacupha/keeper/book/api/AccountAttributes.java
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package io.github.ghacupha.keeper.book;
+package io.github.ghacupha.keeper.book.api;
 
 import io.github.ghacupha.keeper.book.unit.money.Cash;
 import io.github.ghacupha.keeper.book.unit.time.TimePoint;
diff --git a/src/main/java/io/github/ghacupha/keeper/book/Entry.java b/src/main/java/io/github/ghacupha/keeper/book/api/Entry.java
similarity index 92%
rename from src/main/java/io/github/ghacupha/keeper/book/Entry.java
rename to src/main/java/io/github/ghacupha/keeper/book/api/Entry.java
index 7c1dc2d..a4e2771 100644
--- a/src/main/java/io/github/ghacupha/keeper/book/Entry.java
+++ b/src/main/java/io/github/ghacupha/keeper/book/api/Entry.java
@@ -14,10 +14,10 @@
  *    limitations under the License.
  */
 
-package io.github.ghacupha.keeper.book;
+package io.github.ghacupha.keeper.book.api;
 
-import io.github.ghacupha.keeper.book.internal.AccountImpl;
-import io.github.ghacupha.keeper.book.internal.EntryDetails;
+import io.github.ghacupha.keeper.book.base.AccountImpl;
+import io.github.ghacupha.keeper.book.base.EntryDetails;
 import io.github.ghacupha.keeper.book.unit.money.Cash;
 import io.github.ghacupha.keeper.book.unit.money.HardCash;
 import io.github.ghacupha.keeper.book.unit.time.TimePoint;
diff --git a/src/main/java/io/github/ghacupha/keeper/book/EntryAttributes.java b/src/main/java/io/github/ghacupha/keeper/book/api/EntryAttributes.java
similarity index 98%
rename from src/main/java/io/github/ghacupha/keeper/book/EntryAttributes.java
rename to src/main/java/io/github/ghacupha/keeper/book/api/EntryAttributes.java
index 55d90a0..54f2d8f 100644
--- a/src/main/java/io/github/ghacupha/keeper/book/EntryAttributes.java
+++ b/src/main/java/io/github/ghacupha/keeper/book/api/EntryAttributes.java
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package io.github.ghacupha.keeper.book;
+package io.github.ghacupha.keeper.book.api;
 
 import io.github.ghacupha.keeper.book.unit.money.Cash;
 
diff --git a/src/main/java/io/github/ghacupha/keeper/book/Transaction.java b/src/main/java/io/github/ghacupha/keeper/book/api/Transaction.java
similarity index 98%
rename from src/main/java/io/github/ghacupha/keeper/book/Transaction.java
rename to src/main/java/io/github/ghacupha/keeper/book/api/Transaction.java
index 68de850..5cd0341 100644
--- a/src/main/java/io/github/ghacupha/keeper/book/Transaction.java
+++ b/src/main/java/io/github/ghacupha/keeper/book/api/Transaction.java
@@ -14,7 +14,7 @@
  *    limitations under the License.
  */
 
-package io.github.ghacupha.keeper.book;
+package io.github.ghacupha.keeper.book.api;
 
 import io.github.ghacupha.keeper.book.unit.money.Cash;
 import io.github.ghacupha.keeper.book.util.ImmutableEntryException;
diff --git a/src/main/java/io/github/ghacupha/keeper/book/internal/AccountDetails.java b/src/main/java/io/github/ghacupha/keeper/book/base/AccountDetails.java
similarity index 97%
rename from src/main/java/io/github/ghacupha/keeper/book/internal/AccountDetails.java
rename to src/main/java/io/github/ghacupha/keeper/book/base/AccountDetails.java
index aeac2f6..75fe6ee 100644
--- a/src/main/java/io/github/ghacupha/keeper/book/internal/AccountDetails.java
+++ b/src/main/java/io/github/ghacupha/keeper/book/base/AccountDetails.java
@@ -14,10 +14,10 @@
  *    limitations under the License.
  */
 
-package io.github.ghacupha.keeper.book.internal;
+package io.github.ghacupha.keeper.book.base;
 
-import io.github.ghacupha.keeper.book.Account;
-import io.github.ghacupha.keeper.book.AccountAttributes;
+import io.github.ghacupha.keeper.book.api.Account;
+import io.github.ghacupha.keeper.book.api.AccountAttributes;
 import io.github.ghacupha.keeper.book.unit.money.Cash;
 import io.github.ghacupha.keeper.book.unit.time.TimePoint;
 
diff --git a/src/main/java/io/github/ghacupha/keeper/book/internal/AccountImpl.java b/src/main/java/io/github/ghacupha/keeper/book/base/AccountImpl.java
similarity index 96%
rename from src/main/java/io/github/ghacupha/keeper/book/internal/AccountImpl.java
rename to src/main/java/io/github/ghacupha/keeper/book/base/AccountImpl.java
index 1214d2d..926977c 100644
--- a/src/main/java/io/github/ghacupha/keeper/book/internal/AccountImpl.java
+++ b/src/main/java/io/github/ghacupha/keeper/book/base/AccountImpl.java
@@ -14,11 +14,11 @@
  *    limitations under the License.
  */
 
-package io.github.ghacupha.keeper.book.internal;
+package io.github.ghacupha.keeper.book.base;
 
-import io.github.ghacupha.keeper.book.Account;
-import io.github.ghacupha.keeper.book.AccountAttributes;
-import io.github.ghacupha.keeper.book.Entry;
+import io.github.ghacupha.keeper.book.api.Account;
+import io.github.ghacupha.keeper.book.api.AccountAttributes;
+import io.github.ghacupha.keeper.book.api.Entry;
 import io.github.ghacupha.keeper.book.balance.AccountBalance;
 import io.github.ghacupha.keeper.book.balance.AccountBalanceType;
 import io.github.ghacupha.keeper.book.unit.money.Cash;
diff --git a/src/main/java/io/github/ghacupha/keeper/book/internal/AccountingEntry.java b/src/main/java/io/github/ghacupha/keeper/book/base/AccountingEntry.java
similarity index 96%
rename from src/main/java/io/github/ghacupha/keeper/book/internal/AccountingEntry.java
rename to src/main/java/io/github/ghacupha/keeper/book/base/AccountingEntry.java
index ceb0977..f76be03 100644
--- a/src/main/java/io/github/ghacupha/keeper/book/internal/AccountingEntry.java
+++ b/src/main/java/io/github/ghacupha/keeper/book/base/AccountingEntry.java
@@ -14,11 +14,11 @@
  *    limitations under the License.
  */
 
-package io.github.ghacupha.keeper.book.internal;
+package io.github.ghacupha.keeper.book.base;
 
-import io.github.ghacupha.keeper.book.Account;
-import io.github.ghacupha.keeper.book.Entry;
-import io.github.ghacupha.keeper.book.EntryAttributes;
+import io.github.ghacupha.keeper.book.api.Account;
+import io.github.ghacupha.keeper.book.api.Entry;
+import io.github.ghacupha.keeper.book.api.EntryAttributes;
 import io.github.ghacupha.keeper.book.unit.money.Cash;
 import io.github.ghacupha.keeper.book.unit.money.HardCash;
 import io.github.ghacupha.keeper.book.unit.time.TimePoint;
diff --git a/src/main/java/io/github/ghacupha/keeper/book/internal/AccountingTransaction.java b/src/main/java/io/github/ghacupha/keeper/book/base/AccountingTransaction.java
similarity index 94%
rename from src/main/java/io/github/ghacupha/keeper/book/internal/AccountingTransaction.java
rename to src/main/java/io/github/ghacupha/keeper/book/base/AccountingTransaction.java
index 97c8d46..df298e4 100644
--- a/src/main/java/io/github/ghacupha/keeper/book/internal/AccountingTransaction.java
+++ b/src/main/java/io/github/ghacupha/keeper/book/base/AccountingTransaction.java
@@ -14,12 +14,12 @@
  *    limitations under the License.
  */
 
-package io.github.ghacupha.keeper.book.internal;
+package io.github.ghacupha.keeper.book.base;
 
-import io.github.ghacupha.keeper.book.Account;
-import io.github.ghacupha.keeper.book.Entry;
-import io.github.ghacupha.keeper.book.EntryAttributes;
-import io.github.ghacupha.keeper.book.Transaction;
+import io.github.ghacupha.keeper.book.api.Account;
+import io.github.ghacupha.keeper.book.api.Entry;
+import io.github.ghacupha.keeper.book.api.EntryAttributes;
+import io.github.ghacupha.keeper.book.api.Transaction;
 import io.github.ghacupha.keeper.book.unit.money.Cash;
 import io.github.ghacupha.keeper.book.unit.money.HardCash;
 import io.github.ghacupha.keeper.book.unit.time.TimePoint;
diff --git a/src/main/java/io/github/ghacupha/keeper/book/internal/AccoutingEntryDecorator.java b/src/main/java/io/github/ghacupha/keeper/book/base/AccoutingEntryDecorator.java
similarity index 85%
rename from src/main/java/io/github/ghacupha/keeper/book/internal/AccoutingEntryDecorator.java
rename to src/main/java/io/github/ghacupha/keeper/book/base/AccoutingEntryDecorator.java
index 08021fe..01f5fb1 100644
--- a/src/main/java/io/github/ghacupha/keeper/book/internal/AccoutingEntryDecorator.java
+++ b/src/main/java/io/github/ghacupha/keeper/book/base/AccoutingEntryDecorator.java
@@ -14,11 +14,11 @@
  *    limitations under the License.
  */
 
-package io.github.ghacupha.keeper.book.internal;
+package io.github.ghacupha.keeper.book.base;
 
-import io.github.ghacupha.keeper.book.Account;
-import io.github.ghacupha.keeper.book.Entry;
-import io.github.ghacupha.keeper.book.EntryAttributes;
+import io.github.ghacupha.keeper.book.api.Account;
+import io.github.ghacupha.keeper.book.api.Entry;
+import io.github.ghacupha.keeper.book.api.EntryAttributes;
 import io.github.ghacupha.keeper.book.unit.money.Cash;
 import io.github.ghacupha.keeper.book.unit.time.TimePoint;
 
diff --git a/src/main/java/io/github/ghacupha/keeper/book/internal/EntryDetails.java b/src/main/java/io/github/ghacupha/keeper/book/base/EntryDetails.java
similarity index 97%
rename from src/main/java/io/github/ghacupha/keeper/book/internal/EntryDetails.java
rename to src/main/java/io/github/ghacupha/keeper/book/base/EntryDetails.java
index 7669373..470555d 100644
--- a/src/main/java/io/github/ghacupha/keeper/book/internal/EntryDetails.java
+++ b/src/main/java/io/github/ghacupha/keeper/book/base/EntryDetails.java
@@ -14,10 +14,10 @@
  *    limitations under the License.
  */
 
-package io.github.ghacupha.keeper.book.internal;
+package io.github.ghacupha.keeper.book.base;
 
-import io.github.ghacupha.keeper.book.Entry;
-import io.github.ghacupha.keeper.book.EntryAttributes;
+import io.github.ghacupha.keeper.book.api.Entry;
+import io.github.ghacupha.keeper.book.api.EntryAttributes;
 import io.github.ghacupha.keeper.book.unit.money.Cash;
 
 import java.util.Map;
diff --git a/src/main/java/io/github/ghacupha/keeper/book/internal/TransactionalEntry.java b/src/main/java/io/github/ghacupha/keeper/book/base/TransactionalEntry.java
similarity index 84%
rename from src/main/java/io/github/ghacupha/keeper/book/internal/TransactionalEntry.java
rename to src/main/java/io/github/ghacupha/keeper/book/base/TransactionalEntry.java
index 8b3e903..8738cfa 100644
--- a/src/main/java/io/github/ghacupha/keeper/book/internal/TransactionalEntry.java
+++ b/src/main/java/io/github/ghacupha/keeper/book/base/TransactionalEntry.java
@@ -14,12 +14,12 @@
  *    limitations under the License.
  */
 
-package io.github.ghacupha.keeper.book.internal;
+package io.github.ghacupha.keeper.book.base;
 
-import io.github.ghacupha.keeper.book.Account;
-import io.github.ghacupha.keeper.book.Entry;
-import io.github.ghacupha.keeper.book.EntryAttributes;
-import io.github.ghacupha.keeper.book.Transaction;
+import io.github.ghacupha.keeper.book.api.Account;
+import io.github.ghacupha.keeper.book.api.Entry;
+import io.github.ghacupha.keeper.book.api.EntryAttributes;
+import io.github.ghacupha.keeper.book.api.Transaction;
 import io.github.ghacupha.keeper.book.unit.money.Cash;
 import io.github.ghacupha.keeper.book.unit.time.TimePoint;
 
diff --git a/src/test/java/io/github/ghacupha/keeper/book/AccountTest.java b/src/test/java/io/github/ghacupha/keeper/book/AccountTest.java
index becd83c..98d06b8 100644
--- a/src/test/java/io/github/ghacupha/keeper/book/AccountTest.java
+++ b/src/test/java/io/github/ghacupha/keeper/book/AccountTest.java
@@ -1,9 +1,13 @@
 package io.github.ghacupha.keeper.book;
 
-import io.github.ghacupha.keeper.book.internal.AccountDetails;
-import io.github.ghacupha.keeper.book.internal.AccountImpl;
-import io.github.ghacupha.keeper.book.internal.AccountingEntry;
-import io.github.ghacupha.keeper.book.internal.EntryDetails;
+import io.github.ghacupha.keeper.book.api.Account;
+import io.github.ghacupha.keeper.book.api.AccountAttributes;
+import io.github.ghacupha.keeper.book.api.Entry;
+import io.github.ghacupha.keeper.book.api.EntryAttributes;
+import io.github.ghacupha.keeper.book.base.AccountDetails;
+import io.github.ghacupha.keeper.book.base.AccountImpl;
+import io.github.ghacupha.keeper.book.base.AccountingEntry;
+import io.github.ghacupha.keeper.book.base.EntryDetails;
 import io.github.ghacupha.keeper.book.unit.money.Cash;
 import io.github.ghacupha.keeper.book.unit.money.HardCash;
 import io.github.ghacupha.keeper.book.unit.time.Moment;
diff --git a/src/test/java/io/github/ghacupha/keeper/book/EntryDetailsTest.java b/src/test/java/io/github/ghacupha/keeper/book/EntryDetailsTest.java
index 32c2d04..5221281 100644
--- a/src/test/java/io/github/ghacupha/keeper/book/EntryDetailsTest.java
+++ b/src/test/java/io/github/ghacupha/keeper/book/EntryDetailsTest.java
@@ -16,7 +16,8 @@
 
 package io.github.ghacupha.keeper.book;
 
-import io.github.ghacupha.keeper.book.internal.EntryDetails;
+import io.github.ghacupha.keeper.book.api.EntryAttributes;
+import io.github.ghacupha.keeper.book.base.EntryDetails;
 import io.github.ghacupha.keeper.book.unit.money.HardCash;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/src/test/java/io/github/ghacupha/keeper/book/internal/AccountingTransactionTest.java b/src/test/java/io/github/ghacupha/keeper/book/base/AccountingTransactionTest.java
similarity index 95%
rename from src/test/java/io/github/ghacupha/keeper/book/internal/AccountingTransactionTest.java
rename to src/test/java/io/github/ghacupha/keeper/book/base/AccountingTransactionTest.java
index d7184b4..91ad5d3 100644
--- a/src/test/java/io/github/ghacupha/keeper/book/internal/AccountingTransactionTest.java
+++ b/src/test/java/io/github/ghacupha/keeper/book/base/AccountingTransactionTest.java
@@ -14,12 +14,12 @@
  *    limitations under the License.
  */
 
-package io.github.ghacupha.keeper.book.internal;
+package io.github.ghacupha.keeper.book.base;
 
-import io.github.ghacupha.keeper.book.Account;
-import io.github.ghacupha.keeper.book.AccountAttributes;
-import io.github.ghacupha.keeper.book.EntryAttributes;
-import io.github.ghacupha.keeper.book.Transaction;
+import io.github.ghacupha.keeper.book.api.Account;
+import io.github.ghacupha.keeper.book.api.AccountAttributes;
+import io.github.ghacupha.keeper.book.api.EntryAttributes;
+import io.github.ghacupha.keeper.book.api.Transaction;
 import io.github.ghacupha.keeper.book.balance.AccountBalance;
 import io.github.ghacupha.keeper.book.unit.money.HardCash;
 import io.github.ghacupha.keeper.book.unit.time.Moment;

From eee13eb5552c4968b862fab868c89e735279a58d Mon Sep 17 00:00:00 2001
From: Edwin Njeru <mailnjeru@gmail.com>
Date: Wed, 21 Mar 2018 14:55:33 +0300
Subject: [PATCH 2/3] added missing module

---
 .travis.yml                                   |    3 +
 pom.xml                                       | 1102 +++++++----------
 src/main/checkstyle/checkstyle.xml            |  282 +++--
 .../book/util/ImmutableEntryException.java    |    4 +-
 .../util/MismatchedCurrencyException.java     |    4 +-
 .../book/util/UnableToPostException.java      |    4 +-
 .../util/UntimelyBookingDateException.java    |    6 +-
 src/main/java/module-info.java                |    7 +
 8 files changed, 623 insertions(+), 789 deletions(-)
 create mode 100644 src/main/java/module-info.java

diff --git a/.travis.yml b/.travis.yml
index 66c78f5..e0b58e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,9 @@ language: java
 install: true
 
 script:
+- mvn checkstyle:check
+- mvn checkstyle:checkstyle
+- mvn verify
 - mvn compile
 - mvn package
 - mvn test
diff --git a/pom.xml b/pom.xml
index 5b45e2e..3954152 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,13 @@
     </developers>
 
     <properties>
+
+        <!-- Github Releases -->
+        <book-keeper.release.version>1.2-SNAPSHOT</book-keeper.release.version>
+        <book-keeper.artifactId>book-keeper</book-keeper.artifactId>
+
+        <book-keeper.osgi.packages>io.github.ghacupha.keeper.book.*</book-keeper.osgi.packages>
+        <book-keeper.module.name>book-keeper</book-keeper.module.name>
         <build.profile.id>dev</build.profile.id>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -55,6 +62,7 @@
 
         <!-- Plugin version numbers -->
         <maven-assembly-plugin.version>3.1.0</maven-assembly-plugin.version>
+        <maven-toolchains-plugin.version>1.1</maven-toolchains-plugin.version>
         <maven-changes-plugin.version>2.12.1</maven-changes-plugin.version>
         <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
         <maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>
@@ -65,6 +73,8 @@
         <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
         <maven-install-plugin.version>2.5.2</maven-install-plugin.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
+        <maven-bundle-plugin.version>3.5.0</maven-bundle-plugin.version>
+        <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <maven-javadoc-plugin.version>3.0.0-M1</maven-javadoc-plugin.version>
         <maven-jxr-plugin.version>2.5</maven-jxr-plugin.version>
         <maven-plugin-plugin.version>3.5</maven-plugin-plugin.version>
@@ -72,25 +82,33 @@
         <maven-project-info-reports-plugin.version>2.9</maven-project-info-reports-plugin.version>
         <maven-repository-plugin.version>2.4</maven-repository-plugin.version>
         <maven-resources-plugin.version>3.0.2</maven-resources-plugin.version>
+        <github-release-plugin.version>1.1.2-SNAPSHOT</github-release-plugin.version>
         <!-- v3.6 doesn't work with theme -->
         <maven-site-plugin.version>3.4</maven-site-plugin.version>
         <maven-source-plugin.version>3.0.1</maven-source-plugin.version>
         <maven-surefire-plugin.version>2.20.1</maven-surefire-plugin.version>
         <maven-surefire-report-plugin.version>2.20.1</maven-surefire-report-plugin.version>
-        <maven-toolchains-plugin.version>1.1</maven-toolchains-plugin.version>
         <jacoco-maven-plugin.version>0.7.9</jacoco-maven-plugin.version>
         <spotbugs-maven-plugin.version>3.1.0-RC6</spotbugs-maven-plugin.version>
         <!-- Properties for maven-compiler-plugin -->
-        <maven.compiler.compilerVersion>1.8</maven.compiler.compilerVersion>
+        <!--<maven.compiler.compilerVersion>1.8</maven.compiler.compilerVersion>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
-        <maven.compiler.fork>true</maven.compiler.fork>
+        <maven.compiler.fork>true</maven.compiler.fork>-->
+
         <!-- Properties for maven-javadoc-plugin -->
-        <author>false</author>
+        <author>true</author>
         <notimestamp>true</notimestamp>
         <doclint>none</doclint>
+
         <!-- Properties for maven-checkstyle-plugin -->
         <checkstyle.config.location>${project.basedir}/src/main/checkstyle/checkstyle.xml</checkstyle.config.location>
+        <checkstyle.config.consoleOutput>true</checkstyle.config.consoleOutput>
+        <checkstyle.config.failsOnError>true</checkstyle.config.failsOnError>
+        <checkstyle.config.includeResources>false</checkstyle.config.includeResources>
+        <checkstyle.config.includeTestResources>false</checkstyle.config.includeTestResources>
+        <checkstyle.config.includeTestResources>false</checkstyle.config.includeTestResources>
+        <checkstyle.config.includeTestSourceDirectory>false</checkstyle.config.includeTestSourceDirectory>
         <linkXRef>false</linkXRef>
 
     </properties>
@@ -102,204 +120,265 @@
         <url>https://github.com/ghacupha/book-keeper</url>
     </scm>
 
+    <ciManagement>
+        <system>Travis CI</system>
+        <url>https://travis-ci.org/ghacupha/book-keeper</url>
+    </ciManagement>
+
+    <distributionManagement>
+        <snapshotRepository>
+            <id>sonatype-nexus</id>
+            <name>Sonatype Nexus Snapshots</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </snapshotRepository>
+    </distributionManagement>
+
     <profiles>
+        <!-- Skip spotbugs on Java 6 and 7 -->
         <profile>
-            <id>all-tests</id>
-            <properties>
-                <build.profile.id>all-tests</build.profile.id>
-                <!-- All tests are run. -->
-                <skip.integration.tests>false</skip.integration.tests>
-                <skip.unit.tests>false</skip.unit.tests>
-            </properties>
-        </profile>
-        <profile>
-            <id>dev</id>
-        </profile>
-        <profile>
-            <id>integration-test</id>
+            <id>java6and7</id>
+            <activation>
+                <jdk>[1.6,1.8)</jdk>
+            </activation>
             <properties>
-                <!-- Used to locate the profile specific configuration file. -->
-                <build.profile.id>integration-test</build.profile.id>
-                <!-- Only integration tests are run. -->
-                <skip.integration.tests>false</skip.integration.tests>
-                <skip.unit.tests>true</skip.unit.tests>
+                <spotbugs.skip>true</spotbugs.skip>
             </properties>
         </profile>
+        <!-- Skip module-info.java on Java 6, 7 and 8 -->
         <profile>
-            <id>travis</id>
+            <id>java6and7and8</id>
             <activation>
-                <property>
-                    <name>env.TRAVIS</name>
-                    <value>true</value>
-                </property>
+                <jdk>[1.6,9)</jdk>
             </activation>
             <build>
                 <plugins>
+                    <!-- Don't compile module-info.java, see java 9 profile -->
                     <plugin>
-                        <groupId>org.jacoco</groupId>
-                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
+                        <configuration>
+                            <excludes>
+                                <exclude>module-info.java</exclude>
+                            </excludes>
+                        </configuration>
                     </plugin>
+                    <!-- Avoid errors from module-info -->
                     <plugin>
-                        <groupId>org.eluder.coveralls</groupId>
-                        <artifactId>coveralls-maven-plugin</artifactId>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <sourceFileExcludes>
+                                <sourceFileExclude>module-info.java</sourceFileExclude>
+                            </sourceFileExcludes>
+                        </configuration>
                     </plugin>
+                </plugins>
+            </build>
+            <reporting>
+                <plugins>
+                    <!-- Avoid errors from module-info -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <sourceFileExcludes>
+                                <sourceFileExclude>module-info.java</sourceFileExclude>
+                            </sourceFileExcludes>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </reporting>
+        </profile>
+        <!-- Setup for Java 9 -->
+        <profile>
+            <id>java9plus</id>
+            <activation>
+                <jdk>[9,)</jdk>
+            </activation>
+            <build>
+                <plugins>
+                    <!-- Compile twice -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-compiler-plugin</artifactId>
                         <executions>
+                            <!-- compile first with module-info for Java 9 -->
                             <execution>
-                                <id>attach-javadocs</id>
+                                <id>default-compile</id>
+                                <configuration>
+                                    <release>9</release>
+                                </configuration>
+                            </execution>
+                            <!-- then compile without module-info for Java 6 -->
+                            <execution>
+                                <id>base-compile</id>
                                 <goals>
-                                    <goal>jar</goal>
+                                    <goal>compile</goal>
                                 </goals>
+                                <configuration>
+                                    <excludes>
+                                        <exclude>module-info.java</exclude>
+                                    </excludes>
+                                </configuration>
                             </execution>
                         </executions>
+                        <!-- setup defaults for compile and testCompile -->
+                        <configuration>
+                            <jdkToolchain>
+                                <version>9</version>
+                            </jdkToolchain>
+                            <release>${book-keeper.release.version}</release>
+                        </configuration>
                     </plugin>
+                    <!-- Hack to extract dependencies for Javadoc plugin -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>${maven-source-plugin.version}</version>
+                        <artifactId>maven-dependency-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>attach-sources</id>
+                                <id>copy-dependencies</id>
+                                <phase>compile</phase>
                                 <goals>
-                                    <goal>jar</goal>
+                                    <goal>copy-dependencies</goal>
                                 </goals>
+                                <configuration>
+                                    <outputDirectory>${project.build.directory}/dependencies</outputDirectory>
+                                    <overWriteReleases>true</overWriteReleases>
+                                    <overWriteIfNewer>true</overWriteIfNewer>
+                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
+                    <!-- Javadoc plugin not Java 9 ready yet -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <configuration>
+                            <additionalparam>--module-path ${project.build.directory}/dependencies</additionalparam>
+                        </configuration>
+                    </plugin>
                 </plugins>
             </build>
+            <reporting>
+                <plugins>
+                    <!-- Javadoc plugin not Java 9 ready yet -->
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>${maven-javadoc-plugin.version}</version>
+                        <configuration>
+                            <additionalparam>--module-path ${project.build.directory}/dependencies</additionalparam>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </reporting>
         </profile>
+        <!-- Main deployment profile, activated by -Doss.repo -->
         <profile>
-            <id>release-sign-artifacts</id>
+            <id>repo-sign-artifacts</id>
             <activation>
                 <property>
-                    <name>performRelease</name>
-                    <value>true</value>
+                    <name>oss.repo</name>
                 </property>
             </activation>
             <build>
                 <plugins>
+                    <!-- Enforce release is on Java 9 -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-source-plugin</artifactId>
-                        <version>3.0.1</version>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <version>${maven-enforcer-plugin.version}</version>
                         <executions>
                             <execution>
-                                <id>attach-sources</id>
+                                <id>enforce-java</id>
                                 <goals>
-                                    <goal>jar-no-fork</goal>
+                                    <goal>enforce</goal>
                                 </goals>
+                                <configuration>
+                                    <rules>
+                                        <requireJavaVersion>
+                                            <version>[9,)</version>
+                                        </requireJavaVersion>
+                                    </rules>
+                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
+                    <!-- Sign artifacts -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.10.4</version>
+                        <artifactId>maven-gpg-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>attach-javadocs</id>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
                                 <goals>
-                                    <goal>jar</goal>
+                                    <goal>sign</goal>
                                 </goals>
                             </execution>
                         </executions>
                     </plugin>
+                    <!-- Create dist files -->
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.6</version>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <configuration>
+                            <attach>false</attach>
+                            <descriptors>
+                                <descriptor>src/main/assembly/dist.xml</descriptor>
+                            </descriptors>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                        </configuration>
                         <executions>
                             <execution>
-                                <id>sign-artifacts</id>
-                                <phase>verify</phase>
+                                <id>make-assembly</id>
+                                <phase>install</phase>
                                 <goals>
-                                    <goal>sign</goal>
+                                    <goal>single</goal>
                                 </goals>
                             </execution>
                         </executions>
                     </plugin>
-                </plugins>
-            </build>
-        </profile>
-        <profile>
-            <id>documentation</id>
-            <build>
-                <plugins>
+                    <!-- Release dist files to GitHub -->
+                    <!-- This will create a tag on GitHub on deploy -->
+                    <!-- The release commit must have been pushed first -->
                     <plugin>
-                        <groupId>org.asciidoctor</groupId>
-                        <artifactId>asciidoctor-maven-plugin</artifactId>
-                        <version>1.5.6</version>
-                        <dependencies>
-                            <dependency>
-                                <groupId>org.asciidoctor</groupId>
-                                <artifactId>asciidoctorj-pdf</artifactId>
-                                <version>1.5.0-alpha.16</version>
-                            </dependency>
-                        </dependencies>
+                        <groupId>de.jutzig</groupId>
+                        <artifactId>github-release-plugin</artifactId>
+                        <version>${github-release-plugin.version}</version>
                         <configuration>
-                            <sourceDirectory>src/main/asciidoc</sourceDirectory>
-                            <baseDir>${project.basedir}</baseDir>
-                            <imagesDir>src/main/asciidoc/images/</imagesDir>
-                            <embedAssets>true</embedAssets>
-                            <!-- eruby>erubis</eruby -->
+                            <releaseName>Release v${project.version}</releaseName>
+                            <tag>v${project.version}</tag>
+                            <overwriteArtifact>true</overwriteArtifact>
+                            <fileSets>
+                                <fileSet>
+                                    <directory>${project.build.directory}</directory>
+                                    <includes>
+                                        <include>${book-keeper.artifactId}*-dist.tar.gz</include>
+                                        <include>${book-keeper.artifactId}*-dist.zip</include>
+                                    </includes>
+                                </fileSet>
+                            </fileSets>
                         </configuration>
                         <executions>
                             <execution>
-                                <id>output-html</id>
-                                <phase>prepare-package</phase>
-                                <goals>
-                                    <goal>process-asciidoc</goal>
-                                </goals>
-                                <configuration>
-                                    <outputDirectory>target/docs</outputDirectory>
-                                    <sourceHighlighter>coderay</sourceHighlighter>
-                                    <backend>html</backend>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>output-pdf</id>
-                                <phase>prepare-package</phase>
+                                <id>github-releases</id>
+                                <phase>deploy</phase>
                                 <goals>
-                                    <goal>process-asciidoc</goal>
+                                    <goal>release</goal>
                                 </goals>
-                                <configuration>
-                                    <backend>pdf</backend>
-                                    <!-- WARNING callout bullets don't yet work with CodeRay -->
-                                    <sourceHighlighter>coderay</sourceHighlighter>
-                                    <attributes>
-                                        <pagenums />
-                                        <toc />
-                                        <idprefix />
-                                        <idseparator>-</idseparator>
-                                    </attributes>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
                 </plugins>
             </build>
+            <properties>
+                <additionalparam></additionalparam>
+            </properties>
         </profile>
     </profiles>
 
-    <ciManagement>
-        <system>Travis CI</system>
-        <url>https://travis-ci.org/ghacupha/book-keeper</url>
-    </ciManagement>
-
-    <distributionManagement>
-        <snapshotRepository>
-            <id>sonatype-nexus</id>
-            <name>Sonatype Nexus Snapshots</name>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
-        </snapshotRepository>
-    </distributionManagement>
-
     <build>
-        <defaultGoal>install</defaultGoal>
-
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
@@ -313,186 +392,32 @@
                 </includes>
             </resource>
         </resources>
-
-        <extensions>
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-ssh</artifactId>
-                <version>2.4</version>
-            </extension>
-            <extension>
-                <groupId>org.apache.maven.wagon</groupId>
-                <artifactId>wagon-webdav-jackrabbit</artifactId>
-                <version>2.2</version>
-            </extension>
-        </extensions>
-
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>versions-maven-plugin</artifactId>
-                    <version>2.5</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.5.3</version>
-                </plugin>
-                <!-- Enforce Maven 3.5.0-->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <id>enforce-versions</id>
-                            <goals>
-                                <goal>enforce</goal>
-                            </goals>
-                            <configuration>
-                                <rules>
-                                    <requireMavenVersion>
-                                        <version>3.5.0</version>
-                                    </requireMavenVersion>
-                                    <requireJavaVersion>
-                                        <version>1.8.0</version>
-                                    </requireJavaVersion>
-                                    <!-- <bannedDependencies> <excludes> <exclude>commons-logging:*</exclude>
-                                        </excludes> </bannedDependencies> -->
-                                    <requirePluginVersions>
-                                        <banLatest>true</banLatest>
-                                        <banRelease>true</banRelease>
-                                        <banSnapshots>true</banSnapshots>
-                                        <!-- <unCheckedPluginList>org.codehaus.mojo:sonar-maven-plugin</unCheckedPluginList> -->
-                                    </requirePluginVersions>
-                                </rules>
-                            </configuration>
-                        </execution>
-                    </executions>
-                </plugin>
-                <!-- ======================================================= -->
-                <!-- Packaging (OSGi bundle) -->
-                <!-- ======================================================= -->
-                <plugin>
-                    <groupId>org.apache.felix</groupId>
-                    <artifactId>maven-bundle-plugin</artifactId>
-                    <version>2.5.3</version>
-                    <extensions>true</extensions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.0.2</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.jacoco</groupId>
-                    <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.7.2.201409121644</version>
-                    <executions>
-                        <execution>
-                            <id>prepare-agent</id>
-                            <goals>
-                                <goal>prepare-agent</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
+        <!-- define build -->
         <plugins>
-            <!--<plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>2.0.0.RELEASE</version>
-                <configuration>
-                    <addResources>true</addResources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>build-info</goal>
-                        </goals>
-                        <configuration>
-                            <additionalProperties>
-                                <encoding.source>UTF-8</encoding.source>
-                                <encoding.reporting>UTF-8</encoding.reporting>
-                                <java.source>${maven.compiler.source}</java.source>
-                                <java.target>${maven.compiler.target}</java.target>
-                            </additionalProperties>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>-->
-                <plugin>
-                    <groupId>org.sonatype.plugins</groupId>
-                    <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>1.6.8</version>
-                    <extensions>true</extensions>
-                    <configuration>
-                        <serverId>sonatype-nexus</serverId>
-                        <nexusUrl>https://oss.sonatype.org/</nexusUrl>
-                        <autoReleaseAfterClose>true</autoReleaseAfterClose>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <configuration>
-                        <autoVersionSubmodules>true</autoVersionSubmodules>
-                        <useReleaseProfile>false</useReleaseProfile>
-                        <releaseProfiles>release</releaseProfiles>
-                        <goals>deploy</goals>
-                    </configuration>
-                </plugin>
+            <!-- Enforce Maven 3.5.0 -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>${maven-compiler-plugin.version}</version>
-                <configuration>
-                    <source>${maven.compiler.source}</source>
-                    <target>${maven.compiler.target}</target>
-                    <fork>${maven.compiler.fork}</fork>
-                    <executable>${maven.compiler.executable}</executable>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.7</version>
+                <artifactId>maven-enforcer-plugin</artifactId>
                 <executions>
-                    <!--
-                        States that the plugin's add-test-source goal is executed at
-                        generate-test-sources phase.
-                    -->
                     <execution>
-                        <id>add-integration-test-sources</id>
-                        <phase>generate-test-sources</phase>
+                        <id>enforce-maven</id>
                         <goals>
-                            <goal>add-test-source</goal>
+                            <goal>enforce</goal>
                         </goals>
                         <configuration>
-                            <!-- Configures the source directory of integration tests. -->
-                            <sources>
-                                <source>src/integration-test/java</source>
-                            </sources>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>3.5.0</version>
+                                </requireMavenVersion>
+                            </rules>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.0.2</version>
-                <configuration>
-                    <encoding>${project.build.sourceEncoding}</encoding>
-                </configuration>
-            </plugin>
             <!-- Setup Checkstyle, excluding module-info -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>${maven-checkstyle-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>run-checkstyle</id>
@@ -503,38 +428,10 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <!--// Allow java 9 module configs-->
                     <excludes>module-info.java</excludes>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>2.21.0</version>
-                <executions>
-                    <!--
-                        Ensures that both integration-test and verify goals of the Failsafe Maven
-                        plugin are executed.
-                    -->
-                    <execution>
-                        <id>integration-tests</id>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the VM argument line used when integration tests are run. -->
-                            <argLine>${failsafeArgLine}</argLine>
-
-                            <!--
-                                Skips integration tests if the value of skip.integration.tests property
-                                is true
-                            -->
-                            <skipTests>${it.skip}</skipTests>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+            <!-- Setup Jar file manifest entries -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
@@ -545,19 +442,43 @@
                             <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
                             <addDefaultSpecificationEntries>true</addDefaultSpecificationEntries>
                         </manifest>
+                        <manifestEntries>
+                            <Automatic-Module-Name>${book-keeper.module.name}</Automatic-Module-Name>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>
-
-            <!-- Setup javadoc jar-->
+            <!-- Setup OSGi bundle data, with fix for Java 9 -->
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <version>2.5.4</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>biz.aQute.bnd</groupId>
+                        <artifactId>biz.aQute.bndlib</artifactId>
+                        <version>3.5.0</version>
+                    </dependency>
+                </dependencies>
+                <executions>
+                    <execution>
+                        <id>bundle-manifest</id>
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>manifest</goal>
+                        </goals>
+                        <configuration>
+                            <instructions>
+                                <Export-Package>${book-keeper.osgi.packages}</Export-Package>
+                            </instructions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- Setup Javadoc jar -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.0.0</version>
-                <configuration>
-                    <show>private</show>
-                    <nohelp>true</nohelp>
-                </configuration>
                 <executions>
                     <execution>
                         <id>attach-javadocs</id>
@@ -568,12 +489,10 @@
                     </execution>
                 </executions>
             </plugin>
-
             <!-- Setup source jar -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>${maven-source-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -584,172 +503,238 @@
                     </execution>
                 </executions>
             </plugin>
-
+            <!-- Setup spotbugs dependency, would normally only be in reporting section -->
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-pdf-plugin</artifactId>
-                <version>1.4</version>
-                <executions>
-                    <execution>
-                        <id>pdf</id>
-                        <phase>site</phase>
-                        <goals>
-                            <goal>pdf</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${project.reporting.outputDirectory}</outputDirectory>
-                            <includeReports>true</includeReports>
-                        </configuration>
-                    </execution>
-                </executions>
+                <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>0.7.5.201505241946</version>
+                <version>${jacoco-maven-plugin.version}</version>
                 <executions>
-                    <!--
-                        Prepares the property pointing to the JaCoCo runtime agent which
-                        is passed as VM argument when Maven the Surefire plugin is executed.
-                    -->
                     <execution>
-                        <id>pre-unit-test</id>
+                        <id>jacoco-initialize</id>
                         <goals>
                             <goal>prepare-agent</goal>
                         </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <destFile>${jacoco.ut.execution.data.file}</destFile>
-                            <!--
-                                Sets the name of the property containing the settings
-                                for JaCoCo runtime agent.
-                            -->
-                            <propertyName>surefireArgLine</propertyName>
-                        </configuration>
                     </execution>
-                    <!--
-                        Ensures that the code coverage report for unit tests is created after
-                        unit tests have been run.
-                    -->
                     <execution>
-                        <id>post-unit-test</id>
-                        <phase>test</phase>
-                        <goals>
-                            <goal>report</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <dataFile>${jacoco.ut.execution.data.file}</dataFile>
-                            <!-- Sets the output directory for the code coverage report. -->
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
-                        </configuration>
-                    </execution>
-                    <!--
-                        Prepares the property pointing to the JaCoCo runtime agent which
-                        is passed as VM argument when Maven the Failsafe plugin is executed.
-                    -->
-                    <execution>
-                        <id>pre-integration-test</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <destFile>${jacoco.it.execution.data.file}</destFile>
-                            <!--
-                                Sets the name of the property containing the settings
-                                for JaCoCo runtime agent.
-                            -->
-                            <propertyName>failsafeArgLine</propertyName>
-                        </configuration>
-                    </execution>
-                    <!--
-                        Ensures that the code coverage report for integration tests after
-                        integration tests have been run.
-                    -->
-                    <execution>
-                        <id>post-integration-test</id>
-                        <phase>post-integration-test</phase>
+                        <id>jacoco-site</id>
+                        <phase>package</phase>
                         <goals>
                             <goal>report</goal>
                         </goals>
-                        <configuration>
-                            <!-- Sets the path to the file which contains the execution data. -->
-                            <dataFile>${jacoco.it.execution.data.file}</dataFile>
-                            <!-- Sets the output directory for the code coverage report. -->
-                            <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>
+            <!-- Setup site with reflow maven skin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.21.0</version>
+                <artifactId>maven-site-plugin</artifactId>
                 <configuration>
-                    <!-- Sets the VM argument line used when unit tests are run. -->
-                    <argLine>${surefireArgLine}</argLine>
-                    <!-- Skips unit tests if the value of skip.unit.tests property is true -->
-                    <skipTests>${skip.unit.tests}</skipTests>
-                    <!-- Excludes integration tests when unit tests are run. -->
-                    <excludes>
-                        <exclude>**/IT*.java</exclude>
-                    </excludes>
+                    <skipDeploy>true</skipDeploy>
                 </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>cobertura-maven-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <outputDirectory>${basedir}/target</outputDirectory>
-                    <format>xml</format>
-                    <maxmem>256m</maxmem>
-                    <!-- aggregated reports for multi-module projects -->
-                    <aggregate>true</aggregate>
-                    <check />
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>2.5.4</version>
                 <dependencies>
                     <dependency>
-                        <groupId>biz.aQute.bnd</groupId>
-                        <artifactId>biz.aQute.bndlib</artifactId>
-                        <version>3.5.0</version>
+                        <groupId>lt.velykis.maven.skins</groupId>
+                        <artifactId>reflow-velocity-tools</artifactId>
+                        <version>1.1.1</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.apache.velocity</groupId>
+                        <artifactId>velocity</artifactId>
+                        <version>1.7</version>
                     </dependency>
                 </dependencies>
-                <executions>
-                    <execution>
-                        <id>bundle-manifest</id>
-                        <phase>process-classes</phase>
-                        <goals>
-                            <goal>manifest</goal>
-                        </goals>
-                        <!--<configuration>
-                            <instructions>
-                                <Export-Package>${ghacupha.osgi.packages}</Export-Package>
-                            </instructions>
-                        </configuration>-->
-                    </execution>
-                </executions>
             </plugin>
+            <!-- Setup to deploy site to GitHub, invoked with mvn site-deploy -->
             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>exec-maven-plugin</artifactId>
-                <version>1.4.0</version>
+                <groupId>com.github.github</groupId>
+                <artifactId>site-maven-plugin</artifactId>
+                <version>0.12</version>
                 <executions>
                     <execution>
+                        <id>github-site</id>
                         <goals>
-                            <goal>java</goal>
+                            <goal>site</goal>
                         </goals>
+                        <phase>site-deploy</phase>
                     </execution>
                 </executions>
+                <configuration>
+                    <message>Create website for ${project.artifactId} v${project.version}</message>
+                    <path>${project.artifactId}</path>
+                    <merge>true</merge>
+                    <server>github</server>
+                    <repositoryOwner>Edwin Njeru</repositoryOwner>
+                    <repositoryName>io.github.ghacupha.keeper.book</repositoryName>
+                    <branch>refs/heads/master</branch>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>9</source>
+                    <target>9</target>
+                </configuration>
             </plugin>
         </plugins>
+        <!-- Manage plugin versions -->
+        <pluginManagement>
+            <plugins>
+                <!-- Maven build and reporting plugins (alphabetical) -->
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-assembly-plugin</artifactId>
+                    <version>${maven-assembly-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-checkstyle-plugin</artifactId>
+                    <version>${maven-checkstyle-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-changes-plugin</artifactId>
+                    <version>${maven-changes-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-clean-plugin</artifactId>
+                    <version>${maven-clean-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven-compiler-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>${maven-deploy-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-dependency-plugin</artifactId>
+                    <version>${maven-dependency-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-enforcer-plugin</artifactId>
+                    <version>${maven-enforcer-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-gpg-plugin</artifactId>
+                    <version>${maven-gpg-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-install-plugin</artifactId>
+                    <version>${maven-install-plugin.version}</version>
+                </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-javadoc-plugin</artifactId>
+                    <version>${maven-javadoc-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jxr-plugin</artifactId>
+                    <version>${maven-jxr-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-plugin-plugin</artifactId>
+                    <version>${maven-plugin-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-pmd-plugin</artifactId>
+                    <version>${maven-pmd-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-project-info-reports-plugin</artifactId>
+                    <version>${maven-project-info-reports-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-repository-plugin</artifactId>
+                    <version>${maven-repository-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>${maven-resources-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <version>${maven-site-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>${maven-source-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven-surefire-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-report-plugin</artifactId>
+                    <version>${maven-surefire-report-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-toolchains-plugin</artifactId>
+                    <version>${maven-toolchains-plugin.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>org.apache.felix</groupId>
+                                        <artifactId>maven-bundle-plugin</artifactId>
+                                        <versionRange>[2.5.4,)</versionRange>
+                                        <goals>
+                                            <goal>manifest</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore></ignore>
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
     </build>
 
     <!-- ==================================================================== -->
@@ -856,44 +841,6 @@
         </plugins>
     </reporting>
 
-    <repositories>
-        <repository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-snapshots</id>
-            <name>Spring Snapshots</name>
-            <url>https://repo.spring.io/snapshot</url>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
     <dependencies>
         <!-- https://mvnrepository.com/artifact/org.joda/joda-money -->
         <dependency>
@@ -913,164 +860,33 @@
             <version>4.12</version>
             <scope>compile</scope>
         </dependency>
-
-        <!-- // Plugins. Uncomment to download-->
-        <!--<dependency>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>jdepend-maven-plugin</artifactId>
-            <version>2.0</version>
-            <type>maven-plugin</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-report-plugin</artifactId>
-            <version>2.20.1</version>
-            <type>maven-plugin</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-pmd-plugin</artifactId>
-            <version>3.0.1</version>
-            <type>maven-plugin</type>
-        </dependency>
-        <dependency>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>taglist-maven-plugin</artifactId>
-            <version>2.4</version>
-            <type>maven-plugin</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jxr-plugin</artifactId>
-            <version>2.3</version>
-            <type>maven-plugin</type>
-        </dependency>
-        <dependency>
-            <groupId>org.jacoco</groupId>
-            <artifactId>jacoco-maven-plugin</artifactId>
-            <version>0.8.0</version>
-            <type>maven-plugin</type>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.codehaus.mojo/findbugs-maven-plugin &ndash;&gt;
-        <dependency>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>findbugs-maven-plugin</artifactId>
-            <version>3.0.5</version>
-            <type>maven-plugin</type>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-project-info-reports-plugin &ndash;&gt;
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-project-info-reports-plugin</artifactId>
-            <version>2.9</version>
-            <type>maven-plugin</type>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.asciidoctor/asciidoctor-maven-plugin &ndash;&gt;
-        <dependency>
-            <groupId>org.asciidoctor</groupId>
-            <artifactId>asciidoctor-maven-plugin</artifactId>
-            <version>1.5.6</version>
-            <type>maven-plugin</type>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.asciidoctor/asciidoctorj-pdf &ndash;&gt;
-        <dependency>
-            <groupId>org.asciidoctor</groupId>
-            <artifactId>asciidoctorj-pdf</artifactId>
-            <version>1.5.0-alpha.16</version>
-            <type>maven-plugin</type>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-release-plugin &ndash;&gt;
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-release-plugin</artifactId>
-            <version>2.5.3</version>
-            <type>maven-plugin</type>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-resources-plugin &ndash;&gt;
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-resources-plugin</artifactId>
-            <version>3.0.2</version>
-            <type>maven-plugin</type>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-compiler-plugin &ndash;&gt;
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.7.0</version>
-            <type>maven-plugin</type>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-surefire-plugin &ndash;&gt;
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>2.21.0</version>
-            <type>maven-plugin</type>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-failsafe-plugin &ndash;&gt;
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-failsafe-plugin</artifactId>
-            <version>2.21.0</version>
-            <type>maven-plugin</type>
-            <scope>test</scope>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.springframework.boot/spring-boot-maven-plugin &ndash;&gt;
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-maven-plugin</artifactId>
-            <version>2.0.0.RELEASE</version>
-            <type>maven-plugin</type>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.codehaus.mojo/versions-maven-plugin &ndash;&gt;
-        <dependency>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>versions-maven-plugin</artifactId>
-            <version>2.5</version>
-            <type>maven-plugin</type>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.codehaus.woodstox/woodstox-core-asl &ndash;&gt;
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>woodstox-core-asl</artifactId>
-            <version>4.2.0</version>
-            <type>maven-plugin</type>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-jar-plugin &ndash;&gt;
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <version>3.0.2</version>
-            <type>maven-plugin</type>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-site-plugin &ndash;&gt;
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-site-plugin</artifactId>
-            <version>3.7</version>
-            <type>maven-plugin</type>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-changes-plugin &ndash;&gt;
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-changes-plugin</artifactId>
-            <version>${maven-changes-plugin.version}</version>
-            <type>maven-plugin</type>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-project-info-reports-plugin &ndash;&gt;
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-project-info-reports-plugin</artifactId>
-            <version>${maven-project-info-reports-plugin.version}</version>
-        </dependency>
-        &lt;!&ndash; https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-pmd-plugin &ndash;&gt;
-        <dependency>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-pmd-plugin</artifactId>
-            <version>${maven-pmd-plugin.version}</version>
-        </dependency>-->
-
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>central</id>
+            <name>Maven Repository Switchboard</name>
+            <layout>default</layout>
+            <url>http://repo1.maven.org/maven2</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+
+    <pluginRepositories>
+        <pluginRepository>
+            <id>central</id>
+            <name>Maven Plugin Repository</name>
+            <url>http://repo1.maven.org/maven2</url>
+            <layout>default</layout>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <updatePolicy>never</updatePolicy>
+            </releases>
+        </pluginRepository>
+    </pluginRepositories>
 
 </project>
diff --git a/src/main/checkstyle/checkstyle.xml b/src/main/checkstyle/checkstyle.xml
index b7d1d83..00ddd9d 100644
--- a/src/main/checkstyle/checkstyle.xml
+++ b/src/main/checkstyle/checkstyle.xml
@@ -2,141 +2,151 @@
 <!DOCTYPE module PUBLIC "-//Puppy Crawl//DTD Check Configuration 1.3//EN" "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 
 <module name="Checker">
-    <property name="severity" value="warning"/>
-    <module name="TreeWalker">
-        <property name="tabWidth" value="4"/>
-        <module name="FileContentsHolder"/>
-        <module name="ConstantName">
-            <property name="format" value="^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$|^[a-z][a-zA-Z0-9]*$"/>
-        </module>
-        <module name="AvoidStarImport">
-            <property name="severity" value="error"/>
-        </module>
-        <module name="EmptyBlock">
-            <property name="tokens" value="LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_FOR,LITERAL_TRY,LITERAL_WHILE,STATIC_INIT"/>
-        </module>
-        <module name="EmptyForInitializerPad">
-            <property name="option" value="space"/>
-        </module>
-        <module name="EmptyForIteratorPad">
-            <property name="option" value="space"/>
-        </module>
-        <module name="EqualsHashCode"/>
-        <module name="IllegalImport"/>
-        <module name="IllegalInstantiation">
-            <property name="classes" value="Boolean"/>
-        </module>
-        <module name="JavadocType">
-            <property name="scope" value="protected"/>
-        </module>
-        <module name="JavadocMethod">
-            <property name="scope" value="protected"/>
-            <property name="allowUndeclaredRTE" value="true"/>
-            <property name="allowMissingThrowsTags" value="true"/>
-            <property name="allowMissingJavadoc" value="true"/>
-            <property name="allowMissingPropertyJavadoc" value="true"/>
-            <property name="logLoadErrors" value="true"/>
-            <property name="suppressLoadErrors" value="true"/>
-        </module>
-        <module name="JavadocVariable">
-            <property name="scope" value="protected"/>
-        </module>
-        <module name="LeftCurly">
-            <property name="severity" value="error"/>
-        </module>
-        <module name="LineLength">
-            <property name="ignorePattern" value="^ *\* *[^ ]+$"/>
-            <property name="max" value="200"/>
-            <property name="tabWidth" value="2"/>
-        </module>
-        <module name="LocalFinalVariableName"/>
-        <module name="LocalVariableName"/>
-        <module name="MemberName">
-            <property name="format" value="^[a-z][a-zA-Z0-9$]*$"/>
-        </module>
-        <module name="MethodLength">
-            <property name="max" value="300"/>
-        </module>
-        <module name="MethodName"/>
-        <module name="ModifierOrder">
-            <property name="severity" value="error"/>
-        </module>
-        <module name="NeedBraces">
-            <property name="severity" value="error"/>
-        </module>
-        <module name="NoWhitespaceAfter"/>
-        <module name="NoWhitespaceBefore">
-            <property name="allowLineBreaks" value="true"/>
-            <property name="tokens" value="SEMI,DOT,POST_DEC,POST_INC"/>
-        </module>
-        <module name="OperatorWrap">
-            <property name="option" value="eol"/>
-            <property name="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
-        </module>
-        <module name="PackageName"/>
-        <module name="ParameterName"/>
-        <module name="ParameterNumber">
-            <property name="max" value="20"/>
-        </module>
-        <module name="ParenPad"/>
-        <module name="RedundantImport"/>
-        <module name="RightCurly">
-            <property name="severity" value="error"/>
-        </module>
-        <module name="StaticVariableName">
-            <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
-        </module>
-        <module name="TypeName"/>
-        <module name="TypecastParenPad"/>
-        <module name="UpperEll">
-            <property name="severity" value="error"/>
-        </module>
-        <module name="VisibilityModifier"/>
-        <module name="WhitespaceAfter"/>
-        <module name="WhitespaceAround">
-            <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/>
-            <property name="allowEmptyConstructors" value="true"/>
-            <property name="allowEmptyMethods" value="true"/>
-        </module>
-        <module name="MissingDeprecated"/>
-        <module name="MissingOverride"/>
-        <module name="PackageAnnotation"/>
-        <module name="CovariantEquals"/>
-        <module name="DefaultComesLast"/>
-        <module name="ExplicitInitialization"/>
-        <module name="FallThrough"/>
-        <module name="InnerAssignment"/>
-        <module name="StringLiteralEquality"/>
-        <module name="GenericWhitespace"/>
-        <module name="MethodParamPad"/>
-        <module name="FinalClass"/>
-        <module name="MutableException"/>
-        <module name="ArrayTypeStyle">
-            <property name="severity" value="error"/>
-        </module>
-        <module name="Indentation">
-            <property name="basicOffset" value="4"/>
-            <property name="caseIndent" value="4"/>
-        </module>
-    </module>
-    <!-- Header inlined due to m2e -->
-    <module name="RegexpHeader">
-        <property name="header" value="^/\*[*]?\n^ \*  Copyright 2018 Edwin Njeru"/>
-        <property name="fileExtensions" value="java"/>
-    </module>
-    <module name="SuppressionCommentFilter">
-        <property name="offCommentFormat" value="CSOFF"/>
-        <property name="onCommentFormat" value="CSON"/>
-    </module>
-    <module name="FileLength"/>
-    <module name="FileTabCharacter">
-        <property name="eachLine" value="true"/>
-        <property name="severity" value="error"/>
-    </module>
-    <module name="NewlineAtEndOfFile"/>
-    <module name="SuppressWithNearbyCommentFilter">
-        <property name="commentFormat" value="CSIGNORE"/>
-        <property name="checkFormat" value=".*"/>
-        <property name="checkC" value="false"/>
+  <property name="severity" value="warning"/>
+  <module name="TreeWalker">
+    <property name="tabWidth" value="4"/>
+    <module name="FileContentsHolder"/>
+    <module name="ConstantName">
+      <property name="format" value="^[A-Z][A-Z0-9]*(_[A-Z0-9]+)*$|^[a-z][a-zA-Z0-9]*$"/>
+    </module>
+    <module name="AvoidStarImport">
+      <property name="severity" value="error"/>
+    </module>
+    <module name="EmptyBlock">
+      <property name="tokens" value="LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_IF,LITERAL_FOR,LITERAL_TRY,LITERAL_WHILE,STATIC_INIT"/>
+    </module>
+    <module name="EmptyForInitializerPad">
+      <property name="option" value="space"/>
+    </module>
+    <module name="EmptyForIteratorPad">
+      <property name="option" value="space"/>
+    </module>
+    <module name="EqualsHashCode"/>
+    <module name="IllegalImport"/>
+    <module name="IllegalInstantiation">
+      <property name="classes" value="Boolean"/>
+    </module>
+    <module name="JavadocType">
+      <property name="scope" value="protected"/>
+        <property name="severity" value="warning"/>
+    </module>
+    <module name="JavadocMethod">
+      <property name="scope" value="protected"/>
+      <property name="allowUndeclaredRTE" value="true"/>
+      <property name="allowMissingThrowsTags" value="true"/>
+      <property name="allowMissingJavadoc" value="true"/>
+      <property name="allowMissingPropertyJavadoc" value="true"/>
+      <property name="logLoadErrors" value="true"/>
+      <property name="suppressLoadErrors" value="true"/>
+        <property name="severity" value="warning"/>
+    </module>
+    <module name="JavadocVariable">
+      <property name="scope" value="protected"/>
+        <property name="severity" value="warning"/>
+    </module>
+    <module name="LeftCurly">
+      <property name="severity" value="error"/>
+    </module>
+    <module name="LineLength">
+      <property name="ignorePattern" value="^ *\* *[^ ]+$"/>
+      <property name="max" value="200"/>
+      <property name="tabWidth" value="2"/>
+        <property name="severity" value="warning"/>
+    </module>
+    <module name="LocalFinalVariableName"/>
+    <module name="LocalVariableName"/>
+    <module name="MemberName">
+      <property name="format" value="^[a-z][a-zA-Z0-9$]*$"/>
+       <property name="severity" value="error"/>
+    </module>
+    <module name="MethodLength">
+      <property name="max" value="300"/>
+        <property name="severity" value="warning"/>
     </module>
+    <module name="MethodName"/>
+    <module name="ModifierOrder">
+      <property name="severity" value="error"/>
+    </module>
+    <module name="NeedBraces">
+      <property name="severity" value="error"/>
+    </module>
+    <module name="NoWhitespaceAfter"/>
+    <module name="NoWhitespaceBefore">
+      <property name="allowLineBreaks" value="true"/>
+      <property name="tokens" value="SEMI,DOT,POST_DEC,POST_INC"/>
+        <property name="severity" value="warning"/>
+    </module>
+    <module name="OperatorWrap">
+      <property name="option" value="eol"/>
+      <property name="tokens" value="ASSIGN, DIV_ASSIGN, PLUS_ASSIGN, MINUS_ASSIGN, STAR_ASSIGN, MOD_ASSIGN, SR_ASSIGN, BSR_ASSIGN, SL_ASSIGN, BXOR_ASSIGN, BOR_ASSIGN, BAND_ASSIGN"/>
+    </module>
+    <module name="PackageName"/>
+    <module name="ParameterName"/>
+    <module name="ParameterNumber">
+      <property name="max" value="20"/>
+    </module>
+    <module name="ParenPad"/>
+    <module name="RedundantImport"/>
+    <module name="RightCurly">
+      <property name="severity" value="error"/>
+    </module>
+    <module name="StaticVariableName">
+      <property name="format" value="^[a-z][a-zA-Z0-9]*$"/>
+    </module>
+    <module name="TypeName"/>
+    <module name="TypecastParenPad"/>
+    <module name="UpperEll">
+      <property name="severity" value="error"/>
+    </module>
+    <module name="VisibilityModifier"/>
+    <module name="WhitespaceAfter"/>
+    <module name="WhitespaceAround">
+      <property name="tokens" value="ASSIGN,BAND,BAND_ASSIGN,BOR,BOR_ASSIGN,BSR,BSR_ASSIGN,BXOR,BXOR_ASSIGN,COLON,DIV,DIV_ASSIGN,EQUAL,GE,GT,LAND,LCURLY,LE,LITERAL_ASSERT,LITERAL_CATCH,LITERAL_DO,LITERAL_ELSE,LITERAL_FINALLY,LITERAL_FOR,LITERAL_IF,LITERAL_RETURN,LITERAL_SYNCHRONIZED,LITERAL_TRY,LITERAL_WHILE,LOR,LT,MINUS,MINUS_ASSIGN,MOD,MOD_ASSIGN,NOT_EQUAL,PLUS,PLUS_ASSIGN,QUESTION,RCURLY,SL,SLIST,SL_ASSIGN,SR,SR_ASSIGN,STAR,STAR_ASSIGN,LITERAL_ASSERT,TYPE_EXTENSION_AND"/>
+      <property name="allowEmptyConstructors" value="true"/>
+      <property name="allowEmptyMethods" value="true"/>
+    </module>
+    <module name="MissingDeprecated"/>
+    <module name="MissingOverride"/>
+    <module name="PackageAnnotation"/>
+    <module name="CovariantEquals"/>
+    <module name="DefaultComesLast"/>
+    <module name="ExplicitInitialization"/>
+    <module name="FallThrough"/>
+    <module name="InnerAssignment"/>
+    <module name="StringLiteralEquality"/>
+    <module name="GenericWhitespace"/>
+    <module name="MethodParamPad"/>
+    <module name="FinalClass"/>
+    <module name="MutableException"/>
+    <module name="ArrayTypeStyle">
+      <property name="severity" value="error"/>
+    </module>
+    <module name="Indentation">
+      <property name="basicOffset" value="4"/>
+      <property name="caseIndent" value="4"/>
+        <property name="severity" value="warning"/>
+    </module>
+    <property name="severity" value="warning"/>
+  </module>
+  <!-- Header inlined due to m2e -->
+  <module name="RegexpHeader">
+    <property name="header" value="^/\*[*]?\n^ \*  Copyright 2018 Edwin Njeru"/>
+    <property name="fileExtensions" value="java"/>
+    <property name="severity" value="error"/>
+  </module>
+  <module name="SuppressionCommentFilter">
+    <property name="offCommentFormat" value="CSOFF"/>
+    <property name="onCommentFormat" value="CSON"/>
+  </module>
+  <module name="FileLength"/>
+  <module name="FileTabCharacter">
+    <property name="eachLine" value="true"/>
+    <property name="severity" value="error"/>
+  </module>
+  <module name="NewlineAtEndOfFile"/>
+  <module name="SuppressWithNearbyCommentFilter">
+    <property name="commentFormat" value="CSIGNORE"/>
+    <property name="checkFormat" value=".*"/>
+    <property name="checkC" value="false"/>
+  </module>
 </module>
diff --git a/src/main/java/io/github/ghacupha/keeper/book/util/ImmutableEntryException.java b/src/main/java/io/github/ghacupha/keeper/book/util/ImmutableEntryException.java
index 7687c7d..1a2607b 100644
--- a/src/main/java/io/github/ghacupha/keeper/book/util/ImmutableEntryException.java
+++ b/src/main/java/io/github/ghacupha/keeper/book/util/ImmutableEntryException.java
@@ -16,8 +16,8 @@
 
 package io.github.ghacupha.keeper.book.util;
 
-import io.github.ghacupha.keeper.book.Entry;
-import io.github.ghacupha.keeper.book.EntryAttributes;
+import io.github.ghacupha.keeper.book.api.Entry;
+import io.github.ghacupha.keeper.book.api.EntryAttributes;
 
 /**
  * Exception thrown when {@link EntryAttributes} are added to an {@link Entry} after the {@link Entry} has been set
diff --git a/src/main/java/io/github/ghacupha/keeper/book/util/MismatchedCurrencyException.java b/src/main/java/io/github/ghacupha/keeper/book/util/MismatchedCurrencyException.java
index 5ec7fb9..5a6cdbf 100644
--- a/src/main/java/io/github/ghacupha/keeper/book/util/MismatchedCurrencyException.java
+++ b/src/main/java/io/github/ghacupha/keeper/book/util/MismatchedCurrencyException.java
@@ -16,9 +16,7 @@
 
 package io.github.ghacupha.keeper.book.util;
 
-import io.github.ghacupha.keeper.book.Account;
-import io.github.ghacupha.keeper.book.Entry;
-import io.github.ghacupha.keeper.book.Transaction;
+import io.github.ghacupha.keeper.book.api.*;
 
 import java.util.Currency;
 
diff --git a/src/main/java/io/github/ghacupha/keeper/book/util/UnableToPostException.java b/src/main/java/io/github/ghacupha/keeper/book/util/UnableToPostException.java
index 7e6100c..ef8c0ab 100644
--- a/src/main/java/io/github/ghacupha/keeper/book/util/UnableToPostException.java
+++ b/src/main/java/io/github/ghacupha/keeper/book/util/UnableToPostException.java
@@ -16,8 +16,8 @@
 
 package io.github.ghacupha.keeper.book.util;
 
-import io.github.ghacupha.keeper.book.Entry;
-import io.github.ghacupha.keeper.book.internal.AccountingTransaction;
+import io.github.ghacupha.keeper.book.api.Entry;
+import io.github.ghacupha.keeper.book.base.AccountingTransaction;
 
 /**
  * This exception is thrown when the {@link AccountingTransaction} client
diff --git a/src/main/java/io/github/ghacupha/keeper/book/util/UntimelyBookingDateException.java b/src/main/java/io/github/ghacupha/keeper/book/util/UntimelyBookingDateException.java
index 2c0d49e..c502fc7 100644
--- a/src/main/java/io/github/ghacupha/keeper/book/util/UntimelyBookingDateException.java
+++ b/src/main/java/io/github/ghacupha/keeper/book/util/UntimelyBookingDateException.java
@@ -16,9 +16,9 @@
 
 package io.github.ghacupha.keeper.book.util;
 
-import io.github.ghacupha.keeper.book.Account;
-import io.github.ghacupha.keeper.book.Entry;
-import io.github.ghacupha.keeper.book.internal.AccountDetails;
+import io.github.ghacupha.keeper.book.api.Account;
+import io.github.ghacupha.keeper.book.api.Entry;
+import io.github.ghacupha.keeper.book.base.AccountDetails;
 import io.github.ghacupha.keeper.book.unit.time.TimePoint;
 
 /**
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
new file mode 100644
index 0000000..e788566
--- /dev/null
+++ b/src/main/java/module-info.java
@@ -0,0 +1,7 @@
+module book.keeper {
+    requires slf4j.api;
+    requires joda.money;
+
+    exports io.github.ghacupha.keeper.book.api;
+    exports io.github.ghacupha.keeper.book.base;
+}
\ No newline at end of file

From 89ba7c8106eb68d213c1a8c4afaf7eb8b983f404 Mon Sep 17 00:00:00 2001
From: Edwin Njeru <mailnjeru@gmail.com>
Date: Wed, 21 Mar 2018 15:29:59 +0300
Subject: [PATCH 3/3] reconfiguration of the project object model

---
 pom.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pom.xml b/pom.xml
index 3954152..a8ed75b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -45,15 +45,15 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
+        <maven.compile.targetLevel>1.8</maven.compile.targetLevel>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
         <it.skip>false</it.skip>
         <skip.unit.tests>false</skip.unit.tests>
         <surefireArgLine>-Dapp.env=LOCAL -Dapp.domain=localhost -Dapp.port=9901</surefireArgLine>
         <failsafeArgLine>-Dapp.env=LOCAL -Dapp.domain=localhost -Dapp.port=9901</failsafeArgLine>
         <env.TRAVIS_JOB_ID />
-        <maven.compile.targetLevel>9</maven.compile.targetLevel>
-        <maven.compiler.source>9</maven.compiler.source>
-        <maven.compiler.target>9</maven.compiler.target>
-        <maven.compiler.executable>javac9</maven.compiler.executable>
+
         <maven.compiler.fork>true</maven.compiler.fork>
         <maven-changes-plugin.version>2.12.1</maven-changes-plugin.version>
         <project.reporting.outputDirectory>"documentation"</project.reporting.outputDirectory>
@@ -225,9 +225,9 @@
                         <!-- setup defaults for compile and testCompile -->
                         <configuration>
                             <jdkToolchain>
-                                <version>9</version>
+                                <version>${maven.compiler.source}</version>
                             </jdkToolchain>
-                            <release>${book-keeper.release.version}</release>
+                            <release>9</release>
                         </configuration>
                     </plugin>
                     <!-- Hack to extract dependencies for Javadoc plugin -->
@@ -585,8 +585,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>9</source>
-                    <target>9</target>
+                    <source>${maven.compiler.source}</source>
+                    <target>${maven.compiler.target}</target>
                 </configuration>
             </plugin>
         </plugins>