Merge branch 'release/2.0.1'

Author: BCaxelbecker

pom.xml

@@ -1,13 +1,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	
+
 	<modelVersion>4.0.0</modelVersion>
-	
+
 	<groupId>org.arangodb.objectmapper</groupId>
 	<artifactId>arangodb-objectmapper</artifactId>
 	<version>2.0.0-SNAPSHOT</version>
-	
+
 	<name>ArangoDB object mapper for Java</name>
 	<description>Java ODM for ArangoDB</description>
 
@@ -74,6 +74,14 @@
 			</plugins>
 		</pluginManagement>
 		<plugins>
+			<plugin>
+				<groupId>com.amashchenko.maven.plugin</groupId>
+				<artifactId>gitflow-maven-plugin</artifactId>
+				<version>1.11.0</version>
+				<configuration>
+
+				</configuration>
+			</plugin>
 			<plugin>
 				<inherited>true</inherited>
 				<groupId>org.apache.maven.plugins</groupId>

src/test/java/org/arangodb/objectmapper/test/BaseTestCase.java

@@ -49,7 +49,7 @@ protected void setUp() {
 		try {
 
 			ArangoDbHttpClient.Builder builder = new ArangoDbHttpClient.Builder();
-			client = builder.username("root").password("root").build();
+			client = builder.username("root").password("").build();
 
 		} catch (ArangoDb4JException e1) {
 			e1.printStackTrace();