ATLAS-1117 Atlas start fails on trunk (jnhagelb via dkantor)

graphdb/titan0/pom.xml

@@ -165,9 +165,10 @@
                             <filters>
                                 <filter>
                                     <artifact>com.thinkaurelius.titan:titan-core</artifact>
-                                    <!-- force use of our custom LocalLockMediator implementation -->
+                                    <!-- force use of our custom titan class implementations -->
                                     <excludes>
-                                        <exclude>com/thinkaurelius/titan/diskstorage/locking/LocalLockMediator*</exclude>
+                                        <exclude>com/thinkaurelius/titan/diskstorage/locking/LocalLockMediator.class</exclude>
+                                        <exclude>com/thinkaurelius/titan/graphdb/query/graph/GraphCentricQueryBuilder.class</exclude>
                                     </excludes>
                                 </filter>
 

release-log.txt

@@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES:
 ATLAS-1060 Add composite indexes for exact match performance improvements for all attributes (sumasai via shwethags)
 
 ALL CHANGES:
+ATLAS-1117 Atlas start fails on trunk (jnhagelb via dkantor)
 ATLAS-1112 Hive table GET response from atlas server had duplicate column entries ( ayubkhan, mneethiraj via sumasai)
 ATLAS-1108 In Atlas HA mode , import-hive.sh in Passive instance fails. (ayubkhan via sumasai)
 ATLAS-991 Lower bound checking not always disabled for entities being deleted (dkantor)