killbill-aplcache

diff --git a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java
index 4b983e9..e0583e3 100644
--- a/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java
+++ b/jaxrs/src/main/java/com/ning/billing/jaxrs/resources/AccountResource.java
@@ -44,6 +44,7 @@ import com.ning.billing.account.api.AccountApiException;
 import com.ning.billing.account.api.AccountData;
 import com.ning.billing.account.api.AccountUserApi;
 import com.ning.billing.jaxrs.json.AccountJson;
+import com.ning.billing.jaxrs.util.Context;
 
 
 @Singleton
@@ -53,10 +54,12 @@ public class AccountResource {
     private static final Logger log = LoggerFactory.getLogger(AccountResource.class);
 
     private final AccountUserApi accountApi;
+    private final Context context;
 
     @Inject
-    public AccountResource(AccountUserApi accountApi) {
+    public AccountResource(final AccountUserApi accountApi, final Context context) {
         this.accountApi = accountApi;
+        this.context = context;
     }
 
     @GET
@@ -92,7 +95,7 @@ public class AccountResource {
 
         try {
             AccountData data = json.toAccountData();
-            final Account account = accountApi.createAccount(data, null, null);
+            final Account account = accountApi.createAccount(data, null, null, context.getContext());
             URI uri = UriBuilder.fromPath(account.getId().toString()).build();
             Response.ResponseBuilder ri = Response.created(uri);
             return ri.entity(new Object() {
@@ -113,7 +116,7 @@ public class AccountResource {
     public Response updateAccount(AccountJson json, @PathParam("accountId") String accountId) {
         try {
             AccountData data = json.toAccountData();
-            accountApi.updateAccount(accountId, data);
+            accountApi.updateAccount(accountId, data, context.getContext());
             return Response.status(Status.NO_CONTENT).build();
         } catch (AccountApiException e) {
             log.info(String.format("Failed to update account %s with %s", accountId, json), e);

diff --git a/pom.xml b/pom.xml
index b04b32d..8844cbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,17 +164,17 @@
             <dependency>
                 <groupId>org.codehaus.jackson</groupId>
                 <artifactId>jackson-core-asl</artifactId>
-                <version>1.9.4</version>
+                <version>1.9.5</version>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.jackson</groupId>
                 <artifactId>jackson-jaxrs</artifactId>
-                <version>1.9.4</version>
+                <version>1.9.5</version>
             </dependency>
             <dependency>
                 <groupId>org.codehaus.jackson</groupId>
                 <artifactId>jackson-mapper-asl</artifactId>
-                <version>1.9.4</version>
+                <version>1.9.5</version>
             </dependency>
             <dependency>
                 <groupId>com.jolbox</groupId>
@@ -263,32 +263,32 @@
             <dependency>
                 <groupId>org.jdbi</groupId>
                 <artifactId>jdbi</artifactId>
-                <version>2.31.2</version>
+                <version>2.32</version>
             </dependency>
             <dependency>
                 <groupId>org.skife.config</groupId>
                 <artifactId>config-magic</artifactId>
-                <version>0.9</version>
+                <version>0.13</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
-                <version>1.6.3</version>
+                <version>1.6.4</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jcl-over-slf4j</artifactId>
-                <version>1.6.3</version>
+                <version>1.6.4</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>jul-to-slf4j</artifactId>
-                <version>1.6.3</version>
+                <version>1.6.4</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-log4j12</artifactId>
-                <version>1.6.3</version>
+                <version>1.6.4</version>
             </dependency>
             <dependency>
                 <groupId>org.testng</groupId>

diff --git a/server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java b/server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java
index a7e243c..8b46cb8 100644
--- a/server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java
+++ b/server/src/main/java/com/ning/billing/server/modules/KillbillServerModule.java
@@ -30,6 +30,7 @@ import com.ning.billing.jaxrs.resources.PaymentResource;
 import com.ning.billing.jaxrs.resources.SubscriptionResource;
 import com.ning.billing.payment.setup.PaymentModule;
 import com.ning.billing.util.glue.BusModule;
+import com.ning.billing.util.glue.CallContextModule;
 import com.ning.billing.util.glue.ClockModule;
 import com.ning.billing.util.glue.NotificationQueueModule;
 import com.ning.billing.util.glue.TagStoreModule;
@@ -69,6 +70,7 @@ public class KillbillServerModule extends AbstractModule
     {
         install(new BusModule());
         install(new NotificationQueueModule());
+        install(new CallContextModule());
         install(new AccountModule());
         install(new InvoiceModule());
         install(new EntitlementModule());