Upgraded plugin and dependencies for MongoDB

trajano · May 30, 2013 · 68a9dc6 · 68a9dc6
1 parent 8053f9c
commit 68a9dc6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 19 deletions.
diff --git a/maven-jee6-parent/pom.xml b/maven-jee6-parent/pom.xml
@@ -8,14 +8,13 @@
 	<packaging>pom</packaging>
 	<name>Project Parent POM</name>
 	<parent>
-		<groupId>net.trajano.project</groupId>
-		<artifactId>javaee-project</artifactId>
-		<version>1-SNAPSHOT</version>
-		<relativePath>remote</relativePath>
+		<groupId>net.trajano</groupId>
+		<artifactId>trajano</artifactId>
+		<version>4</version>
 	</parent>
 	<properties>
 		<project.build.sourceEncoding>utf8</project.build.sourceEncoding>
-		<!-- Without this, the dependency will try to connect to the remote repository
+		<!-- Without this, the dependency will try to connect to the remote repository 
 			all the time. -->
 		<dependency.locations.enabled>false</dependency.locations.enabled>
 	</properties>
@@ -48,6 +47,11 @@
 				<artifactId>derbynet</artifactId>
 				<version>10.9.1.0</version>
 			</dependency>
+			<dependency>
+				<groupId>org.scala-lang</groupId>
+				<artifactId>scala-library</artifactId>
+				<version>2.10.0</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<build>
@@ -96,7 +100,7 @@
 					<version>2.3.1</version>
 				</plugin>
 				<plugin>
-					<!-- Use an older version of the plugin due to the following issue in
+					<!-- Use an older version of the plugin due to the following issue in 
 						2.4 https://github.com/sonatype/m2eclipse-extras/issues/10 -->
 					<artifactId>maven-jar-plugin</artifactId>
 					<version>2.3.2</version>
@@ -127,7 +131,7 @@
 				<plugin>
 					<groupId>net.alchim31.maven</groupId>
 					<artifactId>scala-maven-plugin</artifactId>
-					<version>3.1.0</version>
+					<version>3.1.3</version>
 					<executions>
 						<execution>
 							<goals>

diff --git a/maven-jee6-test/pom.xml b/maven-jee6-test/pom.xml
@@ -24,6 +24,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
+			<version>4.11</version>
 		</dependency>
 		<dependency>
 			<groupId>com.sun.jersey</groupId>
@@ -87,7 +88,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.scalatest</groupId>
-			<artifactId>scalatest_2.9.2</artifactId>
+			<artifactId>scalatest_2.10.0</artifactId>
 			<version>1.8</version>
 		</dependency>
 		<dependency>

diff --git a/nosql/customer-mongodb/pom.xml b/nosql/customer-mongodb/pom.xml
@@ -24,12 +24,12 @@
 		<dependency>
 			<groupId>org.mongodb</groupId>
 			<artifactId>mongo-java-driver</artifactId>
-			<version>2.8.0</version>
+			<version>2.11.1</version>
 		</dependency>
 		<dependency>
 			<groupId>de.flapdoodle.embed</groupId>
 			<artifactId>de.flapdoodle.embed.mongo</artifactId>
-			<version>1.22</version>
+			<version>1.31</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/nosql/customer-mongodb/src/test/java/net/trajano/nosql/mongodb/test/MongoDbTest.java b/nosql/customer-mongodb/src/test/java/net/trajano/nosql/mongodb/test/MongoDbTest.java
@@ -4,7 +4,6 @@
 import static org.junit.Assert.assertNotNull;
 
 import java.io.IOException;
-import java.util.UUID;
 
 import net.trajano.maven_jee6.test.LogUtil;
 
@@ -37,7 +36,7 @@ public static void setLoggingConfiguration() throws IOException {
 
 	@BeforeClass
 	public static void setMongoDB() throws IOException {
-		testsFactory = MongodForTestsFactory.with(Version.Main.V2_0);
+		testsFactory = MongodForTestsFactory.with(Version.Main.PRODUCTION);
 	}
 
 	@AfterClass
@@ -49,9 +48,8 @@ public static void tearDownMongoDB() throws Exception {
 
 	@Before
 	public void setUpMongoDB() throws Exception {
-		// create database
 		final Mongo mongo = testsFactory.newMongo();
-		db = mongo.getDB(UUID.randomUUID().toString());
+		db = testsFactory.newDB(mongo);
 	}
 
 	/**

diff --git a/.../customer-mongodb/src/test/scala/net/trajano/nosql/mongodb/scala/test/CustomersTest.scala b/.../customer-mongodb/src/test/scala/net/trajano/nosql/mongodb/scala/test/CustomersTest.scala
@@ -1,22 +1,18 @@
-
-
 package net.trajano.nosql.mongodb.scala.test
 
 import java.util.Date
 import java.util.UUID
-
 import org.junit.runner.RunWith
 import org.scalatest.BeforeAndAfterAll
 import org.scalatest.FunSpec
-import org.scalatest.junit.JUnitRunner
 import org.scalatest.matchers.ShouldMatchers
-
 import de.flapdoodle.embed.mongo.distribution.Version
 import de.flapdoodle.embed.mongo.tests.MongodForTestsFactory
 import net.trajano.maven_jee6.test.LogUtil
 import net.trajano.nosql.Customer
 import net.trajano.nosql.internal.MongoDbCustomers
 import net.trajano.nosql.mongodb.test.CdiProducer
+import org.scalatest.junit.JUnitRunner
 
 @RunWith(classOf[JUnitRunner])
 class CustomersTest extends FunSpec with ShouldMatchers with BeforeAndAfterAll {