Prosoft Git

killbill-aplcache

Merge branch 'new-paymentpluginapi' of github.com:killbill/killbill …

2/21/2013 1:50:37 AM
Pierre-Alexandre Meyer

Pierre-Alexandre Meyer

Commit: 4b3a095

Tree: 6e34537

Parents: 75ea9db
37a8e1d

Changes

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

account/src/main/java/com/ning/billing/account/api/DefaultAccount.java 2(+1 -1)

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

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

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

catalog/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)

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

osgi-bundles/defaultbundles/pom.xml 2(+1 -1)

osgi-bundles/hello/pom.xml 2(+1 -1)

osgi-bundles/jruby/pom.xml 2(+1 -1)

osgi-bundles/meter/pom.xml 2(+1 -1)

osgi-bundles/pom.xml 2(+1 -1)

osgi-bundles/test/pom.xml 2(+1 -1)

osgi-bundles/test/src/test/java/com/ning/billing/osgi/bundles/test/TestPaymentPluginApi.java 4(+3 -1)

osgi-bundles/webconsolebranding/pom.xml 2(+1 -1)

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

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

pom.xml 2(+1 -1)

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

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 968caea..8bacbed 100644
--- a/account/pom.xml
+++ b/account/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-account</artifactId>

account/src/main/java/com/ning/billing/account/api/DefaultAccount.java 2(+1 -1) 

diff --git a/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java b/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
index 274c61f..40f09f4 100644
--- a/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
+++ b/account/src/main/java/com/ning/billing/account/api/DefaultAccount.java
@@ -328,7 +328,7 @@ public class DefaultAccount extends EntityBase implements Account {
 
         final DefaultAccount that = (DefaultAccount) o;
 
-        if (!billCycleDayLocal.equals(that.billCycleDayLocal)) {
+        if (billCycleDayLocal != null ? !billCycleDayLocal.equals(that.billCycleDayLocal) : that.billCycleDayLocal != null) {
             return false;
         }
         if (address1 != null ? !address1.equals(that.address1) : that.address1 != null) {

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

diff --git a/analytics/pom.xml b/analytics/pom.xml
index 1fb5c62..811741a 100644
--- a/analytics/pom.xml
+++ b/analytics/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-analytics</artifactId>

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

diff --git a/api/pom.xml b/api/pom.xml
index 56701c0..7f6309a 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-api</artifactId>

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

diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index b714b6d..9026ef1 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-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 84f0822..ad053c3 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-catalog</artifactId>

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

diff --git a/entitlement/pom.xml b/entitlement/pom.xml
index 2555107..f2d71e3 100644
--- a/entitlement/pom.xml
+++ b/entitlement/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-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 98089fc..32ab61d 100644
--- a/invoice/pom.xml
+++ b/invoice/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-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 dc57362..1e260a8 100644
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-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 ac3df69..2a256ed 100644
--- a/junction/pom.xml
+++ b/junction/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-junction</artifactId>

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

diff --git a/osgi/pom.xml b/osgi/pom.xml
index c7d393d..5dea1e9 100644
--- a/osgi/pom.xml
+++ b/osgi/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-osgi</artifactId>

osgi-bundles/defaultbundles/pom.xml 2(+1 -1) 

diff --git a/osgi-bundles/defaultbundles/pom.xml b/osgi-bundles/defaultbundles/pom.xml
index e739a2e..dd0c884 100644
--- a/osgi-bundles/defaultbundles/pom.xml
+++ b/osgi-bundles/defaultbundles/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill-osgi-bundles</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-osgi-bundles-defaultbundles</artifactId>

osgi-bundles/hello/pom.xml 2(+1 -1) 

diff --git a/osgi-bundles/hello/pom.xml b/osgi-bundles/hello/pom.xml
index 209e422..d431c13 100644
--- a/osgi-bundles/hello/pom.xml
+++ b/osgi-bundles/hello/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill-osgi-bundles</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-osgi-bundles-hello</artifactId>

osgi-bundles/jruby/pom.xml 2(+1 -1) 

diff --git a/osgi-bundles/jruby/pom.xml b/osgi-bundles/jruby/pom.xml
index 62c0b04..f3dba84 100644
--- a/osgi-bundles/jruby/pom.xml
+++ b/osgi-bundles/jruby/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill-osgi-bundles</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-osgi-bundles-jruby</artifactId>

osgi-bundles/meter/pom.xml 2(+1 -1) 

diff --git a/osgi-bundles/meter/pom.xml b/osgi-bundles/meter/pom.xml
index d2d32cc..d2f6a07 100644
--- a/osgi-bundles/meter/pom.xml
+++ b/osgi-bundles/meter/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill-osgi-bundles</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-osgi-bundles-meter</artifactId>

osgi-bundles/pom.xml 2(+1 -1) 

diff --git a/osgi-bundles/pom.xml b/osgi-bundles/pom.xml
index 1e06d27..dc984c2 100644
--- a/osgi-bundles/pom.xml
+++ b/osgi-bundles/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-osgi-bundles</artifactId>

osgi-bundles/test/pom.xml 2(+1 -1) 

diff --git a/osgi-bundles/test/pom.xml b/osgi-bundles/test/pom.xml
index d511a9b..deed751 100644
--- a/osgi-bundles/test/pom.xml
+++ b/osgi-bundles/test/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill-osgi-bundles</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-osgi-bundles-test</artifactId>

osgi-bundles/test/src/test/java/com/ning/billing/osgi/bundles/test/TestPaymentPluginApi.java 4(+3 -1) 

diff --git a/osgi-bundles/test/src/test/java/com/ning/billing/osgi/bundles/test/TestPaymentPluginApi.java b/osgi-bundles/test/src/test/java/com/ning/billing/osgi/bundles/test/TestPaymentPluginApi.java
index 712c75e..6860948 100644
--- a/osgi-bundles/test/src/test/java/com/ning/billing/osgi/bundles/test/TestPaymentPluginApi.java
+++ b/osgi-bundles/test/src/test/java/com/ning/billing/osgi/bundles/test/TestPaymentPluginApi.java
@@ -22,6 +22,7 @@ import java.util.UUID;
 
 import org.joda.time.DateTime;
 
+import com.ning.billing.account.api.Account;
 import com.ning.billing.osgi.bundles.test.dao.TestDao;
 import com.ning.billing.payment.api.PaymentMethodPlugin;
 import com.ning.billing.payment.plugin.api.PaymentInfoPlugin;
@@ -78,7 +79,6 @@ public class TestPaymentPluginApi implements PaymentPluginApi {
         };
     }
 
-
     @Override
     public PaymentInfoPlugin getPaymentInfo(final UUID kbPaymentId, final TenantContext context) throws PaymentPluginApiException {
         return null;
@@ -109,4 +109,6 @@ public class TestPaymentPluginApi implements PaymentPluginApi {
     @Override
     public void resetPaymentMethods(final List<PaymentMethodInfoPlugin> paymentMethods) throws PaymentPluginApiException {
     }
+
+
 }

osgi-bundles/webconsolebranding/pom.xml 2(+1 -1) 

diff --git a/osgi-bundles/webconsolebranding/pom.xml b/osgi-bundles/webconsolebranding/pom.xml
index 0103154..ed92524 100644
--- a/osgi-bundles/webconsolebranding/pom.xml
+++ b/osgi-bundles/webconsolebranding/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill-osgi-bundles</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-osgi-bundles-webconsolebranding</artifactId>

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

diff --git a/overdue/pom.xml b/overdue/pom.xml
index 7732e73..15e394d 100644
--- a/overdue/pom.xml
+++ b/overdue/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-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 899442c..59a12ad 100644
--- a/payment/pom.xml
+++ b/payment/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-payment</artifactId>

pom.xml 2(+1 -1) 

diff --git a/pom.xml b/pom.xml
index bc2cbaa..c9d75f8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
     <groupId>com.ning.billing</groupId>
     <artifactId>killbill</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.55-SNAPSHOT</version>
+    <version>0.1.56-SNAPSHOT</version>
     <name>killbill</name>
     <description>Library for managing recurring subscriptions and the associated billing</description>
     <url>http://github.com/killbill/killbill</url>

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

diff --git a/server/pom.xml b/server/pom.xml
index 1722775..7640aae 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-server</artifactId>

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

diff --git a/tenant/pom.xml b/tenant/pom.xml
index 1b195f4..16825fe 100644
--- a/tenant/pom.xml
+++ b/tenant/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-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 58d8321..5f3c9a6 100644
--- a/usage/pom.xml
+++ b/usage/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-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 4ceddb7..e0a65a8 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.55-SNAPSHOT</version>
+        <version>0.1.56-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-util</artifactId>

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