Fix lightblue-mongo dependencies

lightblue-platform · Jan 7, 2016 · a281cdc · a281cdc
1 parent 70e1eac
commit a281cdc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -51,12 +51,7 @@
             </dependency>
             <dependency>
                 <groupId>com.redhat.lightblue.mongo</groupId>
-                <artifactId>lightblue-mongo-config</artifactId>
-                <version>${lightblue.mongo.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.redhat.lightblue.mongo</groupId>
-                <artifactId>lightblue-mongo-metadata</artifactId>
+                <artifactId>lightblue-mongo</artifactId>
                 <version>${lightblue.mongo.version}</version>
             </dependency>
             <dependency>
@@ -133,7 +128,7 @@
         </dependency>
         <dependency>
             <groupId>com.redhat.lightblue.mongo</groupId>
-            <artifactId>lightblue-mongo-config</artifactId>
+            <artifactId>lightblue-mongo</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -155,8 +150,8 @@
         <sonar.host.url>http://127.0.0.1:8080</sonar.host.url>
         <sonar.projectName>lightblue-audit-hook</sonar.projectName>
 
-        <lightblue.core.version>1.10.0-SNAPSHOT</lightblue.core.version>
-        <lightblue.mongo.version>1.10.0-SNAPSHOT</lightblue.mongo.version>
+        <lightblue.core.version>1.11.0-SNAPSHOT</lightblue.core.version>
+        <lightblue.mongo.version>1.11.0-SNAPSHOT</lightblue.mongo.version>
     </properties>
     <build>
         <plugins>

diff --git a/src/test/java/com/redhat/lightblue/hook/audit/AbstractHookTest.java b/src/test/java/com/redhat/lightblue/hook/audit/AbstractHookTest.java
@@ -15,11 +15,11 @@
 import com.redhat.lightblue.config.DataSourcesConfiguration;
 import com.redhat.lightblue.config.LightblueFactory;
 import com.redhat.lightblue.metadata.EntityMetadata;
-import com.redhat.lightblue.metadata.mongo.MongoDataStoreParser;
 import com.redhat.lightblue.metadata.parser.Extensions;
 import com.redhat.lightblue.metadata.parser.JSONMetadataParser;
 import com.redhat.lightblue.metadata.types.DefaultTypes;
 import com.redhat.lightblue.mongo.config.MongoConfiguration;
+import com.redhat.lightblue.mongo.metadata.MongoDataStoreParser;
 import com.redhat.lightblue.mongo.test.EmbeddedMongo;
 import com.redhat.lightblue.util.JsonUtils;
 import com.redhat.lightblue.util.test.FileUtil;
@@ -77,8 +77,7 @@ public void setup() {
         // create metadata
         try {
             for (String resource : getMetadataResources()) {
-                String jsonString = null;
-                jsonString = FileUtil.readFile(resource);
+                String jsonString = FileUtil.readFile(resource);
                 EntityMetadata em = parser.parseEntityMetadata(JsonUtils.json(jsonString));
                 factory.getMetadata().createNewMetadata(em);
             }