Prosoft Git

killbill-memoizeit

Merge remote-tracking branch 'origin/master' into invoice-optimizations

3/6/2017 3:22:04 AM
Pierre-Alexandre Meyer

Pierre-Alexandre Meyer

Commit: 23d74cb

Tree: 2d519b9

Parents: 41fe535
8e8a29e

Changes

account/pom.xml 2(+1 -1)

api/pom.xml 2(+1 -1)

beatrix/pom.xml 2(+1 -1)

catalog/pom.xml 2(+1 -1)

currency/pom.xml 2(+1 -1)

entitlement/pom.xml 2(+1 -1)

invoice/pom.xml 2(+1 -1)

jaxrs/pom.xml 2(+1 -1)

junction/pom.xml 2(+1 -1)

NEWS 3(+3 -0)

overdue/pom.xml 2(+1 -1)

payment/pom.xml 2(+1 -1)

payment/src/main/resources/org/killbill/billing/payment/ddl.sql 4(+2 -2)

payment/src/main/resources/org/killbill/billing/payment/migration/V20170302005722__enlarge_gateway_error_msg.sql 2(+2 -0)

pom.xml 4(+2 -2)

profiles/killbill/pom.xml 2(+1 -1)

profiles/killpay/pom.xml 2(+1 -1)

profiles/pom.xml 2(+1 -1)

subscription/pom.xml 2(+1 -1)

subscription/src/main/resources/org/killbill/billing/subscription/migration/V20161130055444__bundles_external_key_not_null.sql 0(+0 -0)

tenant/pom.xml 2(+1 -1)

usage/pom.xml 2(+1 -1)

util/pom.xml 2(+1 -1)

Details

account/pom.xml 2(+1 -1) 

diff --git a/account/pom.xml b/account/pom.xml
index 549b678..78a4147 100644
--- a/account/pom.xml
+++ b/account/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-account</artifactId>

api/pom.xml 2(+1 -1) 

diff --git a/api/pom.xml b/api/pom.xml
index 60fcf7c..c8dbd0c 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-internal-api</artifactId>

beatrix/pom.xml 2(+1 -1) 

diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index 2bbe74a..3b45ccc 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-beatrix</artifactId>

catalog/pom.xml 2(+1 -1) 

diff --git a/catalog/pom.xml b/catalog/pom.xml
index f8ff03e..77babaa 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-catalog</artifactId>

currency/pom.xml 2(+1 -1) 

diff --git a/currency/pom.xml b/currency/pom.xml
index f9003f4..26b69c6 100644
--- a/currency/pom.xml
+++ b/currency/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-currency</artifactId>

entitlement/pom.xml 2(+1 -1) 

diff --git a/entitlement/pom.xml b/entitlement/pom.xml
index c691cc9..2c34d9c 100644
--- a/entitlement/pom.xml
+++ b/entitlement/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-entitlement</artifactId>

invoice/pom.xml 2(+1 -1) 

diff --git a/invoice/pom.xml b/invoice/pom.xml
index e713886..74f81c4 100644
--- a/invoice/pom.xml
+++ b/invoice/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-invoice</artifactId>

jaxrs/pom.xml 2(+1 -1) 

diff --git a/jaxrs/pom.xml b/jaxrs/pom.xml
index 5a0b837..b76c36c 100644
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-jaxrs</artifactId>

junction/pom.xml 2(+1 -1) 

diff --git a/junction/pom.xml b/junction/pom.xml
index a8335a3..6caedca 100644
--- a/junction/pom.xml
+++ b/junction/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-junction</artifactId>

NEWS 3(+3 -0) 

diff --git a/NEWS b/NEWS
index d841538..1ba9b8e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+0.18.4
+    See https://github.com/killbill/killbill/releases/tag/killbill-0.18.4
+
 0.18.3
     See https://github.com/killbill/killbill/releases/tag/killbill-0.18.3

overdue/pom.xml 2(+1 -1) 

diff --git a/overdue/pom.xml b/overdue/pom.xml
index 4f3e728..4cd0b83 100644
--- a/overdue/pom.xml
+++ b/overdue/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-overdue</artifactId>

payment/pom.xml 2(+1 -1) 

diff --git a/payment/pom.xml b/payment/pom.xml
index 3841404..0fc7d88 100644
--- a/payment/pom.xml
+++ b/payment/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-payment</artifactId>

payment/src/main/resources/org/killbill/billing/payment/ddl.sql 4(+2 -2) 

diff --git a/payment/src/main/resources/org/killbill/billing/payment/ddl.sql b/payment/src/main/resources/org/killbill/billing/payment/ddl.sql
index e994fa9..24d99c5 100644
--- a/payment/src/main/resources/org/killbill/billing/payment/ddl.sql
+++ b/payment/src/main/resources/org/killbill/billing/payment/ddl.sql
@@ -163,7 +163,7 @@ CREATE TABLE payment_transactions (
     processed_currency varchar(3),
     payment_id varchar(36) NOT NULL,
     gateway_error_code varchar(32),
-    gateway_error_msg varchar(256),
+    gateway_error_msg text,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,
     updated_by varchar(50) NOT NULL,
@@ -194,7 +194,7 @@ CREATE TABLE payment_transaction_history (
     processed_currency varchar(3),
     payment_id varchar(36) NOT NULL,
     gateway_error_code varchar(32),
-    gateway_error_msg varchar(256),
+    gateway_error_msg text,
     change_type varchar(6) NOT NULL,
     created_by varchar(50) NOT NULL,
     created_date datetime NOT NULL,

payment/src/main/resources/org/killbill/billing/payment/migration/V20170302005722__enlarge_gateway_error_msg.sql 2(+2 -0) 

diff --git a/payment/src/main/resources/org/killbill/billing/payment/migration/V20170302005722__enlarge_gateway_error_msg.sql b/payment/src/main/resources/org/killbill/billing/payment/migration/V20170302005722__enlarge_gateway_error_msg.sql
new file mode 100644
index 0000000..cf237df
--- /dev/null
+++ b/payment/src/main/resources/org/killbill/billing/payment/migration/V20170302005722__enlarge_gateway_error_msg.sql
@@ -0,0 +1,2 @@
+alter table payment_transactions modify gateway_error_msg text;
+alter table payment_transaction_history modify gateway_error_msg text;

pom.xml 4(+2 -2) 

diff --git a/pom.xml b/pom.xml
index 746fb55..e867bc5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,10 +21,10 @@
     <parent>
         <artifactId>killbill-oss-parent</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.140.12</version>
+        <version>0.140.13</version>
     </parent>
     <artifactId>killbill</artifactId>
-    <version>0.18.4-SNAPSHOT</version>
+    <version>0.18.5-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>killbill</name>
     <description>Library for managing recurring subscriptions and the associated billing</description>

profiles/killbill/pom.xml 2(+1 -1) 

diff --git a/profiles/killbill/pom.xml b/profiles/killbill/pom.xml
index d5c9444..1e98233 100644
--- a/profiles/killbill/pom.xml
+++ b/profiles/killbill/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>killbill-profiles</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-profiles-killbill</artifactId>

profiles/killpay/pom.xml 2(+1 -1) 

diff --git a/profiles/killpay/pom.xml b/profiles/killpay/pom.xml
index 030fee8..d6cd1b3 100644
--- a/profiles/killpay/pom.xml
+++ b/profiles/killpay/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>killbill-profiles</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-profiles-killpay</artifactId>

profiles/pom.xml 2(+1 -1) 

diff --git a/profiles/pom.xml b/profiles/pom.xml
index 7764c49..1e1e897 100644
--- a/profiles/pom.xml
+++ b/profiles/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-profiles</artifactId>

subscription/pom.xml 2(+1 -1) 

diff --git a/subscription/pom.xml b/subscription/pom.xml
index 109e33b..c01bb38 100644
--- a/subscription/pom.xml
+++ b/subscription/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-subscription</artifactId>

tenant/pom.xml 2(+1 -1) 

diff --git a/tenant/pom.xml b/tenant/pom.xml
index d12ae39..b7db50f 100644
--- a/tenant/pom.xml
+++ b/tenant/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-tenant</artifactId>

usage/pom.xml 2(+1 -1) 

diff --git a/usage/pom.xml b/usage/pom.xml
index 386fbcb..345bc3c 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -19,7 +19,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-usage</artifactId>

util/pom.xml 2(+1 -1) 

diff --git a/util/pom.xml b/util/pom.xml
index c7237a3..7743895 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>killbill</artifactId>
         <groupId>org.kill-bill.billing</groupId>
-        <version>0.18.4-SNAPSHOT</version>
+        <version>0.18.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-util</artifactId>

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github