killbill-memoizeit

diff --git a/invoice/src/main/java/org/killbill/billing/invoice/model/InvoiceItemFactory.java b/invoice/src/main/java/org/killbill/billing/invoice/model/InvoiceItemFactory.java
index 7eeda4b..77fd9e3 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/model/InvoiceItemFactory.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/model/InvoiceItemFactory.java
@@ -23,7 +23,6 @@ import java.util.UUID;
 
 import org.joda.time.DateTime;
 import org.joda.time.LocalDate;
-
 import org.killbill.billing.catalog.api.Currency;
 import org.killbill.billing.invoice.api.InvoiceItem;
 import org.killbill.billing.invoice.api.InvoiceItemType;
@@ -86,7 +85,7 @@ public class InvoiceItemFactory {
                 item = new UsageInvoiceItem(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, usageName, startDate, endDate, description, amount, currency);
                 break;
             case TAX:
-                item = new TaxInvoiceItem(id, createdDate, invoiceId, accountId, bundleId, description, startDate, amount, currency);
+                item = new TaxInvoiceItem(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, planName, phaseName, usageName, startDate, description, amount, currency, linkedItemId);
                 break;
             default:
                 throw new RuntimeException("Unexpected type of event item " + type);

diff --git a/invoice/src/main/java/org/killbill/billing/invoice/model/TaxInvoiceItem.java b/invoice/src/main/java/org/killbill/billing/invoice/model/TaxInvoiceItem.java
index 24fb389..16d0970 100644
--- a/invoice/src/main/java/org/killbill/billing/invoice/model/TaxInvoiceItem.java
+++ b/invoice/src/main/java/org/killbill/billing/invoice/model/TaxInvoiceItem.java
@@ -35,12 +35,13 @@ public class TaxInvoiceItem extends InvoiceItemBase {
 
     public TaxInvoiceItem(final UUID id, final UUID invoiceId, final UUID accountId, @Nullable final UUID bundleId,
                           @Nullable final String description, final LocalDate date, final BigDecimal amount, final Currency currency) {
-        this(id, null, invoiceId, accountId, bundleId, description, date, amount, currency);
+        this(id, null, invoiceId, accountId, bundleId, null, null, null, null, date, description, amount, currency, null);
     }
 
     public TaxInvoiceItem(final UUID id, @Nullable final DateTime createdDate, final UUID invoiceId, final UUID accountId, @Nullable final UUID bundleId,
-                          @Nullable final String description, final LocalDate date, final BigDecimal amount, final Currency currency) {
-        super(id, createdDate, invoiceId, accountId, bundleId, null, description, null, null, null, date, null, amount, currency);
+                          @Nullable final UUID subscriptionId, @Nullable final String planName, @Nullable final String phaseName, @Nullable final String usageName,
+                          final LocalDate date, @Nullable final String description, final BigDecimal amount, final Currency currency, @Nullable final UUID linkedItemId) {
+        super(id, createdDate, invoiceId, accountId, bundleId, subscriptionId, description, planName, phaseName, usageName, date, null, amount, currency, linkedItemId);
     }
 
     @Override

diff --git a/NEWS b/NEWS
index e34c46a..ff90da8 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,18 @@
+0.13.1
+   https://github.com/killbill/killbill/issues/226
+   https://github.com/killbill/killbill/issues/233
+   https://github.com/killbill/killbill/issues/234
+   https://github.com/killbill/killbill/issues/235
+   https://github.com/killbill/killbill/issues/236
+   https://github.com/killbill/killbill/issues/245
+   Add support for invoice plugins
+   Export more fields in TaxInvoiceItem
+   Update killbill-oss-parent to 0.9.7
+
+0.12.2
+   Fix state machine flow for PENDING payments
+   Fix Guice wiring in JAX-RS
+
 0.12.1
    Fix NPE in case of aborted payments
    Add missing headers for CORS

diff --git a/pom.xml b/pom.xml
index de67363..0b1436a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>killbill-oss-parent</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.9.5</version>
+        <version>0.9.7</version>
     </parent>
     <artifactId>killbill</artifactId>
     <version>0.13.1-SNAPSHOT</version>