Merge branch 'release/2.0.8'

Author: Jenkins

README.md

@@ -1,18 +1,16 @@
-![ArangoDB-Logo](https://www.arangodb.org/wp-content/uploads/2012/10/logo_arangodb_transp.png)
+![ArangoDB-Logo](https://docs.arangodb.com/assets/arangodb_logo_2016_inverted.png)
 
 arangodb object mapper
 =========================
 
-[![Build Status](https://secure.travis-ci.org/triAGENS/arangodb-objectmapper.png)](http://travis-ci.org/triAGENS/arangodb-objectmapper)
-
 A simple object mapper (based on [Jackson](http://wiki.fasterxml.com/JacksonHome)) to store java objects into a ArangoDB database.
 
 
 Installation & Testing
 =======================
 
 Please check the
-[ArangoDB Installation Manual](http://www.arangodb.org/manuals/current/InstallManual.html)
+[ArangoDB Documentation](https://www.arangodb.com/documentation/)
 for installation and compilation instructions.
 
 Start ArangoDB on localhost port 8529.

pom.xml

@@ -6,7 +6,7 @@
 
 	<groupId>org.arangodb.objectmapper</groupId>
 	<artifactId>arangodb-objectmapper</artifactId>
-	<version>2.0.6-SNAPSHOT</version>
+	<version>2.0.8</version>
 
 	<name>ArangoDB object mapper for Java</name>
 	<description>Java ODM for ArangoDB</description>
@@ -19,7 +19,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
-			<version>4.5.6</version>
+			<version>4.5.7</version>
 		</dependency>
 		<dependency>
 			<groupId>log4j</groupId>
@@ -174,7 +174,7 @@
 							<owner>arangodb-helper</owner>
 							<repository>arangodb-objectmapper</repository>
 							<server>github-oauth</server>
-							<tagName>${project.version}</tagName>
+							<tagName>v${project.version}</tagName>
 							<assets>
 								<asset>target/arangodb-objectmapper-${project.version}.jar</asset>
 								<asset>target/arangodb-objectmapper-${project.version}-sources.jar</asset>

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

@@ -106,7 +106,7 @@ private Properties loadPropertiesFromFile() {
 
 		try {
 
-			LOG.debug("Try to load Properties from " + BaseTestCase.class.getResource("/arangodb.properties").getFile());
+			LOG.info("Try to load Properties from " + BaseTestCase.class.getResource("/arangodb.properties").getFile());
 
 			InputStream resourceAsStream = BaseTestCase.class.getResourceAsStream("/arangodb.properties");
 			props.load(resourceAsStream);
@@ -115,13 +115,13 @@ private Properties loadPropertiesFromFile() {
 
 			props.forEach((key, val) -> {
 
-				String systemPropName = key.toString().replace(".", "_");
-				LOG.debug("Check Env " + systemPropName + " for override of " + key);
-				String systemProp = System.getProperty(systemPropName);
+				String systemEnvName = key.toString().replace(".", "_");
+				LOG.debug("Check Env " + systemEnvName + " for override of " + key);
+				String systemEnv = System.getenv(systemEnvName);
 
-				if(systemProp != null) {
-					LOG.info("Found System Property for " + key + " with Value " + systemProp);
-					props.put(key, systemProp);
+				if(systemEnv != null) {
+					LOG.info("Found Env Property for " + key + " with Value " + systemEnv);
+					props.put(key, systemEnv);
 				}
 
 			});