Prosoft Git

killbill-aplcache

Merge branch 'integration' of github.com:ning/killbill …

7/5/2012 3:38:39 PM
stephane brossier

stephane brossier

Commit: 99fd02b

Tree: 52a8252

Parents: cc5291d
19f5db7

Changes

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

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

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

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

beatrix/src/test/java/com/ning/billing/beatrix/integration/TestAnalytics.java 2(+2 -0)

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)

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

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

pom.xml 2(+1 -1)

server/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 1bf852c..e234da0 100644
--- a/account/pom.xml
+++ b/account/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.20-SNAPSHOT</version>
+        <version>0.1.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-account</artifactId>

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

diff --git a/analytics/pom.xml b/analytics/pom.xml
index c95818d..573636f 100644
--- a/analytics/pom.xml
+++ b/analytics/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.20-SNAPSHOT</version>
+        <version>0.1.21-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 538901a..127ae81 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.20-SNAPSHOT</version>
+        <version>0.1.21-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 406b097..8b3da6b 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.20-SNAPSHOT</version>
+        <version>0.1.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-beatrix</artifactId>

beatrix/src/test/java/com/ning/billing/beatrix/integration/TestAnalytics.java 2(+2 -0) 

diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestAnalytics.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestAnalytics.java
index a9b9e76..cc7b531 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestAnalytics.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestAnalytics.java
@@ -120,6 +120,8 @@ public class TestAnalytics extends TestIntegrationBase {
     @AfterMethod(groups = "slow")
     public void tearDownAnalyticsHandler() throws Exception {
         busService.getBus().unregister(analyticsListener);
+        // Reset the payment plugin for other tests
+        paymentPlugin.clear();
     }
 
     @Test(groups = "slow")

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

diff --git a/catalog/pom.xml b/catalog/pom.xml
index 970a8a6..bc40a07 100644
--- a/catalog/pom.xml
+++ b/catalog/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.20-SNAPSHOT</version>
+        <version>0.1.21-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 cc6f0db..cb34855 100644
--- a/entitlement/pom.xml
+++ b/entitlement/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.20-SNAPSHOT</version>
+        <version>0.1.21-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 07f9191..8595d28 100644
--- a/invoice/pom.xml
+++ b/invoice/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.20-SNAPSHOT</version>
+        <version>0.1.21-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 d4ea8bf..554fafd 100644
--- a/jaxrs/pom.xml
+++ b/jaxrs/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.20-SNAPSHOT</version>
+        <version>0.1.21-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 cc01087..97144b0 100644
--- a/junction/pom.xml
+++ b/junction/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.20-SNAPSHOT</version>
+        <version>0.1.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-junction</artifactId>

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

diff --git a/overdue/pom.xml b/overdue/pom.xml
index d1b5cc0..9e1e589 100644
--- a/overdue/pom.xml
+++ b/overdue/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.20-SNAPSHOT</version>
+        <version>0.1.21-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 c3a5544..7ba68ca 100644
--- a/payment/pom.xml
+++ b/payment/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.20-SNAPSHOT</version>
+        <version>0.1.21-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 aec8629..14ba328 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     <groupId>com.ning.billing</groupId>
     <artifactId>killbill</artifactId>
     <packaging>pom</packaging>
-    <version>0.1.20-SNAPSHOT</version>
+    <version>0.1.21-SNAPSHOT</version>
     <name>killbill</name>
     <description>Library for managing recurring subscriptions and the associated billing</description>
     <url>http://github.com/ning/killbill</url>

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

diff --git a/server/pom.xml b/server/pom.xml
index 7feeaff..6f740a0 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>com.ning.billing</groupId>
         <artifactId>killbill</artifactId>
-        <version>0.1.20-SNAPSHOT</version>
+        <version>0.1.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-server</artifactId>

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

diff --git a/util/pom.xml b/util/pom.xml
index 2d0ebc2..e4f9749 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.20-SNAPSHOT</version>
+        <version>0.1.21-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>killbill-util</artifactId>

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