killbill-uncached

diff --git a/analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java b/analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java
index b7613cc..1504b15 100644
--- a/analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java
+++ b/analytics/src/test/java/com/ning/billing/analytics/dao/TestAnalyticsDao.java
@@ -53,7 +53,7 @@ import java.util.UUID;
 public class TestAnalyticsDao
 {
     private static final UUID EVENT_ID = UUID.randomUUID();
-    private static final String EVENT_KEY = "12345";
+    private static final String EVENT_KEY = "23456";
     private static final String ACCOUNT_KEY = "pierre-143343-vcc";
 
     private final MysqlTestingHelper helper = new MysqlTestingHelper();

diff --git a/entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java b/entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
index a00f11f..aaaaa94 100644
--- a/entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
+++ b/entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultEntitlementBillingApi.java
@@ -149,7 +149,7 @@ public class DefaultEntitlementBillingApi implements EntitlementBillingApi {
     	return result;
 
     }
-    
+
    	private int calculateBcdFromSubscription(Subscription subscription, Plan plan, Account account,
                                              final CallContext context) throws AccountApiException {
 		int result = account.getBillCycleDay();
@@ -163,7 +163,7 @@ public class DefaultEntitlementBillingApi implements EntitlementBillingApi {
         } catch (CatalogApiException e) {
             log.error("Unexpected catalog error encountered when updating BCD",e);
         }
-        
+
         MutableAccountData modifiedData = account.toMutableAccountData();
         modifiedData.setBillCycleDay(result);
 
@@ -208,6 +208,6 @@ public class DefaultEntitlementBillingApi implements EntitlementBillingApi {
             }
         }
     }
-    
- 
+
+
 }

diff --git a/pom.xml b/pom.xml
index c0c46a2..f8bc4c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -396,6 +396,11 @@
                                 <exclude>**/test-output/**</exclude>
                                 <exclude>**/bin/**</exclude>
                                 <exclude>.travis.yml</exclude>
+                                <!--  until we merge from server branch we disable rat for those -->
+                                <exclude>jaxrs/**</exclude>
+                                <exclude>server/**</exclude>
+                                <exclude>bin/**</exclude>
+
                             </excludes>
                         </configuration>
                     </execution>