killbill-aplcache

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

2/12/2013 10:56:03 PM

Details

beatrix/pom.xml 5(+5 -0)

diff --git a/beatrix/pom.xml b/beatrix/pom.xml
index ec8bbac..5ccf002 100644
--- a/beatrix/pom.xml
+++ b/beatrix/pom.xml
@@ -90,6 +90,11 @@
         </dependency>
         <!-- TEST SCOPE -->
         <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
diff --git a/osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIService.java b/osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIService.java
index ce9cc29..49d1289 100644
--- a/osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIService.java
+++ b/osgi/src/main/java/com/ning/billing/osgi/DefaultOSGIService.java
@@ -67,7 +67,7 @@ public class DefaultOSGIService implements OSGIService {
     private final KillbillActivator killbillActivator;
 
     private Framework framework;
-    private volatile ServiceReference<PaymentPluginApi>[] paymentApiReferences;
+    private volatile ServiceReference[] paymentApiReferences;
     private Map<String, PaymentPluginApi> paymentPluginApis;
 
     @Inject

pom.xml 6(+6 -0)

diff --git a/pom.xml b/pom.xml
index 3cda0b7..6ec9b79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,12 @@
                 <scope>provided</scope>
             </dependency>
             <dependency>
+                <groupId>javax.servlet</groupId>
+                <artifactId>javax.servlet-api</artifactId>
+                <version>3.0.1</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
                 <groupId>com.ning.billing</groupId>
                 <artifactId>killbill-beatrix</artifactId>
                 <version>${project.version}</version>